Oh... yeah, Mocha. I'm not a huge fan either, and am also used to Rspec's mocks. So I *think* my proposed changes will work, but do not guarantee it.

This is the only project that I actively work on which still uses Mocha - I wonder if we should just switch over to vanilla Rspec? It trips me up every time.

@alindeman or @vanstee do you guys have any thoughts on that?