Updated edges iteration protocol and test case