Added test client and server