refactored naming, added eventhandlertest