fix up mocks