improved eventData test