Event test coverage (messages)

WIP, opening this to start discussion.
Yay for test coverage proving code redundant :D