Event test coverage (messages)

WIP, opening this to start discussion.
ah, I see. You moved the logic. Reason?