Fix build with latest rspec-expectations
Fix Rspec2.99 deprecation warnings