Port specs to new rspec syntax (thank you transpec)