Corrected clockwork tests for event handling