better coverage and impl for event path tests