rspec 3.0, tests fixed