resurrected some of the rspec tests