improve mocks