Update to work with rspec 3