Fix test suite (rspec 3)