better events from tests