Fix failing tests
Merge pull request #17069 from cachedout/issue_17055

Fix failing tests