--- a/symbian3/app/contacts/package_definition_3.0.xml	Wed Feb 17 16:11:30 2010 +0000
+++ b/symbian3/app/contacts/package_definition_3.0.xml	Wed Feb 17 19:51:46 2010 +0000
@@ -22,14 +22,14 @@
       <component id="phonebook2" filter="s60" name="Phone Book 2">
         <unit bldFile="phonebookui/phonebook2/group"/>
       </component>
-      <component id="phonebook2_test" filter="s60,test" name="Phonebook 2 Tests">
+      <component id="phonebook2_test" filter="s60,test,unit_test" name="Phonebook 2 Tests">
        	<!-- can only have one unit, consider #including from phonebook2 or a common bld.inf  -->
           <unit bldFile="phonebookui/Phonebook2/tsrc/group" />
           <unit bldFile="phonebookui/Phonebook2/remotecontactlookup/contactactionservice/saveascontactplugin/tsrc/group" />
           <unit bldFile="phonebookui/Phonebook2/spbcontentprovider/tsrc/ut_contentprovider/group" />      
           <unit bldFile="phonebookui/Phonebook2/NamesListExtension/tsrc/group" />      
       </component>
-      <component id="phonebook2_other_test" filter="s60,test" name="Phonebook 2 Other Tests">
+      <component id="phonebook2_other_test" filter="s60,test,unit_test" name="Phonebook 2 Other Tests">
       	<!-- can only have one unit. Why is this separate from the other tests? -->
          <unit bldFile="phonebookui/Phonebook2/UIControls/tsrc/group" />
          <unit bldFile="phonebookui/Phonebook2/Presentation/tsrc/group" />
@@ -54,12 +54,12 @@
       <component id="contactsmodel" name="Contacts Model" introduced="ER5" purpose="optional">
         <unit version="2" bldFile="phonebookengines/contactsmodel/groupsql" mrp="phonebookengines/contactsmodel/groupsql/app-engines_cntmodel.mrp"/>
       </component>
-      <component id="virtualphonebook_test" name="Virtual Phonebook Tests" filter="s60,test">
+      <component id="virtualphonebook_test" name="Virtual Phonebook Tests" filter="s60,test,unit_test">
       	<!-- can only have one bld.inf, #include the latter from the former, or #include both from virtualphonebook-->
           <unit bldFile="phonebookengines/VirtualPhonebook/tsrc/group" />
           <unit bldFile="phonebookengines/VirtualPhonebook/VPbkCntModel/tsrc/group" />
       </component>
-      <component id="vpbk_test" filter="s60,test" name="Virtual Phonebook Other Tests">
+      <component id="vpbk_test" filter="s60,test,unit_test" name="Virtual Phonebook Other Tests">
       	<!-- can only have one bld.inf, #include from the first, or #include both from virtualphonebook
       		Why is this separate from virtualphonebook_test?-->
         <unit bldFile="phonebookengines/VirtualPhonebook/VPbkEng/tsrc/group" />
@@ -80,7 +80,7 @@
       <component id="cmsservices" filter="s60" name="Contact Method Selector Services" introduced="^2">
         <unit bldFile="ccservices/cmsservices/group"/>
       </component>
-      <component id="cms_test" filter="s60,test" name="Contact Method Selector Tests">
+      <component id="cms_test" filter="s60,test,unit_test" name="Contact Method Selector Tests">
      	<!-- can only have one unit, #include from the first, or #include from cmsservices  -->
         <unit bldFile="ccservices/cmsservices/bpas/tsrc/group" />
         <unit bldFile="ccservices/cmsservices/cmsengine/tsrc/group" />
@@ -102,7 +102,7 @@
 		<!-- should divide this bld.inf into the other components, or collapse them into a single component -->
         <unit bldFile="presencecache/group"/>
       </component>
-      <component id="presencecache_test"  filter="s60,test" name="Presence Cache Tests">
+      <component id="presencecache_test" filter="s60,test,unit_test" name="Presence Cache Tests">
       	<!-- can this be #included from presencecacheutils?  -->
         <unit bldFile="presencecache/presencecacheutils/tsrc/group" />
       </component>
@@ -132,7 +132,7 @@
       <component id="contacts_plat" filter="s60" name="Contacts Apps Platform Interfaces" class="api">
         <unit bldFile="contacts_plat/group"/>
       </component>
-     <component id="contacts_plat_test" filter="s60,api_test" name="Contacts Apps Platform API Test">
+     <component id="contacts_plat_test" filter="s60,test,api_test" name="Contacts Apps Platform API Test">
        <unit bldFile="contacts_plat/cms_contactor_api/tsrc/group" />
        <unit bldFile="contacts_plat/cca_launch_api/tsrc/group" />
        <unit bldFile="contacts_plat/cca_view_plugin_api/tsrc/group" />