remove dependency on rspec-spies, clean up mock.rb