Finish switching to mock from mox.

This cleans up a few tests to finish the mox -> mock transition. Fixes #102.
Merge pull request #103 from craigcitro/master

Finish switching to mock from mox.