chore(EventHandler): Clean up EventHandler tests

Closes #770