clean up some older mocks

Cleans ups to some older mocks.
nits
Merge pull request #5 from devoncarew/old_mocks

Old mocks