[FIX] Clean up graph, add new method, update tests