--- a/wlanutilities/wlanwizard/tsrc/ut/testwlanwizardwps.cpp	Thu Sep 02 21:36:44 2010 +0300
+++ b/wlanutilities/wlanwizard/tsrc/ut/testwlanwizardwps.cpp	Fri Sep 17 08:35:49 2010 +0300
@@ -16,13 +16,16 @@
 */
 
 // System includes
+
 #include <QTest>
 #include <QDebug>
 #include <QList>
+
 #include <cmmanagerdefines_shim.h>
 #include <wlanerrorcodes.h>
 
 // User includes
+
 #include "testwlanwizardwps.h"
 #include "testwlanwizardwps_conf.h"
 #include "wlanwizard.h"
@@ -61,7 +64,8 @@
     WlanQtUtilsAp ap;
     ap.setValue(WlanQtUtilsAp::ConfIdConnectionMode, CMManagerShim::Infra);
     ap.setValue(WlanQtUtilsAp::ConfIdSecurityMode, CMManagerShim::WlanSecModeOpen);
-    ap.setValue(WlanQtUtilsAp::ConfIdSsid, ssid);
+    ap.setValue(WlanQtUtilsAp::ConfIdName, ssid);
+    ap.setValue(WlanQtUtilsAp::ConfIdSsid, ssid.toUtf8());
     ap.setValue(WlanQtUtilsAp::ConfIdHidden, false);
     ap.setValue(WlanQtUtilsAp::ConfIdWlanScanSSID, false);
 
@@ -76,6 +80,7 @@
     
     mView->mWizard->setParameters(
         ssid,
+        ssid.toUtf8(),
         CMManagerShim::Infra,
         CMManagerShim::WlanSecModeOpen,
         false,
@@ -386,7 +391,8 @@
     WlanQtUtilsAp ap;
     ap.setValue(WlanQtUtilsAp::ConfIdConnectionMode, operModeCmm);
     ap.setValue(WlanQtUtilsAp::ConfIdSecurityMode, secModeCmm);
-    ap.setValue(WlanQtUtilsAp::ConfIdSsid, ssid);
+    ap.setValue(WlanQtUtilsAp::ConfIdName, ssid);
+    ap.setValue(WlanQtUtilsAp::ConfIdSsid, ssid.toUtf8());
     ap.setValue(WlanQtUtilsAp::ConfIdHidden, false);
     ap.setValue(WlanQtUtilsAp::ConfIdWlanScanSSID, false);
 
@@ -424,6 +430,7 @@
         
     mView->mWizard->setParameters(
         ssid,
+        ssid.toUtf8(),
         CMManagerShim::Adhoc,
         CMManagerShim::WlanSecModeWep,
         false,
@@ -467,6 +474,7 @@
         
     mView->mWizard->setParameters(
         ssid,
+        ssid.toUtf8(),
         CMManagerShim::Adhoc,
         CMManagerShim::WlanSecModeWep,
         false,