Reorder arguments on test command line to make it easier to cut and
paste.