Improve/Add Rspec tests