cherry-pick/revert -m: add tests