The only reason I did the separate function thing was because I was planning to use them again in my redo of #1945 (the one that adds the get_types_as_extension function and adds the optional extension argument to a couple other functions...), which would total their use in 6 unit tests.

That said, I can certainly appreciate the philosophy of keep-it-totally-independently-and-above-all-KISS for unit tests.  Will do :-)