Get rid of some rspec 3 deprecation warnings