undo trivial reodered expressions in tests [skip ci]