Address rspec deprecations.