More Rspec cleanup