Cherry-pick with test fixes#36

nanjekyejoannah wants to merge 1 commit intosoftdevteam:regression_fixsoftdevteam/pygrate2:regression_fixfrom

nanjekyejoannah:fix_intermnanjekyejoannah/cpython:fix_intermCopy head branch name to clipboard