Fixing tests failures caused by recent changes to ClientManager