updated and sexy rspec tests