Merged additions from event registry, more testing of deletes