Tests: refactored mocks