Event: Fully clean up events in unit test

Closes gh-1685
(cherry picked from commit 4467ed606ab0a9b28ed495e682576910937fa5e0)