pre-test cleanup for new events system