Added OnEvent unit test
Added multi event support