tests: Swap the order of two tests
admin/util: Get rid of an unnecessary duplicate call