Added server and client test cod