Update tests and make sure we clean up events