improve tests + Graph