Fixed Subject test to incorporate eventId