Undo testing changes for echo server/client