Revert to RSpec 2 stubbing and expectation syntax