Fix failures for rspec 3