diff -r 630d2f34d719 -r 07a122eea281 telephonyserverplugins/common_tsy/test/integration/src/tpacketservicetsytesthelper.cpp
--- a/telephonyserverplugins/common_tsy/test/integration/src/tpacketservicetsytesthelper.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyserverplugins/common_tsy/test/integration/src/tpacketservicetsytesthelper.cpp	Wed Sep 01 12:40:21 2010 +0100
@@ -82,19 +82,7 @@
 		{
 		// Request has completed with incorrect result. Consume any outstanding
 		// Repost notification until timeout or we get the right result.
-		DEBUG_PRINTF3(_L("State %d Expected %d waiting for correct state"), aContextStatus, aExpectedContextStatus);
-
-		if (RPacketContext::EStatusActive == aContextStatus)
-			{
-			// === NTN Failure ===
-			ERR_PRINTF1(_L("<font color=Orange>$NTNKnownFailure: Context Activation success (EStatusActive = 3)</font>"));
-			// Nothing else to wait for now!
-			// Deactivate the context with RPacketContext::Deactivate
-			TExtEtelRequestStatus contextDeactivateStatus(aPacketContext, EPacketContextDeactivate);
-			aPacketContext.Deactivate(contextDeactivateStatus);
-			User::Leave(iTestStep.WaitForRequestWithTimeOut(contextDeactivateStatus, ETimeLong));
-			}
-
+		
 		aPacketContext.NotifyStatusChange(aRequestStatus, aContextStatus);
 		err = iTestStep.WaitForRequestWithTimeOut(aRequestStatus, ETimeVeryLong);
 		}
@@ -789,13 +777,8 @@
         }
 	else if(ptrNetworkName.Find(_L("NTN")) != KErrNotFound)   // NTN
         {
-		section.Copy(KIniSectionNTNGprs);
-		DEBUG_PRINTF1(_L("Retrieving NTN GPRS settings"));
-        }
-	else if(ptrNetworkName.Find(_L("NOKIA")) != KErrNotFound)   // NTN
-        {
-		section.Copy(KIniSectionNTNGprs);
-		DEBUG_PRINTF1(_L("Retrieving NTN GPRS settings"));
+        section.Copy(KIniSectionVodafoneGprs);
+        DEBUG_PRINTF1(_L("Retrieving NTN GPRS settings"));
         }
 	else if( (ptrNetworkName.Find(_L("01")) >=0) || 
 			(ptrNetworkName.Find(_L("ANITE")) >=0) ) // Anite