Upgrade Rspec tests