revert: add tests to check cherry-picking many commits