make compatible with, and lock to, recent versions of Rspec