Added DventHadler, bugfix in unit test