ServerClientTest
Merge remote-tracking branch 'blazej/jvm_client' into jvm_client