1st pass of testing with new_graph looks good