[Change] Change implementation of event testing