Fix tests broken after refactoring -> bad imports in tests