Changed test mocking strategy to another that really works.