Refactored code to clear mocks out to a hook
Upgraded to rspec3, as jruby is having trouble stubbing on rspec 2.14