Fix some rspec-rails deprecations