Redo event to group backref and add test data