Fix client-server test