upgrade rspec dep
Clean up RSpec deprecation warnings around mock()/stub()