Refs #119 - Clean up mocking.