More Graph refactoring (GraphTest still needs better isolating)