New Event framework (before test)