Test_data: use recursive calls
Hgraph: fix what was failing