Merge "adjust CallControl tests" into main