Fix suite failures with new RSpec.