Draft: [HUGE] Update some usages of user factory to leverage new syntax
What does this MR do and why?
Updates some usages of user factory to leverage new syntax. No user facing changes, pure spec refactoring.
MR acceptance checklist
Please evaluate this MR against the MR acceptance checklist. It helps you analyze changes to reduce risks in quality, performance, reliability, security, and maintainability.