rearrange order for test commands