Fix up factories.
Fix up some factories/specs and models.