Bug #24 solution

And GraphTest correction