Latest rspec changes