Refactoring...mocking