Updated to Rspec 3