Track total number of events and add test for it