Added cherry-pick and am test directories