--- a/commonservices/sysutil/test/tef/te_sysutiltestsuite/src/te_sysutilsgetlangswversion.cpp	Thu Aug 19 11:09:10 2010 +0300
+++ b/commonservices/sysutil/test/tef/te_sysutiltestsuite/src/te_sysutilsgetlangswversion.cpp	Tue Aug 31 16:29:05 2010 +0300
@@ -1,4 +1,4 @@
-// Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2007-2010 Nokia Corporation and/or its subsidiary(-ies).
 // All rights reserved.
 // This component and the accompanying materials are made available
 // under the terms of "Eclipse Public License v1.0"
@@ -27,6 +27,7 @@
  */
 CSysUtilsGetLangSWVersionStep::~CSysUtilsGetLangSWVersionStep()
 	{
+    SetTestPath(EFalse);
 	}
 
 /**
@@ -61,7 +62,7 @@
 
 	version.Insert(0,KDummy);
 
-	TInt fileErr = CheckIsFileExist( _L("Z:\\resource\\versions\\langsw.txt"));
+	TInt fileErr = CheckIsFileExist( _L("C:\\versions\\langsw.txt"));
 
 	if(fileErr == KErrNone)
 		{
@@ -74,7 +75,7 @@
 			}
 		INFO_PRINTF1(_L("Deleted P&S properties successfully."));
 		
-		err = SetTestPath(EFalse);
+		err = SetTestPath(ETrue);
 		if( err != KErrNone )
 			{
 			ERR_PRINTF2(_L("Could not turn test path off. Error = %d"), err);
@@ -113,7 +114,11 @@
 			if (version.Compare(testBuf)!=0)
 				{
 				ERR_PRINTF1(_L("software language formatted incorrectly"));
-				INFO_PRINTF1(testBuf);
+				ERR_PRINTF1(_L("From ini file: "));
+				ERR_PRINTF1(testBuf);
+				ERR_PRINTF1(_L("From txt file: "));
+				ERR_PRINTF1(version);
+				ERR_PRINTF2(_L("Comparison returned value %d"), version.Compare(testBuf));
 				SetTestStepResult(EFail);
 				}
 			else
@@ -132,6 +137,7 @@
 		SetTestStepResult(EFail);
 		}
 		
+	SetTestPath(EFalse);
 	return TestStepResult(); 	
 	}