Updates for rspec 2.99 and removal of deprecations