--- a/datasourcemodules/gpspositioningmodule/lbsgpspsy/test/src/te_lbsgpspsysuite.cpp	Mon May 03 13:50:32 2010 +0300
+++ b/datasourcemodules/gpspositioningmodule/lbsgpspsy/test/src/te_lbsgpspsysuite.cpp	Tue Jul 13 12:25:28 2010 +0100
@@ -34,7 +34,7 @@
 _LIT(KServerName, "te_lbsgpspsysuite");
 
 /** The UID of the unit test suite*/
-const TUid  KServerUid = {0x102869C5};
+//const TUid  KServerUid = {0x102869C5};
 
 // TODO - put this somewhere that the gps and agps test suites can share it?
 const RLbsPositionUpdateRequests::TChannelIdentifer KChannelIdentifierLS2GpsLocManager = 
@@ -70,16 +70,12 @@
 	//ConstructL of the base class
 	CTestServer::ConstructL(KServerName);
 	
-	CTe_SystemStarter starter(KServerUid);
-	
-	starter.RestartLbs_RootOnlyL(iFirstExe);
+	CTe_SystemStarter::DefineLbsPropertiesL();
 	}
 
 CTe_LbsGpsPsySuite::~CTe_LbsGpsPsySuite()
 	{
-	CTe_SystemStarter starter(KServerUid);
-	
-	TRAP_IGNORE(starter.RestartLbs_NormalL(iFirstExe));
+    TRAP_IGNORE(CTe_SystemStarter::DeleteLbsPropertiesL());
 	}
 
 /**