Improve EventHandler test and small comments on other