Reorder tests_run.mak

First the new branch, then the base.