cleanup, change assert to assertNull, revert edgedeletelistener,
Merge branch 'delete-entity' into delete-entity-index-listener
fixing tests