Refactor eventWaitList validation + match behavior with updated spec