Made the rspec tests more cleaner