Added test server and client