Fix some failing specs on master

What does this MR do?

Fix some specs broken by the combination of merging !2140 (merged) and !2137 (merged) into master

Are there points in the code the reviewer needs to double check?

Why was this MR needed?

Failing specs on master, e.g., https://gitlab.com/gitlab-org/gitlab-ee/-/jobs/19110259

Screenshots (if relevant)

Does this MR meet the acceptance criteria?

• Changelog entry added, if necessary
• Documentation created/updated
• API support added
• Tests
  • Added for this feature/bug
  • All builds are passing
• Conform by the merge request performance guides
• Conform by the style guides
• Branch has no merge conflicts with master (if it does - rebase it please)
• Squashed related commits together

What are the relevant issue numbers?

Closes #2694 (closed)