spec updates for rspec 3.0 changes
Remove unnecessary require
Revert rspec-mock's Marshal monkey-patch