[Change] Correct implementation of event testing