Fixed rspec deprecations