Added test client/Server