Adding EventQueue to unify various event tracking testcases into a single consistently behavior