Mocks refactoring