--- a/package_definition.xml	Wed Aug 18 11:11:46 2010 +0300
+++ b/package_definition.xml	Fri Sep 17 08:37:32 2010 +0300
@@ -17,9 +17,6 @@
       <component id="networkpositioningmodule" name="Network Positioning Module" introduced="^3" purpose="optional" class="plugin">
         <unit bldFile="datasourcemodules/networkpositioningmodule/group" mrp="datasourcemodules/networkpositioningmodule/group/lbs_network_positioning_module.mrp"/>
       </component>
-      <component id="npeintegmodule" name="NPE Integration Module" introduced="^3" purpose="optional" class="plugin">
-        <unit bldFile="datasourcemodules/npeintegmodule/group" mrp="datasourcemodules/npeintegmodule/group/lbs_npeintegrationmodule.mrp"/>
-      </component>
       <component id="locationapesuplpsy" name="APE SUPL Positioning Module" introduced="^3" purpose="optional" class="plugin">
         <unit bldFile="datasourcemodules/locationapesuplpsy/group" mrp="datasourcemodules/locationapesuplpsy/group/lbs_ape_supl_positioning_module.mrp"/>
       </component>
@@ -38,6 +35,9 @@
       </component>
     </collection>
     <collection id="lbstest" name="Locating Services Tests" level="application-interface">
+      <component id="testagpsmodules" name="Test AGPS modules" introduced="^3" purpose="development" class="plugin">
+		  <unit bldFile="lbstest/datasourcemodules/group" mrp="lbstest/datasourcemodules/group/lbs_testdatasourcemodules.mrp"/>
+      </component>
       <component id="lbstestproduct" name="LBS Test Product" introduced="9.2" purpose="development" filter="test">
         <unit mrp="lbstest/lbstestproduct/group/lbs_testproduct.mrp" bldFile="lbstest/lbstestproduct/group"/>
       </component>