Merge "Use new WifiSsid creator methods in unit tests"