Merge "Add a test for getCaptivePortalServerUrl"