move test classes in app-import