adding in server and client test