Fix failing test in develop

Add progress
Merge pull request #18477 from cachedout/fix_client_test

Fix failing test in develop