Down to only 4 rspec failures