Fix graph-controller bug (and one of the tests)