Update for new Rspec2 syntax