Update to support RSPEC 3.0