Better mocking using double as per codereview