changed packaging of tests