Client Server tests
Revert "Client Server tests"

This reverts commit a0a269adc97ab2c2b7de5c08f3d63c8131fc6f0f.