Fix rspec failures