Fix bugs breaking event tests.