Improve where mocking