adapt tests
move test classes