Merge pull request #43700 from oxij/tree/more-test-fixes
treewide: more fixes to tests
authored by Matthew Bauer and committed by GitHub 7 years ago 856743f1 40691493