Fixed failing test and ENTITY_INITIALIZED on BaseEntityEventListener