Merge "Rearrange CSIT test order"