--- a/lbstest/lbstestproduct/lbshybridcombined/group/lbshybridcombined.iby	Wed Aug 18 11:11:46 2010 +0300
+++ b/lbstest/lbstestproduct/lbshybridcombined/group/lbshybridcombined.iby	Fri Sep 17 08:37:32 2010 +0300
@@ -19,22 +19,9 @@
 #define __LBS_HYBRID_COMBINED__
 
 #include <testexecute.iby>
-#include <lbs.iby>
-#include <lbsnetworklocationmanager.iby>
-#include <lbstestserver.iby>
-#include <lbstestutils.iby>
-#include <lbstestchannel.iby>
-#include <agpsnpetestintegmodule.iby>
-#include <ctlbsclockplugin.iby>
+#include <ctagpshybridmodule.iby>
 #include <hybridprotocolmodule.iby>
 
-data=EPOCROOT##epoc32\data\C\testdata\configs\lbstestconfig.txt	  testdata\configs\lbstestconfig.txt
-data=EPOCROOT##epoc32\data\C\testdata\configs\ctagpsnpetestmoduledatasource.ini	  testdata\configs\ctagpsnpetestmoduledatasource.ini
-
-file=ABI_DIR\DEBUG_DIR\LbsHybridMOLRTestServer.exe sys\bin\LbsHybridMOLRTestServer.exe
-data=EPOCROOT##epoc32\data\C\testdata\configs\lbs_combined.ini	  testdata\configs\lbs_combined.ini
-data=EPOCROOT##epoc32\data\C\testdata\scripts\hybrid_combined_sequential.script	  testdata\scripts\hybrid_combined_sequential.script
-data=EPOCROOT##epoc32\data\C\testdata\scripts\hybrid_combined_concurrent.script	  testdata\scripts\hybrid_combined_concurrent.script
-data=EPOCROOT##epoc32\data\C\testdata\scripts\hybrid_combined_tracking.script	  testdata\scripts\hybrid_combined_tracking.script
+file=ABI_DIR\DEBUG_DIR\lbshybridcombinedtestserver.exe sys\bin\lbshybridcombinedtestserver.exe
 
 #endif