--- a/stif/ConsoleUI/src/Consolemenus.cpp	Mon Jun 21 22:45:06 2010 +0100
+++ b/stif/ConsoleUI/src/Consolemenus.cpp	Thu Jul 22 16:50:07 2010 +0100
@@ -3875,6 +3875,10 @@
             {
             return KErrNoMemory;
             }
+        if( aArray.Append( KSetUnload ) != KErrNone )
+            {
+            return KErrNoMemory;
+            }                        
         if( aArray.Append( KSetRemove ) != KErrNone )
             {
             return KErrNoMemory;
@@ -4026,11 +4030,19 @@
                                         this, 
                                         _L("Started test sets menu"));
                 return iSubMenu;
+            case ESetUnload:
+                ret = iMain->UIStore().UnloadTestSet( iTestSetName );
+                if( ret != KErrNone )
+                    {
+                    User::InfoPrint( _L("Test set unload failed") );
+                    }
+                iTestSetCreated = EFalse;                  
+                break;
             case ESetRemove: 
                 ret = iMain->UIStore().RemoveTestSet( iTestSetName );
                 if( ret != KErrNone )
                     {
-                    User::InfoPrint( _L("Test set creation failed") );
+                    User::InfoPrint( _L("Test set remove failed") );
                     }
                 iTestSetCreated = EFalse;  
                 break;
@@ -4067,17 +4079,6 @@
                     User::InfoPrint( _L("Test set saving failed at saving test set") );
                     } 
                 
-                ret = iMain->UIStore().RemoveTestSet( currSetName );
-                if( ret != KErrNone )
-                    {
-                    User::InfoPrint( _L("Test set saving failed at removing old test set") );
-                    }             
-                
-                ret = iMain->UIStore().LoadTestSet( iTestSetName );
-                if( ret != KErrNone )
-                    {
-                    User::InfoPrint( _L("Test set saving failed at reloding test set") );
-                    }   
                 break;
   
   			default:          
@@ -4268,7 +4269,12 @@
     {
 
    TInt ret = iMain->UIStore().GetTestSetsList( aArray );
-  
+
+	if ( ret != KErrNone )
+		{
+		return ret;
+		}
+
    iFileList.ResetAndDestroy();
    TRAPD( err,
 	//Assign aArray to iFileList, it is used in LoadTestSet
@@ -4391,8 +4397,6 @@
                 {           
                 if(iPosOnScreen < iFileList.Count())
                     {
-                    const TDesC& aSetName = iFileList.operator [](iPosOnScreen)->Des();
-                
                     ret = iMain->UIStore().LoadTestSet( iFileList.operator [](iPosOnScreen)->Des() );
                     if (ret == KErrNone)
                         {
@@ -5692,4 +5696,5 @@
         }
     iTestCaseMenu = aTestCaseMenu;
     }
-// End of file
+
+// End of File