Added more event-tracking-related tests