Add a merged upstream test for pull and push