Added unit test. Declared initial test as iteration test. Moved EventHandler construction into factory.