Move tests to correct package
63 files changed