Mocks/UT refactoring.