Straight forward: remove old occurence of getting an edge by a dummy edge
Some fixes for the test cases