diff -r 1e5db729c58c -r da3d8798600a common/tools/ats/bctest/package_definition.xml
--- a/common/tools/ats/bctest/package_definition.xml	Mon Sep 28 15:13:49 2009 +0100
+++ b/common/tools/ats/bctest/package_definition.xml	Mon Sep 28 15:14:16 2009 +0100
@@ -5,7 +5,7 @@
 			<block long-name="Dynamic BC Tests" level="specific" name="dynamicbctest" levels="fts">
 				<collection name="aspconnectionsis" long-name="50_asp_connection.sis">
 					<component id="aspconnection" name="ASP Connection Test">
-						<unit bldFile="sf/mw/websrv/websrv_pub/web_service_connection_api/tsrc/bc/connection/group"/>
+					  <unit bldFile="sf/mw/websrv/websrv_pub/web_service_connection_api/tsrc/bc/connection/group"/>
 					</component>
 				</collection>
 				<collection name="hostconnsis" long-name="50_asp_hostconn.sis">
@@ -27,7 +27,8 @@
 				  <component id="downloadmgrbctest" name="Download Manager BC Test">
 					<unit bldFile="sftools/ana/compatanamdw/apicompatanamdw/bcdrivers/src/bcdrivers/apps/browser/apps/DownloadMgrBCTest/group"/>
 				  </component>	
-				</collection>  
+				</collection>
+				
 				<component id="lmksearch" name="Landmark Search Test">
 				  <unit bldFile="sftools/ana/compatanamdw/apicompatanamdw/bcdrivers/src/bcdrivers/apps/location/apps/LandmarksEngine/landmarks_search_api/group"/>
 				</component>
@@ -37,12 +38,21 @@
 				<component id="landmarks" name="Landmarks API Test">
 				  <unit bldFile="sftools/ana/compatanamdw/apicompatanamdw/bcdrivers/src/bcdrivers/apps/location/apps/LandmarksEngine/landmarks_api/group"/>
 				</component>
-				<component id="mmsclientmtm" name="Messaging MMS Client MTM BC Test">
-				  <unit bldFile="sf/app/messaging/msg_pub/mms_client_mtm_api/tsrc/bc/group"/>
-				</component>
-				<component id="pluginbio" name="Messaging Plugin BIO BC Test">
-				  <unit bldFile="sf/app/messaging/msg_pub/plugin_bio_control_api/tsrc/bc/group"/>
-				</component>
+				
+				<collection name="mmsclientmtmsis" long-name="50_Messaging_MMSClientMTM.SIS">
+				  <component id="mmsclientmtm" name="Messaging MMS Client MTM BC Test">
+				    <unit bldFile="sf/app/messaging/msg_pub/mms_client_mtm_api/tsrc/bc/group"/>
+				  </component>
+				</collection>
+
+				<!-- SendUI -->
+				
+				<collection name="pluginbiosis" long-name="50_Messaging_PluginBio.sis">
+				  <component id="pluginbio" name="Messaging Plugin BIO BC Test">
+				    <unit bldFile="sf/app/messaging/msg_pub/plugin_bio_control_api/tsrc/bc/group"/>
+				  </component>
+				</collection>
+				
 				<component id="drmcaf" name="DRM CAF BC Test">
 				  <unit bldFile="sf/mw/drm/drm_pub/oma_drm_caf_agent_api/tsrc/bc/group"/>
 				</component>
@@ -52,16 +62,19 @@
 				    <unit bldFile="sf/app/contacts/contacts_pub/phonebook_data_addedit_ui_api/tsrc/bc/group"/>
 				  </component>
 				</collection>
+				
 				<collection name="pbkdatamanagementsis" long-name="50_PIM_PbkDataMgmt.SIS">
 				  <component id="pbkdatamgmt" name="Phonebook Data Management BC Test">
 				    <unit bldFile="sf/app/contacts/contacts_pub/phonebook_data_management_api/tsrc/bc/group"/>
 				  </component>
 				</collection>
 				
-				<collection name
-				<component id="pbkfetchui" name="Phonebook Fetch UI BC Test">
-				  <unit bldFile="sf/app/contacts/contacts_pub/phonebook_fetch_ui_api/tsrc/bc/group"/>
-				</component>
+				<collection name="pbkfetchuisis" long-name="50_PIM_PbkFetchAPI.SIS">
+				  <component id="pbkfetchui" name="Phonebook Fetch UI BC Test">
+				    <unit bldFile="sf/app/contacts/contacts_pub/phonebook_fetch_ui_api/tsrc/bc/group"/>
+				  </component>
+				</collection>
+				
 				<component id="pbkuiutil" name="Phonebook UI Utils BC Test">
 				  <unit bldFile="sf/app/contacts/contacts_pub/phonebook_ui_utilities_api/tsrc/bc/group"/>
 				</component>
@@ -81,6 +94,8 @@
 				<component id="graphicssvs" name="SVS Graphics API Tests" class="test">
 				  <unit bldFile="sf/os/graphics/graphicsapitest/graphicssvs/group"/>
 				</component>
+				
+				<!-- OS Services SVS -->
 				  
 				<collection name="multimediasvs" long-name="SVS Multimedia API Tests">
 				  <component id="mmsvs" name="Multimedia SVS Suite" class="test">