Status minor changes
EventDispatcher service
EventDispatcher unit test