Merge "Fix tests for wait for internet flags." into main