Update the test suite to run on the latest RSpec