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