Fix broken tests
Factories refactoring