Added some testcases, not finished
Merge remote-tracking branch 'origin/master'
Added EventMakerTest, not finished