Fix test failures due to rspec different handling of true/false assertions, and deprecation messages for matcher