fix tests re #2763 #2762 #2764

Closed
AbdelrahmanHafez wants to merge 7 commits from gh-2762 into master

7 Commits