Make the edge add/remove test a little more robust in current paradigm.