make use of common mock objects
Merge pull request #355 from deads2k/deads-use-common-mocks

Merged by openshift-bot