Add wait tests