Upgrade to RSpec 3.0, all tests pass, no deprecation warnings