Reorder test cases
Apply Jinkyu Yi[:jincreator] Patch