ServerClient minor update, ClientHelperTest and ServerClientTest
completion.