refactors for epitome.events standalone and new tests