First step towards cleaner rspec