Complete conversion to rspec 3.0