Remove more Rspec warnings