WHAT: Fix to EventHandler Example & Tests