Move more tests
Fix imports in tests