Make rspec tests neater and more abstract