Improve Rspec tests