Update factories used in Sprint 2