--- a/symbian3/app/contacts/package_definition.xml	Thu Feb 18 11:27:01 2010 +0000
+++ b/symbian3/app/contacts/package_definition.xml	Thu Feb 18 12:05:17 2010 +0000
@@ -98,24 +98,6 @@
           <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,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,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"/>
-            <unit bldFile="/sf/app/contacts/phonebookui/Phonebook2/USIMExtension/tsrc/group"/>
-            <unit bldFile="/sf/app/contacts/phonebookui/Phonebook2/xSPExtensionManager/tsrc/group"/>
-            <unit bldFile="/sf/app/contacts/phonebookui/Phonebook2/ccapplication/ccacommlauncherplugin/tsrc/group"/>
-            <unit bldFile="/sf/app/contacts/phonebookui/Phonebook2/ccapplication/ccacontactorservice/tsrc/group"/>
-            <unit bldFile="/sf/app/contacts/phonebookui/Phonebook2/ccapplication/ccapp/tsrc/group"/>
-            <unit bldFile="/sf/app/contacts/phonebookui/Phonebook2/ccapplication/ccamycardplugin/tsrc/group"/>
-          </component>
         </collection>
         <collection name="phonebookengines" long-name="Phonebook Engines" level="engine">
           <component name="cntfindplugin" filter="s60" long-name="Contacts Find Plugin" introduced="^2" plugin="Y">
@@ -130,19 +112,6 @@
           <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,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,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"/>
-            <unit bldFile="/sf/app/contacts/phonebookengines/VirtualPhonebook/VPbkEngUtils/tsrc/group"/>
-            <unit bldFile="/sf/app/contacts/phonebookengines/VirtualPhonebook/VPbkSimStoreImpl/tsrc/group"/>
-            <unit bldFile="/sf/app/contacts/phonebookengines/VirtualPhonebook/VPbkSimStoreService/tsrc/group"/>
-          </component>
         </collection>
         <collection name="pimprotocols" long-name="PIM Protocols" level="services">
           <component name="phonebooksync" long-name="Phonebook Sync" purpose="optional" plugin="Y">
@@ -156,13 +125,6 @@
           <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,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"/>
-            <unit bldFile="/sf/app/contacts/ccservices/cmsservices/contactpresence/tsrc/group"/>
-            <unit bldFile="/sf/app/contacts/ccservices/cmsservices/presencetrafficlights/tsrc/group"/>
-          </component>
         </collection>
         <collection name="presencecache" long-name="Presence Cache" level="support">
           <component name="presencecacheutils" filter="s60" long-name="Presence Cache Utils" introduced="^2" class="placeholder">
@@ -178,10 +140,6 @@
             <!-- 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,unit_test" long-name="Presence Cache Tests">
-            <!-- can this be #included from presencecacheutils?  -->
-            <unit bldFile="/sf/app/contacts/presencecache/presencecacheutils/tsrc/group"/>
-          </component>
         </collection>
         <collection name="predictivesearch" long-name="Predictive Search" level="support">
           <component name="pcsutils" filter="s60" long-name="PCS Utils" introduced="^2">
@@ -209,7 +167,7 @@
             <unit bldFile="/sf/app/contacts/contacts_plat/group"/>
           </component>
           <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"/>
+            <!-- can only have one unit. Use common bld.inf? -->
             <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"/>
             <unit bldFile="/sf/app/contacts/contacts_plat/contactpresence_api/tsrc/group"/>
@@ -223,7 +181,6 @@
             <unit bldFile="/sf/app/contacts/contacts_plat/predictivesearch_client_api/tsrc/group"/>
             <unit bldFile="/sf/app/contacts/contacts_plat/predictivesearch_utils_api/tsrc/group"/>
             <unit bldFile="/sf/app/contacts/contacts_plat/phonebook_2_rcl_api/tsrc/group"/>
-            <unit bldFile="/sf/app/contacts/contacts_plat/phonebook_2_icon_api/tsrc/ut_CPbk2IconArray/group"/>
           </component>
           <component name="contacts_pub" filter="s60" long-name="Contacts Apps Public Interfaces" class="api">
             <unit bldFile="/sf/app/contacts/contacts_pub/group"/>