Fix hang in client_server tests.