updated to rspec 3.0 and fixed changes introduced