Converting more test functions to use it (and then splitting out test functions into their own files) is left for a follow-up commit.
Michael Stapelberg