add one more test, rearrange