Improve EventHandler test. Small fix and comments in other tests