Update waiter usage in spec