Restructured event tests