Some rspec cleanup