Change packaging of test classes