TESTS - Reorganize some tests, [run, clirun] must be at the top