Prepare rspec 3 by removing deprecations