More fixes to tests, including factory_boy changes