Fix minor issue in test suite
The `dispatcher` now use a `map` for its event mapping
Add small workaround for an not handled event