Merge "Add more tests for CaptivePortalData"