Fix failing tests in develop
Merge pull request #19131 from cachedout/fix_pip_tests

Fix failing tests in develop