Make rspec tests better