Fix tests
Improve EventHandler test. Small fix and comments in other tests
Merge pull request #119 from kuraga/refactor-event_handler_test

Improve EventHandler test and small comments on other
Merge pull request #121 from kuraga/patch-6

Fix some tests