Mocks refactor