Move Test to test package