Reduce number of arguments in UserCommitFiles test helper
Conflicts with !1077 (merged), somewhat. While reviewing that MR I noticed that a test helper function for UserCommitFiles had way too many arguments so this MR addresses that.
This changes test code only.