Purged the tests I didn't want, fixed the models and the factories pass