Migrated more factories to use associations