cleaned out broken auto-generated rspec tests
merge conflict fix