[#339] simplified the event test condtions