Graph path + test refactor
Test refactor