Impoved comments in test client and server.