Some more rspec deprecation fixes