Moved back to rspec 2.x