Fixed errors with imports in tests