Fix deprecation warnings in new rspec