Added tests for EventHandler and added EventType enum
Merge remote-tracking branch 'origin/master'