Reworking event tests