adding tests, updating EventHandler