--- a/datasourcemodules/gpspositioningmodule/lbsagpspsy/test/src/te_lbsagpspsysuite.cpp	Wed Jun 09 11:13:47 2010 +0300
+++ b/datasourcemodules/gpspositioningmodule/lbsagpspsy/test/src/te_lbsagpspsysuite.cpp	Thu Aug 19 11:17:26 2010 +0300
@@ -34,7 +34,7 @@
 _LIT(KServerName, "te_lbsagpspsysuite");
 
 /** The UID of the unit test suite*/
-const TUid  KServerUid = {0x10285ACB};
+//const TUid  KServerUid = {0x10285ACB};
 
 const RLbsPositionUpdateRequests::TChannelIdentifer KChannelIdentifierLS2GpsLocManager = 
 	{
@@ -69,18 +69,12 @@
 	//ConstructL of the base class
 	CTestServer::ConstructL(KServerName);
 	
-	CTe_SystemStarter starter(KServerUid);
-	
-	starter.RestartLbs_RootOnlyL(iFirstExe);
-
+    CTe_SystemStarter::DefineLbsPropertiesL();
 	}
 
 CTe_LbsAgpsPsySuite::~CTe_LbsAgpsPsySuite()
 	{
-	CTe_SystemStarter starter(KServerUid);
-	
-	TRAP_IGNORE(starter.RestartLbs_NormalL(iFirstExe));
-
+    TRAP_IGNORE(CTe_SystemStarter::DeleteLbsPropertiesL());
 	}
 
 /**