Moving tests to different packages