I'd like to dry this up if we could.  I think this mock object could you just be moved into the spec_helper and used everywhere.

Can we attempt that before :rocket: