updates for Rspec2.0