modernized for recent rspec