--- a/package_definition.xml	Fri Mar 12 15:45:41 2010 +0200
+++ b/package_definition.xml	Mon Mar 15 12:42:35 2010 +0200
@@ -23,11 +23,12 @@
       <component id="progressivedownload" filter="s60" name="Progressive Download">
         <unit bldFile="mmfenh/progressivedownload/group"/>
       </component>
-    </collection>
-    <collection id="mmfw" name="Multimedia Frameworks" level="framework">
+      <component id="mmfenh_test" filter="s60,test,module_test,pref_test" name="MMF Enhancements Tests" purpose="development">
+        <unit bldFile="mmfenh/advancedaudiocontroller/tsrc/advancedaudiocontrollertestmodule/group"/>
+      </component>      
     </collection>
     <collection id="mmserv" name="Multimedia Services" level="specific">
-      <component id="audioeffectsui="s60" name="Audio Effects UI">
+      <component id="audioeffectsui" filter="s60" name="Audio Effects UI">
         <unit bldFile="mmserv/audioeffectsui/group"/>
       </component>
       <component id="callaudiocontrol" filter="s60" name="Call Audio Control">
@@ -48,11 +49,17 @@
       <component id="voipaudioservices" filter="s60" name="VoIP Audio Services">
         <unit bldFile="mmserv/voipaudioservices/group"/>
       </component>
-    </collection>
+      <component id="lib3gpextparser" filter="s60"  name="3GP Extension Metadata Parser Library">
+        <unit bldFile="mmserv/metadatautility/3GPExtParserLib_stub/group" filter="sf_build"/>
+      </component>
+    </collection>    
     <collection id="mmmw_info" name="Multimedia Middleware Info" level="specific">
-      <component id="mmmw_test" filter="s60" name="Multimedia Middleware Test" purpose="development">
+      <component id="mmmw_test" filter="s60,test,api_test,pref_test" name="Multimedia Middleware Tests" purpose="development">
         <unit bldFile="tsrc/group"/>
       </component>
+      <component id="mmmw_api_test" filter="s60,test,api_test" name="Multimedia Middleware API Tests" purpose="development">
+        <unit bldFile="mmmw_plat/telephony_multimedia_service_api/tsrc/group"/>
+      </component>
       <component id="mmmw_plat" filter="s60" name="Multimedia Middleware Platform Interfaces" class="api">
         <unit bldFile="mmmw_plat/group"/>
       </component>