--- a/homescreenapp/stateplugins/hsapplibrarystateplugin/tsrc/t_collectionsstate/src/t_collectionsstate.cpp	Wed Oct 06 16:06:24 2010 +0300
+++ b/homescreenapp/stateplugins/hsapplibrarystateplugin/tsrc/t_collectionsstate/src/t_collectionsstate.cpp	Mon Oct 18 10:20:15 2010 +0300
@@ -284,12 +284,12 @@
 #endif//UT_MEMORY_CHECK
 #endif//Q_OS_SYMBIAN
     {
-        //QScopedPointer<HbMainWindow> window(new HbMainWindow);
-        //HsScene::setInstance( new HsScene(window.data()) );
+        QScopedPointer<HbMainWindow> window(new HbMainWindow);
+        HsScene::setInstance( new HsScene(window.data()) );
 
         HsMenuViewBuilder builder;
         HsMenuModeWrapper menuMode;
-        HsMainWindowMock mainWindow;
+        HsMainWindow mainWindow;
 
         QScopedPointer<QStateMachine> machine(new QStateMachine(0));
 
@@ -662,49 +662,29 @@
         HsMenuModeWrapper menuMode;
         HsMainWindowMock mainWindow;
 
-        QScopedPointer<QStateMachine> machine(new QStateMachine(0));
-        QState *rootState = new QState(machine.data());
-        machine->setInitialState(rootState);
-
-        const QString collectionName("testCollection" +
-                                     QDateTime::currentDateTime().
-                                     toString("ddmmyyyy_hh_mm_ss_zzz"));
+        const QString collectionName("testCollection" 
+        		+ QDateTime::currentDateTime().toString(
+        				"ddmmyyyy_hh_mm_ss_zzz"));
 
-        const int collectionId =
-            HsMenuService::createCollection(collectionName);
-
-        HsCollectionState *collectionState =
-            new HsCollectionState(builder, menuMode, mainWindow, rootState);
-
-        collectionState->mCollectionId = collectionId;
+        const int collectionId = HsMenuService::createCollection(
+        		collectionName);
 
-        collectionState->mModel =
-            static_cast<HsMenuItemModel *>(
-                HsMenuService::getCollectionModel(collectionState->mCollectionId,
-                        collectionState->mSortAttribute));
-
-        const QString newName(collectionName +
-                              QDateTime::currentDateTime().
-                              toString("ddmmyyyy_hh_mm_ss_zzz"));
+        HsCollectionState collectionState(builder, menuMode, mainWindow);
 
-        const bool renamed = HsMenuService::renameCollection(
-                                 collectionState->mCollectionId, newName);
+        collectionState.mModel = HsMenuService::getCollectionModel(
+        		collectionId );
 
-        QVERIFY(renamed);
-
-        QTest::qWait(3000);
-
-        collectionState->updateLabel();
+        collectionState.updateLabel();
 
         const QString label = builder.currentViewLabel()->heading();
 
-        //now label is different than collection name but should contain this name
-        QVERIFY(label.contains(newName));
-
-        QVERIFY(HsMenuService::renameCollection(collectionState->mCollectionId, collectionName));
+        QString parentName = collectionState.mModel->root().data(
+        		CaItemModel::CollectionTitleRole).toString();
 
         // cleanup
         HsMenuService::removeCollection(collectionId);
+        
+        QCOMPARE(label, parentName);
     }
 #ifdef UT_MEMORY_CHECK
     __UHEAP_MARKEND;