Added more rspec tests