Various improvements to events tests