The code looks good, but it would be better to split the test refactoring into a separate commit. Specifically, the first commit should focus on updating existing tests to use the new helpers, and the second should include the implementation changes and any new tests.
Sorry for the delay. We're currently in a code freeze, so merging this will have to wait for the 11 cycle, but we can make sure it's ready in the meantime.