Refactored to use factory inside one of tests
Test refactoring continued