Fix broken tests with new event names