Increase wait_for timeout in some cases to 2s.