improved the logif of event firing tests