Upgrade to rspec 2 syntax