Upgrade rspec and loosen version constraints