Improve use of mock objects.
2 files changed