Fix rspec deprecations