Fix deprecated rspec matchers (again)