moved all test to appropriate packages