Added server and client test classes