added timeout to client server test (it doesn't seem to fail anymore).