Get rid of more custom mocking