Some more fixes for the DummyEdge bug, and more thorough testing