Added more tests for EventData