improved event tests