Improved event tests