Fix rspec deprecation warnings