Continued work on events tests