Added server and server test