Fixed imports: repeated for tests
Fixing more imports: compiler stops complaining, but still no tests