TS-2554 Reorder the tests slightly, such that the most common checks goes first