[#55646462] Fixes some tests.  Others are still not working
Resolved conflict with seeds.rb