Address rspec deprecations