EventData to replace IEvent, changed tests to use new implementation