add EventDispatcherTest
Merge branch 'dev'