Event: Fully clean up events in unit test

Closes gh-1685