Remove excessive events in tests