Minor changes to client-server test.