21-cherrypick.t: Added cherry-pick tests