Fix assertions in TestEventService