Add EventHandler
Reorganize EventHandler Test
Manage event position in handler