Test new set_wait feature