Make rspec tests more concise and thorough