Simpler rspec run
Removed deprecated use of mock() and stub()