minor unit test fixes

Lack of a Mock's dependency was causing an error message to be displayed.
Unnecessary use of the Mocks class in unit tests greatly slows them down.