Fix flaky tests that were missing events