Fix rspec3 matcher deprecations
rspec 3 deprecation removal
rspec version aware