--- a/locationtriggering/tsrc/lbtengine_test/Additionaltests/src/AdditionaltestsBlocks.cpp	Thu Aug 19 10:20:18 2010 +0300
+++ b/locationtriggering/tsrc/lbtengine_test/Additionaltests/src/AdditionaltestsBlocks.cpp	Tue Aug 31 15:37:04 2010 +0300
@@ -2278,8 +2278,6 @@
     wait->Start( );
     RPointerArray < CLbtTriggerInfo > trigInfoList;
     
-     User::After(5000000);
-   
     //Construct an area filter
     CLbtTriggerFilterByArea* areaFilter1 = 
         CLbtTriggerFilterByArea::NewL();
@@ -4010,21 +4008,16 @@
        _LIT( KFilename,"CreateTest.exe" );
     RProcess proc;
     TInt retVal =proc.Create(KFilename,KNullDesC);
+    TRequestStatus status = KRequestPending;
+    TInt triggerId = KLbtNullTriggerId;
     if(retVal == KErrNone)
-	{
-		proc.Resume();
-		TRequestStatus status = KRequestPending;
-		proc.Rendezvous(status);
-		User::WaitForRequest(status);
-	}
-	 User::After(5000000);	
-    TInt triggerId=0;
-    RProperty iProperty;
-    User::LeaveIfError(iProperty.Get(
-        KPSUidTriggerIdInfo, 
-        KLbttesttriggerid, 
-        triggerId));
-        
+        {
+        proc.Resume();
+        proc.Rendezvous(status);
+        User::WaitForRequest(status);
+        triggerId = status.Int();
+        }
+    
      //Construct list options
     CLbtListTriggerOptions* listOptions = CLbtListTriggerOptions::NewL();
     CleanupStack::PushL( listOptions );
@@ -4084,22 +4077,19 @@
     _LIT( KFilename,"CreateTest.exe" );
     RProcess proc;
     TInt retVal =proc.Create(KFilename,KNullDesC);
+
+    TRequestStatus status = KRequestPending;
+    TInt triggerId = KLbtNullTriggerId;
+    
     if(retVal == KErrNone)
-	{
-		proc.Resume();
-		TRequestStatus status = KRequestPending;
-		proc.Rendezvous(status);
-		User::WaitForRequest(status);
-	}
-	 User::After(5000000);	
-    TInt triggerId=0;
-    RProperty iProperty;
-    User::LeaveIfError(iProperty.Get(
-        KPSUidTriggerIdInfo, 
-        KLbttesttriggerid, 
-        triggerId));
-        
-      //Construct list options
+        {
+        proc.Resume();
+        proc.Rendezvous(status);
+        User::WaitForRequest(status);
+        triggerId = status.Int();
+        }
+    
+    //Construct list options
     CLbtListTriggerOptions* listOptions = CLbtListTriggerOptions::NewL();
     CleanupStack::PushL( listOptions );
     //Construct an area filter