Adjust tests to send EventData