Match function order of merged tests

Merged tests are structured to allow the upstream authors to accept
new tests independent of one another.  That requires that they be
separated from one another in the source file so that there are not
merge collisions when accepting the new tests.