WIP: Added cherry pick tests