# HG changeset patch
# User brendand
# Date 1255526967 -3600
# Node ID 2931178769c7cc0873a89bcbd874ab6aae750a6c
# Parent  5a3e7da0fee9c66f76fdf7fd07648e5a42e035ac
fixed up the phonebook tests to run faster

diff -r 5a3e7da0fee9 -r 2931178769c7 common/tools/ats/bctest/contacts/phonebook/phonebook.pl
--- a/common/tools/ats/bctest/contacts/phonebook/phonebook.pl	Wed Oct 14 10:45:17 2009 +0100
+++ b/common/tools/ats/bctest/contacts/phonebook/phonebook.pl	Wed Oct 14 14:29:27 2009 +0100
@@ -23,7 +23,7 @@
 rmtree "temp";
 mkpath "temp/phonebooktest/general/testframework";
 mkpath "temp/phonebooktest/general/bcardtest2";
-mkpath "temp/phonebooktest/winscw_udeb/z/resource/plugins";
+mkpath "temp/phonebooktest/winscw_udeb/z/resource";
 
 my $epoc=$ENV{'EPOCROOT'} . "epoc32/";
 copy("phonebook.xml",	"temp/test.xml");
@@ -34,65 +34,44 @@
 copy($epoc . "winscw/c/testframework/ui_bctestpbkdataaddedit.cfg",				"temp/phonebooktest/general/testframework/ui_bctestpbkdataaddedit.cfg") or die "failed : $!";
 
 copy($epoc . "release/winscw/udeb/mtrpbkviewresourcefile.dll",					"temp/phonebooktest/winscw_udeb/mtrpbkviewresourcefile.dll") or die "failed : $!";
-copy($epoc . "winscw/c/testframework/testframework_pbkvrsc.ini",				"temp/phonebooktest/general/testframework/testframework_pbkvrsc.ini") or die "failed : $!";
-copy($epoc . "winscw/c/testframework/tcbctestpbkvrsc.cfg",						"temp/phonebooktest/general/testframework/tcbctestpbkvrsc.cfg") or die "failed : $!";
 copy($epoc . "winscw/c/testframework/ui_bctestpbkvrsc.cfg",						"temp/phonebooktest/general/testframework/ui_bctestpbkvrsc.cfg") or die "failed : $!";
 
 copy($epoc . "release/winscw/udeb/mtpbkidlefinder.dll",							"temp/phonebooktest/winscw_udeb/mtpbkidlefinder.dll") or die "failed : $!";
-copy($epoc . "winscw/c/testframework/testframework_pbkifinder.ini",				"temp/phonebooktest/general/testframework/testframework_pbkifinder.ini") or die "failed : $!";
-copy($epoc . "winscw/c/testframework/tcbctestpbkifinder.cfg",					"temp/phonebooktest/general/testframework/tcbctestpbkifinder.cfg") or die "failed : $!";
 copy($epoc . "winscw/c/testframework/ui_bctestpbkifinder.cfg",					"temp/phonebooktest/general/testframework/ui_bctestpbkifinder.cfg") or die "failed : $!";
 
 copy($epoc . "release/winscw/udeb/mtpbkiconinfo.dll",							"temp/phonebooktest/winscw_udeb/mtpbkiconinfo.dll") or die "failed : $!";
-copy($epoc . "winscw/c/testframework/testframework_pbkinfo.ini",				"temp/phonebooktest/general/testframework/testframework_pbkinfo.ini") or die "failed : $!";
-copy($epoc . "winscw/c/testframework/tcbctestpbkinfo.cfg",						"temp/phonebooktest/general/testframework/tcbctestpbkinfo.cfg") or die "failed : $!";
 copy($epoc . "winscw/c/testframework/ui_bctestpbkinfo.cfg",						"temp/phonebooktest/general/testframework/ui_bctestpbkinfo.cfg") or die "failed : $!";
 
 copy($epoc . "release/winscw/udeb/mtpbkiconid.dll",								"temp/phonebooktest/winscw_udeb/mtpbkiconid.dll") or die "failed : $!";
-copy($epoc . "winscw/c/testframework/testframework_pbkicon.ini",				"temp/phonebooktest/general/testframework/testframework_pbkicon.ini") or die "failed : $!";
-copy($epoc . "winscw/c/testframework/tcbctestpbkicon.cfg",						"temp/phonebooktest/general/testframework/tcbctestpbkicon.cfg") or die "failed : $!";
 copy($epoc . "winscw/c/testframework/ui_bctestpbkicon.cfg",						"temp/phonebooktest/general/testframework/ui_bctestpbkicon.cfg") or die "failed : $!";
 
 copy($epoc . "release/winscw/udeb/mtpbkfields.dll",								"temp/phonebooktest/winscw_udeb/mtpbkfields.dll") or die "failed : $!";
-copy($epoc . "winscw/c/testframework/testframework_pbkfeilds.ini",				"temp/phonebooktest/general/testframework/testframework_pbkfeilds.ini") or die "failed : $!";
-copy($epoc . "winscw/c/testframework/tcbctestpbkfeilds.cfg",					"temp/phonebooktest/general/testframework/tcbctestpbkfeilds.cfg") or die "failed : $!";
 copy($epoc . "winscw/c/testframework/ui_bctestpbkfeilds.cfg",					"temp/phonebooktest/general/testframework/ui_bctestpbkfeilds.cfg") or die "failed : $!";
 
 copy($epoc . "release/winscw/udeb/mtpbkfielddata.dll",							"temp/phonebooktest/winscw_udeb/mtpbkfielddata.dll") or die "failed : $!";
-copy($epoc . "winscw/c/testframework/testframework_pbkfdata.ini",				"temp/phonebooktest/general/testframework/testframework_pbkfdata.ini") or die "failed : $!";
-copy($epoc . "winscw/c/testframework/tcbctestpbkfdata.cfg",						"temp/phonebooktest/general/testframework/tcbctestpbkfdata.cfg") or die "failed : $!";
 copy($epoc . "winscw/c/testframework/ui_bctestpbkfdata.cfg",					"temp/phonebooktest/general/testframework/ui_bctestpbkfdata.cfg") or die "failed : $!";
 
 copy($epoc . "release/winscw/udeb/mtpbkcontactiter.dll",						"temp/phonebooktest/winscw_udeb/mtpbkcontactiter.dll") or die "failed : $!";
-copy($epoc . "winscw/c/testframework/testframework_pbkiter.ini",				"temp/phonebooktest/general/testframework/testframework_pbkiter.ini") or die "failed : $!";
-copy($epoc . "winscw/c/testframework/tcbctestpbkiter.cfg",						"temp/phonebooktest/general/testframework/tcbctestpbkiter.cfg") or die "failed : $!";
 copy($epoc . "winscw/c/testframework/ui_bctestpbkiter.cfg",						"temp/phonebooktest/general/testframework/ui_bctestpbkiter.cfg") or die "failed : $!";
 
 copy($epoc . "release/winscw/udeb/mtpbkcontactitemfield.dll",					"temp/phonebooktest/winscw_udeb/mtpbkcontactitemfield.dll") or die "failed : $!";
-copy($epoc . "winscw/c/testframework/testframework_pbkcif.ini",					"temp/phonebooktest/general/testframework/testframework_pbkcif.ini") or die "failed : $!";
-copy($epoc . "winscw/c/testframework/tcbctestpbkcif.cfg",						"temp/phonebooktest/general/testframework/tcbctestpbkcif.cfg") or die "failed : $!";
 copy($epoc . "winscw/c/testframework/ui_bctestpbkcif.cfg",						"temp/phonebooktest/general/testframework/ui_bctestpbkcif.cfg") or die "failed : $!";
 
 copy($epoc . "release/winscw/udeb/mtpbkcontactengine.dll",						"temp/phonebooktest/winscw_udeb/mtpbkcontactengine.dll") or die "failed : $!";
-copy($epoc . "winscw/c/testframework/testframework_cengine.ini",				"temp/phonebooktest/general/testframework/testframework_cengine.ini") or die "failed : $!";
-copy($epoc . "winscw/c/testframework/tcbctestcengine.cfg",						"temp/phonebooktest/general/testframework/tcbctestcengine.cfg") or die "failed : $!";
 copy($epoc . "winscw/c/testframework/ui_bctestcengine.cfg",						"temp/phonebooktest/general/testframework/ui_bctestcengine.cfg") or die "failed : $!";
 
 copy($epoc . "release/winscw/udeb/mtpbkfieldsinfo.dll",							"temp/phonebooktest/winscw_udeb/mtpbkfieldsinfo.dll") or die "failed : $!";
-copy($epoc . "winscw/c/testframework/testframework_pbkfinfo.ini",				"temp/phonebooktest/general/testframework/testframework_pbkfinfo.ini") or die "failed : $!";
-copy($epoc . "winscw/c/testframework/tcbctestpbkfinfo.cfg",						"temp/phonebooktest/general/testframework/tcbctestpbkfinfo.cfg") or die "failed : $!";
 copy($epoc . "winscw/c/testframework/ui_bctestpbkfinfo.cfg",					"temp/phonebooktest/general/testframework/ui_bctestpbkfinfo.cfg") or die "failed : $!";
 
 copy($epoc . "release/winscw/udeb/mtpbkcontactitem.dll",						"temp/phonebooktest/winscw_udeb/mtpbkcontactitem.dll") or die "failed : $!";
-copy($epoc . "winscw/c/testframework/testframework_pbkcitem.ini",				"temp/phonebooktest/general/testframework/testframework_pbkcitem.ini") or die "failed : $!";
-copy($epoc . "winscw/c/testframework/tcbctestpbkcitem.cfg",						"temp/phonebooktest/general/testframework/tcbctestpbkcitem.cfg") or die "failed : $!";
 copy($epoc . "winscw/c/testframework/ui_bctestpbkcitem.cfg",					"temp/phonebooktest/general/testframework/ui_bctestpbkcitem.cfg") or die "failed : $!";
 
 copy($epoc . "release/winscw/udeb/mtpbkcontactchangenotifier.dll",				"temp/phonebooktest/winscw_udeb/mtpbkcontactchangenotifier.dll") or die "failed : $!";
-copy($epoc . "winscw/c/testframework/testframework_pbknotifier.ini",			"temp/phonebooktest/general/testframework/testframework_pbknotifier.ini") or die "failed : $!";
-copy($epoc . "winscw/c/testframework/tcbctestpbknotifier.cfg",					"temp/phonebooktest/general/testframework/tcbctestpbknotifier.cfg") or die "failed : $!";
 copy($epoc . "winscw/c/testframework/ui_bctestpbkpbknotifier.cfg",				"temp/phonebooktest/general/testframework/ui_bctestpbkpbknotifier.cfg") or die "failed : $!";
 
+copy($epoc . "winscw/c/testframework/testframework_pbkdmngt.ini",				"temp/phonebooktest/general/testframework/testframework_pbkdmngt.ini") or die "failed : $!";
+copy($epoc . "winscw/c/testframework/tcbctestpbkdatamngt.cfg",					"temp/phonebooktest/general/testframework/tcbctestpbkdatamngt.cfg") or die "failed : $!";
+
 copy($epoc . "release/winscw/udeb/mtpbksmsaddressselect.dll",					"temp/phonebooktest/winscw_udeb/mtpbksmsaddressselect.dll") or die "failed : $!";
 copy($epoc . "winscw/c/testframework/testframework_smsaddsel.ini",				"temp/phonebooktest/general/testframework/testframework_smsaddsel.ini") or die "failed : $!";
 copy($epoc . "winscw/c/testframework/tcbctestsmsaddsel.cfg",					"temp/phonebooktest/general/testframework/tcbctestsmsaddsel.cfg") or die "failed : $!";
@@ -152,13 +131,13 @@
 copy($epoc . "winscw/c/testframework/testframework_pbkaddsel.ini",				"temp/phonebooktest/general/testframework/testframework_pbkaddsel.ini") or die "failed : $!";
 copy($epoc . "winscw/c/testframework/tcbctestpbkaddsel.cfg",					"temp/phonebooktest/general/testframework/tcbctestpbkaddsel.cfg") or die "failed : $!";
 copy($epoc . "winscw/c/testframework/ui_bctestpbkaddsel.cfg",					"temp/phonebooktest/general/testframework/ui_bctestpbkaddsel.cfg") or die "failed : $!";
-copy($epoc . "release/winscw/udeb/z/resource/pbkaddressselect.rsc",				"temp/phonebooktest/winscw_udeb/z/resource/plugins/pbkaddressselect.rsc") or die "failed : $!";
+copy($epoc . "release/winscw/udeb/z/resource/pbkaddressselect.rsc",				"temp/phonebooktest/winscw_udeb/z/resource/pbkaddressselect.rsc") or die "failed : $!";
 
 copy($epoc . "release/winscw/udeb/mtpbkphonenumberselectbase.dll",				"temp/phonebooktest/winscw_udeb/mtpbkphonenumberselectbase.dll") or die "failed : $!";
 copy($epoc . "winscw/c/testframework/testframework_numsel.ini",					"temp/phonebooktest/general/testframework/testframework_numsel.ini") or die "failed : $!";
 copy($epoc . "winscw/c/testframework/tcbctestnumsel.cfg",						"temp/phonebooktest/general/testframework/tcbctestnumsel.cfg") or die "failed : $!";
 copy($epoc . "winscw/c/testframework/ui_bctestnumsel.cfg",						"temp/phonebooktest/general/testframework/ui_bctestnumsel.cfg") or die "failed : $!";
-copy($epoc . "release/winscw/udeb/z/resource/mt_cpbkphonenumberselectbase.rsc",	"temp/phonebooktest/winscw_udeb/z/resource/plugins/mt_cpbkphonenumberselectbase.rsc") or die "failed : $!";
+copy($epoc . "release/winscw/udeb/z/resource/mt_cpbkphonenumberselectbase.rsc",	"temp/phonebooktest/winscw_udeb/z/resource/mt_cpbkphonenumberselectbase.rsc") or die "failed : $!";
 
 copy($epoc . "release/winscw/udeb/mtpbkselectfielddlg.dll",						"temp/phonebooktest/winscw_udeb/mtpbkselectfielddlg.dll") or die "failed : $!";
 copy($epoc . "winscw/c/testframework/testframework_fielddlg.ini",				"temp/phonebooktest/general/testframework/testframework_fielddlg.ini") or die "failed : $!";
@@ -170,6 +149,9 @@
 copy($epoc . "winscw/c/testframework/tcbctestsifielddlg.cfg",					"temp/phonebooktest/general/testframework/tcbctestsifielddlg.cfg") or die "failed : $!";
 copy($epoc . "winscw/c/testframework/ui_bctestsifielddlg.cfg",					"temp/phonebooktest/general/testframework/ui_bctestsifielddlg.cfg") or die "failed : $!";
 
+copy($epoc . "winscw/c/testframework/testframework_pbkfetch.ini",				"temp/phonebooktest/general/testframework/testframework_pbkfetch.ini") or die "failed : $!";
+copy($epoc . "winscw/c/testframework/tcbctestpbkfetch.cfg",						"temp/phonebooktest/general/testframework/tcbctestpbkfetch.cfg") or die "failed : $!";
+
 copy($epoc . "release/winscw/udeb/bctestpbkuiutil.dll",							"temp/phonebooktest/winscw_udeb/bctestpbkuiutil.dll") or die "failed : $!";
 copy($epoc . "winscw/c/testframework/testframework_pbkuiutil.ini",				"temp/phonebooktest/general/testframework/testframework_pbkuiutil.ini") or die "failed : $!";
 copy($epoc . "winscw/c/testframework/tcbctestpbkuiutil.cfg",					"temp/phonebooktest/general/testframework/tcbctestpbkuiutil.cfg") or die "failed : $!";
diff -r 5a3e7da0fee9 -r 2931178769c7 common/tools/ats/bctest/contacts/phonebook/phonebook.xml
--- a/common/tools/ats/bctest/contacts/phonebook/phonebook.xml	Wed Oct 14 10:45:17 2009 +0100
+++ b/common/tools/ats/bctest/contacts/phonebook/phonebook.xml	Wed Oct 14 14:29:27 2009 +0100
@@ -15,7 +15,7 @@
 			<device rank="master" alias="emulator_udeb"/>
 		</target>
 		<session id="" name="Contacts Phonebook Binary Compatibility Tests" harness="ATSINTERFACE" enabled="true" passrate="100">
-			<set id="" name="Phonebook Add/Edit UI" harness="ATSINTERFACE" enabled="true" passrate="100">
+			<set id="" name="Phonebook Tests" harness="ATSINTERFACE" enabled="true" passrate="100">
 				<case id="" name="Phonebook Add/Edit" harness="ATSINTERFACE" enabled="true" passrate="100">
                     <step id="" name="SPD_Logs XML (makedir)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
                         <command>makedir</command>
@@ -65,7 +65,7 @@
 							<param file="atsinterface.exe"/>
 							<param parameters="-testmodule testcombiner -config C:\testframework\tcbctestpbkdataaddedit.cfg"/>
                             <param result-file="c:\spd_logs\xml\testcombiner.xml"/>
-                            <param timeout="300"/>
+                            <param timeout="900"/>
 						</params>
 					</step>
 					<step id="" name="bctestpbkdataaddedit (fetch-log)" harness="ATSINTERFACE" enabled="true" passrate="100">
@@ -75,9 +75,7 @@
 						</params>
 					</step>
 				</case>
-			</set>
-			<set id="" name="Phonebook Data Management" harness="ATSINTERFACE" enabled="true" passrate="100">
-                <case id="" name="Phonebook View Resource Manager" harness="ATSINTERFACE" enabled="true" passrate="100">
+                <case id="" name="Phonebook Data Management" harness="ATSINTERFACE" enabled="true" passrate="100">
                     <step id="" name="SPD_Logs XML (makedir)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
                         <command>makedir</command>
                         <params>
@@ -93,24 +91,6 @@
 							<param component-path="phonebooktest" />
 						</params>
 					</step>
-					<step id="" name="testframework_pbkvrsc.ini (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
-						<command>install</command>
-						<params>
-							<param type="data"/>
-							<param src="testframework/testframework_pbkvrsc.ini"/>
-							<param dst="c:\testframework\testframework.ini"/>
-							<param component-path="phonebooktest" />
-						</params>
-					</step>
-					<step id="" name="tcbctestpbkvrsc.cfg (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
-						<command>install</command>
-						<params>
-							<param type="data"/>
-							<param src="testframework/tcbctestpbkvrsc.cfg"/>
-							<param dst="c:\testframework\tcbctestpbkvrsc.cfg"/>
-							<param component-path="phonebooktest" />
-						</params>
-					</step>
 					<step id="" name="ui_bctestpbkvrsc.cfg (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
 						<command>install</command>
 						<params>
@@ -120,29 +100,6 @@
 							<param component-path="phonebooktest" />
 						</params>
 					</step>
-					<step id="" name="mtrpbkviewresourcefile (execute)" harness="ATSINTERFACE" enabled="true" passrate="100">
-						<command>execute</command>
-						<params>
-							<param file="atsinterface.exe"/>
-							<param parameters="-testmodule testcombiner -config C:\TestFramework\tcbctestpbkvrsc.cfg"/>
-                            <param result-file="c:\spd_logs\xml\testcombiner.xml"/>
-                            <param timeout="3600"/>
-						</params>
-					</step>
-					<step id="" name="mtrpbkviewresourcefile (fetch-log)" harness="ATSINTERFACE" enabled="true" passrate="100">
-						<command>fetch-log</command>
-						<params>
-							<param path="c:\logs\testframework\TestReport.txt" /> 
-						</params>
-					</step>                
-                </case>
-                <case id="" name="Phonebook Idle Finder" harness="ATSINTERFACE" enabled="true" passrate="100">
-                    <step id="" name="SPD_Logs XML (makedir)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
-                        <command>makedir</command>
-                        <params>
-                            <param dir="c:\spd_logs\xml" /> 
-                        </params>
-                    </step>
                     <step id="" name="mtpbkidlefinder.dll (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
 						<command>install</command>
 						<params>
@@ -152,24 +109,6 @@
 							<param component-path="phonebooktest" />
 						</params>
 					</step>
-					<step id="" name="testframework_pbkifinder.ini (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
-						<command>install</command>
-						<params>
-							<param type="data"/>
-							<param src="testframework/testframework_pbkifinder.ini"/>
-							<param dst="c:\testframework\testframework.ini"/>
-							<param component-path="phonebooktest" />
-						</params>
-					</step>
-					<step id="" name="tcbctestpbkifinder.cfg (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
-						<command>install</command>
-						<params>
-							<param type="data"/>
-							<param src="testframework/tcbctestpbkifinder.cfg"/>
-							<param dst="c:\testframework\tcbctestpbkifinder.cfg"/>
-							<param component-path="phonebooktest" />
-						</params>
-					</step>
 					<step id="" name="ui_bctestpbkifinder.cfg (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
 						<command>install</command>
 						<params>
@@ -179,29 +118,6 @@
 							<param component-path="phonebooktest" />
 						</params>
 					</step>
-					<step id="" name="mtpbkidlefinder (execute)" harness="ATSINTERFACE" enabled="true" passrate="100">
-						<command>execute</command>
-						<params>
-							<param file="atsinterface.exe"/>
-							<param parameters="-testmodule testcombiner -config C:\TestFramework\tcbctestpbkifinder.cfg"/>
-                            <param result-file="c:\spd_logs\xml\testcombiner.xml"/>
-                            <param timeout="3600"/>
-						</params>
-					</step>
-					<step id="" name="mtpbkidlefinder (fetch-log)" harness="ATSINTERFACE" enabled="true" passrate="100">
-						<command>fetch-log</command>
-						<params>
-							<param path="c:\logs\testframework\TestReport.txt" /> 
-						</params>
-					</step>                
-                </case>
-                <case id="" name="Phonebook Icon Info" harness="ATSINTERFACE" enabled="true" passrate="100">
-                    <step id="" name="SPD_Logs XML (makedir)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
-                        <command>makedir</command>
-                        <params>
-                            <param dir="c:\spd_logs\xml" /> 
-                        </params>
-                    </step>
                     <step id="" name="mtpbkiconinfo.dll (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
 						<command>install</command>
 						<params>
@@ -211,24 +127,6 @@
 							<param component-path="phonebooktest" />
 						</params>
 					</step>
-					<step id="" name="testframework_pbkinfo.ini (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
-						<command>install</command>
-						<params>
-							<param type="data"/>
-							<param src="testframework/testframework_pbkinfo.ini"/>
-							<param dst="c:\testframework\testframework.ini"/>
-							<param component-path="phonebooktest" />
-						</params>
-					</step>
-					<step id="" name="tcbctestpbkinfo.cfg (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
-						<command>install</command>
-						<params>
-							<param type="data"/>
-							<param src="testframework/tcbctestpbkinfo.cfg"/>
-							<param dst="c:\testframework\tcbctestpbkinfo.cfg"/>
-							<param component-path="phonebooktest" />
-						</params>
-					</step>
 					<step id="" name="ui_bctestpbkinfo.cfg (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
 						<command>install</command>
 						<params>
@@ -238,29 +136,6 @@
 							<param component-path="phonebooktest" />
 						</params>
 					</step>
-					<step id="" name="mtpbkiconinfo (execute)" harness="ATSINTERFACE" enabled="true" passrate="100">
-						<command>execute</command>
-						<params>
-							<param file="atsinterface.exe"/>
-							<param parameters="-testmodule testcombiner -config C:\TestFramework\tcbctestpbkinfo.cfg"/>
-                            <param result-file="c:\spd_logs\xml\testcombiner.xml"/>
-                            <param timeout="3600"/>
-						</params>
-					</step>
-					<step id="" name="mtpbkiconinfo (fetch-log)" harness="ATSINTERFACE" enabled="true" passrate="100">
-						<command>fetch-log</command>
-						<params>
-							<param path="c:\logs\testframework\TestReport.txt" /> 
-						</params>
-					</step>                
-                </case>
-                <case id="" name="Phonebook Icon ID" harness="ATSINTERFACE" enabled="true" passrate="100">
-                    <step id="" name="SPD_Logs XML (makedir)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
-                        <command>makedir</command>
-                        <params>
-                            <param dir="c:\spd_logs\xml" /> 
-                        </params>
-                    </step>
                     <step id="" name="mtpbkiconid.dll (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
 						<command>install</command>
 						<params>
@@ -270,24 +145,6 @@
 							<param component-path="phonebooktest" />
 						</params>
 					</step>
-					<step id="" name="testframework_pbkicon.ini (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
-						<command>install</command>
-						<params>
-							<param type="data"/>
-							<param src="testframework/testframework_pbkicon.ini"/>
-							<param dst="c:\testframework\testframework.ini"/>
-							<param component-path="phonebooktest" />
-						</params>
-					</step>
-					<step id="" name="tcbctestpbkicon.cfg (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
-						<command>install</command>
-						<params>
-							<param type="data"/>
-							<param src="testframework/tcbctestpbkicon.cfg"/>
-							<param dst="c:\testframework\tcbctestpbkicon.cfg"/>
-							<param component-path="phonebooktest" />
-						</params>
-					</step>
 					<step id="" name="ui_bctestpbkicon.cfg (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
 						<command>install</command>
 						<params>
@@ -297,29 +154,6 @@
 							<param component-path="phonebooktest" />
 						</params>
 					</step>
-					<step id="" name="mtpbkiconid (execute)" harness="ATSINTERFACE" enabled="true" passrate="100">
-						<command>execute</command>
-						<params>
-							<param file="atsinterface.exe"/>
-							<param parameters="-testmodule testcombiner -config C:\TestFramework\tcbctestpbkicon.cfg"/>
-                            <param result-file="c:\spd_logs\xml\testcombiner.xml"/>
-                            <param timeout="3600"/>
-						</params>
-					</step>
-					<step id="" name="mtpbkiconid (fetch-log)" harness="ATSINTERFACE" enabled="true" passrate="100">
-						<command>fetch-log</command>
-						<params>
-							<param path="c:\logs\testframework\TestReport.txt" /> 
-						</params>
-					</step>                
-                </case>
-                <case id="" name="Phonebook Fields" harness="ATSINTERFACE" enabled="true" passrate="100">
-                    <step id="" name="SPD_Logs XML (makedir)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
-                        <command>makedir</command>
-                        <params>
-                            <param dir="c:\spd_logs\xml" /> 
-                        </params>
-                    </step>
                     <step id="" name="mtpbkfields.dll (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
 						<command>install</command>
 						<params>
@@ -329,24 +163,6 @@
 							<param component-path="phonebooktest" />
 						</params>
 					</step>
-					<step id="" name="testframework_pbkfeilds.ini (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
-						<command>install</command>
-						<params>
-							<param type="data"/>
-							<param src="testframework/testframework_pbkfeilds.ini"/>
-							<param dst="c:\testframework\testframework.ini"/>
-							<param component-path="phonebooktest" />
-						</params>
-					</step>
-					<step id="" name="tcbctestpbkfeilds.cfg (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
-						<command>install</command>
-						<params>
-							<param type="data"/>
-							<param src="testframework/tcbctestpbkfeilds.cfg"/>
-							<param dst="c:\testframework\tcbctestpbkfeilds.cfg"/>
-							<param component-path="phonebooktest" />
-						</params>
-					</step>
 					<step id="" name="ui_bctestpbkfeilds.cfg (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
 						<command>install</command>
 						<params>
@@ -356,29 +172,6 @@
 							<param component-path="phonebooktest" />
 						</params>
 					</step>
-					<step id="" name="mtpbkfields (execute)" harness="ATSINTERFACE" enabled="true" passrate="100">
-						<command>execute</command>
-						<params>
-							<param file="atsinterface.exe"/>
-							<param parameters="-testmodule testcombiner -config C:\TestFramework\tcbctestpbkfeilds.cfg"/>
-                            <param result-file="c:\spd_logs\xml\testcombiner.xml"/>
-                            <param timeout="3600"/>
-						</params>
-					</step>
-					<step id="" name="mtpbkfields (fetch-log)" harness="ATSINTERFACE" enabled="true" passrate="100">
-						<command>fetch-log</command>
-						<params>
-							<param path="c:\logs\testframework\TestReport.txt" /> 
-						</params>
-					</step>                
-                </case>
-                <case id="" name="Phonebook Field Data" harness="ATSINTERFACE" enabled="true" passrate="100">
-                    <step id="" name="SPD_Logs XML (makedir)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
-                        <command>makedir</command>
-                        <params>
-                            <param dir="c:\spd_logs\xml" /> 
-                        </params>
-                    </step>
                     <step id="" name="mtpbkfielddata.dll (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
 						<command>install</command>
 						<params>
@@ -388,24 +181,6 @@
 							<param component-path="phonebooktest" />
 						</params>
 					</step>
-					<step id="" name="testframework_pbkfdata.ini (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
-						<command>install</command>
-						<params>
-							<param type="data"/>
-							<param src="testframework/testframework_pbkfdata.ini"/>
-							<param dst="c:\testframework\testframework.ini"/>
-							<param component-path="phonebooktest" />
-						</params>
-					</step>
-					<step id="" name="tcbctestpbkfdata.cfg (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
-						<command>install</command>
-						<params>
-							<param type="data"/>
-							<param src="testframework/tcbctestpbkfdata.cfg"/>
-							<param dst="c:\testframework\tcbctestpbkfdata.cfg"/>
-							<param component-path="phonebooktest" />
-						</params>
-					</step>
 					<step id="" name="ui_bctestpbkfdata.cfg (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
 						<command>install</command>
 						<params>
@@ -415,29 +190,6 @@
 							<param component-path="phonebooktest" />
 						</params>
 					</step>
-					<step id="" name="mtpbkfielddata (execute)" harness="ATSINTERFACE" enabled="true" passrate="100">
-						<command>execute</command>
-						<params>
-							<param file="atsinterface.exe"/>
-							<param parameters="-testmodule testcombiner -config C:\TestFramework\tcbctestpbkfdata.cfg"/>
-                            <param result-file="c:\spd_logs\xml\testcombiner.xml"/>
-                            <param timeout="3600"/>
-						</params>
-					</step>
-					<step id="" name="mtpbkfielddata (fetch-log)" harness="ATSINTERFACE" enabled="true" passrate="100">
-						<command>fetch-log</command>
-						<params>
-							<param path="c:\logs\testframework\TestReport.txt" /> 
-						</params>
-					</step>                
-                </case>
-                <case id="" name="Phonebook Contact Iteration" harness="ATSINTERFACE" enabled="true" passrate="100">
-                    <step id="" name="SPD_Logs XML (makedir)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
-                        <command>makedir</command>
-                        <params>
-                            <param dir="c:\spd_logs\xml" /> 
-                        </params>
-                    </step>
                     <step id="" name="mtpbkcontactiter.dll (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
 						<command>install</command>
 						<params>
@@ -447,24 +199,6 @@
 							<param component-path="phonebooktest" />
 						</params>
 					</step>
-					<step id="" name="testframework_pbkiter.ini (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
-						<command>install</command>
-						<params>
-							<param type="data"/>
-							<param src="testframework/testframework_pbkiter.ini"/>
-							<param dst="c:\testframework\testframework.ini"/>
-							<param component-path="phonebooktest" />
-						</params>
-					</step>
-					<step id="" name="tcbctestpbkiter.cfg (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
-						<command>install</command>
-						<params>
-							<param type="data"/>
-							<param src="testframework/tcbctestpbkiter.cfg"/>
-							<param dst="c:\testframework\tcbctestpbkiter.cfg"/>
-							<param component-path="phonebooktest" />
-						</params>
-					</step>
 					<step id="" name="ui_bctestpbkiter.cfg (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
 						<command>install</command>
 						<params>
@@ -474,29 +208,6 @@
 							<param component-path="phonebooktest" />
 						</params>
 					</step>
-					<step id="" name="mtpbkcontactiter (execute)" harness="ATSINTERFACE" enabled="true" passrate="100">
-						<command>execute</command>
-						<params>
-							<param file="atsinterface.exe"/>
-							<param parameters="-testmodule testcombiner -config C:\TestFramework\tcbctestpbkiter.cfg"/>
-                            <param result-file="c:\spd_logs\xml\testcombiner.xml"/>
-                            <param timeout="3600"/>
-						</params>
-					</step>
-					<step id="" name="mtpbkcontactiter (fetch-log)" harness="ATSINTERFACE" enabled="true" passrate="100">
-						<command>fetch-log</command>
-						<params>
-							<param path="c:\logs\testframework\TestReport.txt" /> 
-						</params>
-					</step>
-                </case>
-                <case id="" name="Phonebook Contact Item Field" harness="ATSINTERFACE" enabled="true" passrate="100">
-                    <step id="" name="SPD_Logs XML (makedir)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
-                        <command>makedir</command>
-                        <params>
-                            <param dir="c:\spd_logs\xml" /> 
-                        </params>
-                    </step>
                     <step id="" name="mtpbkcontactitemfield.dll (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
 						<command>install</command>
 						<params>
@@ -506,24 +217,6 @@
 							<param component-path="phonebooktest" />
 						</params>
 					</step>
-					<step id="" name="testframework_pbkcif.ini (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
-						<command>install</command>
-						<params>
-							<param type="data"/>
-							<param src="testframework/testframework_pbkcif.ini"/>
-							<param dst="c:\testframework\testframework.ini"/>
-							<param component-path="phonebooktest" />
-						</params>
-					</step>
-					<step id="" name="tcbctestpbkcif.cfg (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
-						<command>install</command>
-						<params>
-							<param type="data"/>
-							<param src="testframework/tcbctestpbkcif.cfg"/>
-							<param dst="c:\testframework\tcbctestpbkcif.cfg"/>
-							<param component-path="phonebooktest" />
-						</params>
-					</step>
 					<step id="" name="ui_bctestpbkcif.cfg (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
 						<command>install</command>
 						<params>
@@ -533,29 +226,6 @@
 							<param component-path="phonebooktest" />
 						</params>
 					</step>
-					<step id="" name="mtpbkcontactitemfield (execute)" harness="ATSINTERFACE" enabled="true" passrate="100">
-						<command>execute</command>
-						<params>
-							<param file="atsinterface.exe"/>
-							<param parameters="-testmodule testcombiner -config C:\TestFramework\tcbctestpbkcif.cfg"/>
-                            <param result-file="c:\spd_logs\xml\testcombiner.xml"/>
-                            <param timeout="3600"/>
-						</params>
-					</step>
-					<step id="" name="mtpbkcontactitemfield (fetch-log)" harness="ATSINTERFACE" enabled="true" passrate="100">
-						<command>fetch-log</command>
-						<params>
-							<param path="c:\logs\testframework\TestReport.txt" /> 
-						</params>
-					</step>
-                </case>
-                <case id="" name="Phonebook Contact Engine" harness="ATSINTERFACE" enabled="true" passrate="100">
-                    <step id="" name="SPD_Logs XML (makedir)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
-                        <command>makedir</command>
-                        <params>
-                            <param dir="c:\spd_logs\xml" /> 
-                        </params>
-                    </step>
                     <step id="" name="mtpbkcontactengine.dll (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
 						<command>install</command>
 						<params>
@@ -565,24 +235,6 @@
 							<param component-path="phonebooktest" />
 						</params>
 					</step>
-					<step id="" name="testframework_cengine.ini (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
-						<command>install</command>
-						<params>
-							<param type="data"/>
-							<param src="testframework/testframework_cengine.ini"/>
-							<param dst="c:\testframework\testframework.ini"/>
-							<param component-path="phonebooktest" />
-						</params>
-					</step>
-					<step id="" name="tcbctestcengine.cfg (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
-						<command>install</command>
-						<params>
-							<param type="data"/>
-							<param src="testframework\tcbctestcengine.cfg"/>
-							<param dst="c:\testframework\tcbctestcengine.cfg"/>
-							<param component-path="phonebooktest" />
-						</params>
-					</step>
 					<step id="" name="ui_bctestcengine.cfg (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
 						<command>install</command>
 						<params>
@@ -592,29 +244,6 @@
 							<param component-path="phonebooktest" />
 						</params>
 					</step>
-					<step id="" name="mtpbkcontactengine (execute)" harness="ATSINTERFACE" enabled="true" passrate="100">
-						<command>execute</command>
-						<params>
-							<param file="atsinterface.exe"/>
-							<param parameters="-testmodule testcombiner -config C:\testframework\tcbctestcengine.cfg"/>
-                            <param result-file="c:\spd_logs\xml\testcombiner.xml"/>
-                            <param timeout="3600"/>
-						</params>
-					</step>
-					<step id="" name="mtpbkcontactengine (fetch-log)" harness="ATSINTERFACE" enabled="true" passrate="100">
-						<command>fetch-log</command>
-						<params>
-							<param path="c:\logs\testframework\TestReport.txt" /> 
-						</params>
-					</step>
-                </case>
-                <case id="" name="Phonebook Fields Info" harness="ATSINTERFACE" enabled="true" passrate="100">
-                    <step id="" name="SPD_Logs XML (makedir)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
-                        <command>makedir</command>
-                        <params>
-                            <param dir="c:\spd_logs\xml" /> 
-                        </params>
-                    </step>
                     <step id="" name="mtpbkfieldsinfo.dll (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
 						<command>install</command>
 						<params>
@@ -624,24 +253,6 @@
 							<param component-path="phonebooktest" />
 						</params>
 					</step>
-					<step id="" name="testframework_pbkfinfo.ini (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
-						<command>install</command>
-						<params>
-							<param type="data"/>
-							<param src="testframework/testframework_pbkfinfo.ini"/>
-							<param dst="c:\testframework\testframework.ini"/>
-							<param component-path="phonebooktest" />
-						</params>
-					</step>
-					<step id="" name="tcbctestpbkfinfo.cfg (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
-						<command>install</command>
-						<params>
-							<param type="data"/>
-							<param src="testframework/tcbctestpbkfinfo.cfg"/>
-							<param dst="c:\testframework\tcbctestpbkfinfo.cfg"/>
-							<param component-path="phonebooktest" />
-						</params>
-					</step>
 					<step id="" name="ui_bctestpbkfinfo.cfg (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
 						<command>install</command>
 						<params>
@@ -651,29 +262,6 @@
 							<param component-path="phonebooktest" />
 						</params>
 					</step>
-					<step id="" name="mtpbkfieldsinfo (execute)" harness="ATSINTERFACE" enabled="true" passrate="100">
-						<command>execute</command>
-						<params>
-							<param file="atsinterface.exe"/>
-							<param parameters="-testmodule testcombiner -config C:\TestFramework\tcbctestpbkfinfo.cfg"/>
-                            <param result-file="c:\spd_logs\xml\testcombiner.xml"/>
-                            <param timeout="3600"/>
-						</params>
-					</step>
-					<step id="" name="mtpbkfieldsinfo (fetch-log)" harness="ATSINTERFACE" enabled="true" passrate="100">
-						<command>fetch-log</command>
-						<params>
-							<param path="c:\logs\testframework\TestReport.txt" /> 
-						</params>
-					</step>
-                </case>
-                <case id="" name="Phonebook Contact Item" harness="ATSINTERFACE" enabled="true" passrate="100">
-                    <step id="" name="SPD_Logs XML (makedir)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
-                        <command>makedir</command>
-                        <params>
-                            <param dir="c:\spd_logs\xml" /> 
-                        </params>
-                    </step>
                     <step id="" name="mtpbkcontactitem.dll (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
 						<command>install</command>
 						<params>
@@ -683,24 +271,6 @@
 							<param component-path="phonebooktest" />
 						</params>
 					</step>
-					<step id="" name="testframework_pbkcitem.ini (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
-						<command>install</command>
-						<params>
-							<param type="data"/>
-							<param src="testframework/testframework_pbkcitem.ini"/>
-							<param dst="c:\testframework\testframework.ini"/>
-							<param component-path="phonebooktest" />
-						</params>
-					</step>
-					<step id="" name="tcbctestpbkcitem.cfg (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
-						<command>install</command>
-						<params>
-							<param type="data"/>
-							<param src="testframework/tcbctestpbkcitem.cfg"/>
-							<param dst="c:\testframework\tcbctestpbkcitem.cfg"/>
-							<param component-path="phonebooktest" />
-						</params>
-					</step>
 					<step id="" name="ui_bctestpbkcitem.cfg (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
 						<command>install</command>
 						<params>
@@ -710,29 +280,6 @@
 							<param component-path="phonebooktest" />
 						</params>
 					</step>
-					<step id="" name="mtpbkcontactitem (execute)" harness="ATSINTERFACE" enabled="true" passrate="100">
-						<command>execute</command>
-						<params>
-							<param file="atsinterface.exe"/>
-							<param parameters="-testmodule testcombiner -config C:\TestFramework\tcbctestpbkcitem.cfg"/>
-                            <param result-file="c:\spd_logs\xml\testcombiner.xml"/>
-                            <param timeout="3600"/>
-						</params>
-					</step>
-					<step id="" name="mtpbkcontactitem (fetch-log)" harness="ATSINTERFACE" enabled="true" passrate="100">
-						<command>fetch-log</command>
-						<params>
-							<param path="c:\logs\testframework\TestReport.txt" /> 
-						</params>
-					</step>
-                </case>
-                <case id="" name="Phonebook Notifier" harness="ATSINTERFACE" enabled="true" passrate="100">
-                    <step id="" name="SPD_Logs XML (makedir)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
-                        <command>makedir</command>
-                        <params>
-                            <param dir="c:\spd_logs\xml" /> 
-                        </params>
-                    </step>
                     <step id="" name="mtpbkcontactchangenotifier.dll (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
 						<command>install</command>
 						<params>
@@ -742,24 +289,6 @@
 							<param component-path="phonebooktest" />
 						</params>
 					</step>
-					<step id="" name="testframework_pbknotifier.ini (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
-						<command>install</command>
-						<params>
-							<param type="data"/>
-							<param src="testframework/testframework_pbknotifier.ini"/>
-							<param dst="c:\testframework\testframework.ini"/>
-							<param component-path="phonebooktest" />
-						</params>
-					</step>
-					<step id="" name="tcbctestpbknotifier.cfg (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
-						<command>install</command>
-						<params>
-							<param type="data"/>
-							<param src="testframework/tcbctestpbknotifier.cfg"/>
-							<param dst="c:\testframework\tcbctestpbknotifier.cfg"/>
-							<param component-path="phonebooktest" />
-						</params>
-					</step>
 					<step id="" name="ui_bctestpbkpbknotifier.cfg (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
 						<command>install</command>
 						<params>
@@ -769,25 +298,41 @@
 							<param component-path="phonebooktest" />
 						</params>
 					</step>
-					<step id="" name="mtpbkcontactchangenotifier (execute)" harness="ATSINTERFACE" enabled="true" passrate="100">
+					<step id="" name="testframework_pbkdmngt.ini (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
+						<command>install</command>
+						<params>
+							<param type="data"/>
+							<param src="testframework/testframework_pbkdmngt.ini"/>
+							<param dst="c:\testframework\testframework.ini"/>
+							<param component-path="phonebooktest" />
+						</params>
+					</step>
+					<step id="" name="tcbctestpbkdatamngt.cfg (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
+						<command>install</command>
+						<params>
+							<param type="data"/>
+							<param src="testframework/tcbctestpbkdatamngt.cfg"/>
+							<param dst="c:\testframework\tcbctestpbkdatamngt.cfg"/>
+							<param component-path="phonebooktest" />
+						</params>
+					</step>
+					<step id="" name="testpbkdatamngt (execute)" harness="ATSINTERFACE" enabled="true" passrate="100">
 						<command>execute</command>
 						<params>
 							<param file="atsinterface.exe"/>
-							<param parameters="-testmodule testcombiner -config C:\TestFramework\tcbctestpbknotifier.cfg"/>
+							<param parameters="-testmodule testcombiner -config C:\TestFramework\tcbctestpbkdatamngt.cfg"/>
                             <param result-file="c:\spd_logs\xml\testcombiner.xml"/>
-                            <param timeout="3600"/>
+                            <param timeout="1800"/>
 						</params>
 					</step>
-					<step id="" name="mtpbkcontactchangenotifier (fetch-log)" harness="ATSINTERFACE" enabled="true" passrate="100">
+					<step id="" name="testpbkdatamngt (fetch-log)" harness="ATSINTERFACE" enabled="true" passrate="100">
 						<command>fetch-log</command>
 						<params>
 							<param path="c:\logs\testframework\TestReport.txt" /> 
 						</params>
 					</step>                
                 </case>
-            </set>
-            <set id="" name="Phonebook Fetch UI" harness="ATSINTERFACE" enabled="true" passrate="100">
-                <case id="" name="Phonebook SMS Address Select" harness="ATSINTERFACE" enabled="true" passrate="100">
+                <case id="" name="Phonebook Fetch UI" harness="ATSINTERFACE" enabled="true" passrate="100">
                     <step id="" name="SPD_Logs XML (makedir)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
                         <command>makedir</command>
                         <params>
@@ -803,24 +348,6 @@
 							<param component-path="phonebooktest" />
 						</params>
 					</step>
-					<step id="" name="testframework_smsaddsel.ini (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
-						<command>install</command>
-						<params>
-							<param type="data"/>
-							<param src="testframework\testframework_smsaddsel.ini"/>
-							<param dst="c:\testframework\testframework.ini"/>
-							<param component-path="phonebooktest" />
-						</params>
-					</step>
-					<step id="" name="tcbctestsmsaddsel.cfg (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
-						<command>install</command>
-						<params>
-							<param type="data"/>
-							<param src="testframework\tcbctestsmsaddsel.cfg"/>
-							<param dst="c:\testframework\tcbctestsmsaddsel.cfg"/>
-							<param component-path="phonebooktest" />
-						</params>
-					</step>
 					<step id="" name="ui_bctestsmsaddsel.cfg (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
 						<command>install</command>
 						<params>
@@ -830,29 +357,6 @@
 							<param component-path="phonebooktest" />
 						</params>
 					</step>
-					<step id="" name="mtpbksmsaddressselect (execute)" harness="ATSINTERFACE" enabled="true" passrate="100">
-						<command>execute</command>
-						<params>
-							<param file="atsinterface.exe"/>
-							<param parameters="-testmodule testcombiner -config C:\TestFramework\tcbctestsmsaddsel.cfg"/>
-                            <param result-file="c:\spd_logs\xml\testcombiner.xml"/>
-                            <param timeout="300"/>
-						</params>
-					</step>
-					<step id="" name="mtpbksmsaddressselect (fetch-log)" harness="ATSINTERFACE" enabled="true" passrate="100">
-						<command>fetch-log</command>
-						<params>
-							<param path="c:\logs\testframework\TestReport.txt" /> 
-						</params>
-					</step>                
-                </case>
-                <case id="" name="Phonebook Single Entry Fetch Dlg" harness="ATSINTERFACE" enabled="true" passrate="100">
-                    <step id="" name="SPD_Logs XML (makedir)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
-                        <command>makedir</command>
-                        <params>
-                            <param dir="c:\spd_logs\xml" /> 
-                        </params>
-                    </step>
                     <step id="" name="mtpbksingleentryfetchdlg.dll (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
 						<command>install</command>
 						<params>
@@ -862,24 +366,6 @@
 							<param component-path="phonebooktest" />
 						</params>
 					</step>
-					<step id="" name="testframework_sefielddlg.ini (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
-						<command>install</command>
-						<params>
-							<param type="data"/>
-							<param src="testframework\testframework_sefielddlg.ini"/>
-							<param dst="c:\testframework\testframework.ini"/>
-							<param component-path="phonebooktest" />
-						</params>
-					</step>
-					<step id="" name="tcbctestsefielddlg.cfg (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
-						<command>install</command>
-						<params>
-							<param type="data"/>
-							<param src="testframework\tcbctestsefielddlg.cfg"/>
-							<param dst="c:\testframework\tcbctestsefielddlg.cfg"/>
-							<param component-path="phonebooktest" />
-						</params>
-					</step>
 					<step id="" name="ui_bctestsefielddlg.cfg (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
 						<command>install</command>
 						<params>
@@ -889,29 +375,6 @@
 							<param component-path="phonebooktest" />
 						</params>
 					</step>
-					<step id="" name="mtpbksingleentryfetchdlg (execute)" harness="ATSINTERFACE" enabled="true" passrate="100">
-						<command>execute</command>
-						<params>
-							<param file="atsinterface.exe"/>
-							<param parameters="-testmodule testcombiner -config C:\TestFramework\tcbctestsefielddlg.cfg"/>
-                            <param result-file="c:\spd_logs\xml\testcombiner.xml"/>
-                            <param timeout="3600"/>
-						</params>
-					</step>
-					<step id="" name="mtpbksingleentryfetchdlg (fetch-log)" harness="ATSINTERFACE" enabled="true" passrate="100">
-						<command>fetch-log</command>
-						<params>
-							<param path="c:\logs\testframework\TestReport.txt" /> 
-						</params>
-					</step>                
-                </case>
-                <case id="" name="Phonebook POC Address Select" harness="ATSINTERFACE" enabled="true" passrate="100">
-                    <step id="" name="SPD_Logs XML (makedir)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
-                        <command>makedir</command>
-                        <params>
-                            <param dir="c:\spd_logs\xml" /> 
-                        </params>
-                    </step>
                     <step id="" name="mtpbkpocaddressselect.dll (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
 						<command>install</command>
 						<params>
@@ -921,24 +384,6 @@
 							<param component-path="phonebooktest" />
 						</params>
 					</step>
-					<step id="" name="testframework_pocadd.ini (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
-						<command>install</command>
-						<params>
-							<param type="data"/>
-							<param src="testframework\testframework_pocadd.ini"/>
-							<param dst="c:\testframework\testframework.ini"/>
-							<param component-path="phonebooktest" />
-						</params>
-					</step>
-					<step id="" name="tcbctestsefielddlg.cfg (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
-						<command>install</command>
-						<params>
-							<param type="data"/>
-							<param src="testframework\tcbctestsefielddlg.cfg"/>
-							<param dst="c:\testframework\tcbctestsefielddlg.cfg"/>
-							<param component-path="phonebooktest" />
-						</params>
-					</step>
 					<step id="" name="ui_bctestpocadd.cfg (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
 						<command>install</command>
 						<params>
@@ -948,29 +393,6 @@
 							<param component-path="phonebooktest" />
 						</params>
 					</step>
-					<step id="" name="mtpbkpocaddressselect (execute)" harness="ATSINTERFACE" enabled="true" passrate="100">
-						<command>execute</command>
-						<params>
-							<param file="atsinterface.exe"/>
-							<param parameters="-testmodule testcombiner -config C:\TestFramework\tcbctestsefielddlg.cfg"/>
-                            <param result-file="c:\spd_logs\xml\testcombiner.xml"/>
-                            <param timeout="3600"/>
-						</params>
-					</step>
-					<step id="" name="mtpbkpocaddressselect (fetch-log)" harness="ATSINTERFACE" enabled="true" passrate="100">
-						<command>fetch-log</command>
-						<params>
-							<param path="c:\logs\testframework\TestReport.txt" /> 
-						</params>
-					</step>                
-                </case>
-                <case id="" name="Phonebook Phone Number Select" harness="ATSINTERFACE" enabled="true" passrate="100">
-                    <step id="" name="SPD_Logs XML (makedir)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
-                        <command>makedir</command>
-                        <params>
-                            <param dir="c:\spd_logs\xml" /> 
-                        </params>
-                    </step>
                     <step id="" name="mtpbkphonenumberselect.dll (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
 						<command>install</command>
 						<params>
@@ -980,24 +402,6 @@
 							<param component-path="phonebooktest" />
 						</params>
 					</step>
-					<step id="" name="testframework_phonenumber.ini (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
-						<command>install</command>
-						<params>
-							<param type="data"/>
-							<param src="testframework\testframework_phonenumber.ini"/>
-							<param dst="c:\testframework\testframework.ini"/>
-							<param component-path="phonebooktest" />
-						</params>
-					</step>
-					<step id="" name="tcbctestphonenumber.cfg (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
-						<command>install</command>
-						<params>
-							<param type="data"/>
-							<param src="testframework\tcbctestphonenumber.cfg"/>
-							<param dst="c:\testframework\tcbctestphonenumber.cfg"/>
-							<param component-path="phonebooktest" />
-						</params>
-					</step>
 					<step id="" name="ui_bctestphonenumber.cfg (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
 						<command>install</command>
 						<params>
@@ -1007,29 +411,6 @@
 							<param component-path="phonebooktest" />
 						</params>
 					</step>
-					<step id="" name="mtpbkphonenumberselect (execute)" harness="ATSINTERFACE" enabled="true" passrate="100">
-						<command>execute</command>
-						<params>
-							<param file="atsinterface.exe"/>
-							<param parameters="-testmodule testcombiner -config C:\TestFramework\tcbctestphonenumber.cfg"/>
-                            <param result-file="c:\spd_logs\xml\testcombiner.xml"/>
-                            <param timeout="300"/>
-						</params>
-					</step>
-					<step id="" name="mtpbkphonenumberselect (fetch-log)" harness="ATSINTERFACE" enabled="true" passrate="100">
-						<command>fetch-log</command>
-						<params>
-							<param path="c:\logs\testframework\TestReport.txt" /> 
-						</params>
-					</step>                
-                </case>
-                <case id="" name="Phonebook Multiple Entry Fetch Dlg" harness="ATSINTERFACE" enabled="true" passrate="100">
-                    <step id="" name="SPD_Logs XML (makedir)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
-                        <command>makedir</command>
-                        <params>
-                            <param dir="c:\spd_logs\xml" /> 
-                        </params>
-                    </step>
                     <step id="" name="mtpbkmultipleentryfetchdlg.dll (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
 						<command>install</command>
 						<params>
@@ -1039,15 +420,6 @@
 							<param component-path="phonebooktest" />
 						</params>
 					</step>
-					<step id="" name="testframework_fetchdlg.ini (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
-						<command>install</command>
-						<params>
-							<param type="data"/>
-							<param src="testframework\testframework_fetchdlg.ini"/>
-							<param dst="c:\testframework\testframework.ini"/>
-							<param component-path="phonebooktest" />
-						</params>
-					</step>
 					<step id="" name="ui_bctestfetchdlg.cfg (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
 						<command>install</command>
 						<params>
@@ -1066,29 +438,6 @@
 							<param component-path="phonebooktest" />
 						</params>
 					</step>
-					<step id="" name="mtpbkmultipleentryfetchdlg (execute)" harness="ATSINTERFACE" enabled="true" passrate="100">
-						<command>execute</command>
-						<params>
-							<param file="atsinterface.exe"/>
-							<param parameters="-testmodule testcombiner -config C:\TestFramework\ui_bctestfetchdlg.cfg"/>
-                            <param result-file="c:\spd_logs\xml\testcombiner.xml"/>
-                            <param timeout="3600"/>
-						</params>
-					</step>
-					<step id="" name="mtpbkmultipleentryfetchdlg (fetch-log)" harness="ATSINTERFACE" enabled="true" passrate="100">
-						<command>fetch-log</command>
-						<params>
-							<param path="c:\logs\testframework\TestReport.txt" /> 
-						</params>
-					</step>                
-                </case>
-                <case id="" name="Phonebook MMS Address Select" harness="ATSINTERFACE" enabled="true" passrate="100">
-                    <step id="" name="SPD_Logs XML (makedir)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
-                        <command>makedir</command>
-                        <params>
-                            <param dir="c:\spd_logs\xml" /> 
-                        </params>
-                    </step>
                     <step id="" name="mtpbkmmsaddressselect.dll (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
 						<command>install</command>
 						<params>
@@ -1098,24 +447,6 @@
 							<param component-path="phonebooktest" />
 						</params>
 					</step>
-					<step id="" name="testframework_mmsaddsel.ini (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
-						<command>install</command>
-						<params>
-							<param type="data"/>
-							<param src="testframework\testframework_mmsaddsel.ini"/>
-							<param dst="c:\testframework\testframework.ini"/>
-							<param component-path="phonebooktest" />
-						</params>
-					</step>
-					<step id="" name="tcbctestmmsaddsel.cfg (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
-						<command>install</command>
-						<params>
-							<param type="data"/>
-							<param src="testframework\tcbctestmmsaddsel.cfg"/>
-							<param dst="c:\testframework\tcbctestmmsaddsel.cfg"/>
-							<param component-path="phonebooktest" />
-						</params>
-					</step>
 					<step id="" name="ui_bctestmmsaddsel.cfg (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
 						<command>install</command>
 						<params>
@@ -1125,29 +456,6 @@
 							<param component-path="phonebooktest" />
 						</params>
 					</step>
-					<step id="" name="mtpbkmmsaddressselect (execute)" harness="ATSINTERFACE" enabled="true" passrate="100">
-						<command>execute</command>
-						<params>
-							<param file="atsinterface.exe"/>
-							<param parameters="-testmodule testcombiner -config C:\TestFramework\tcbctestmmsaddsel.cfg"/>
-                            <param result-file="c:\spd_logs\xml\testcombiner.xml"/>
-                            <param timeout="300"/>
-						</params>
-					</step>
-					<step id="" name="mtpbkmmsaddressselect (fetch-log)" harness="ATSINTERFACE" enabled="true" passrate="100">
-						<command>fetch-log</command>
-						<params>
-							<param path="c:\logs\testframework\TestReport.txt" /> 
-						</params>
-					</step>                
-                </case>
-                <case id="" name="Phonebook Add Item Dlg" harness="ATSINTERFACE" enabled="true" passrate="100">
-                    <step id="" name="SPD_Logs XML (makedir)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
-                        <command>makedir</command>
-                        <params>
-                            <param dir="c:\spd_logs\xml" /> 
-                        </params>
-                    </step>
                     <step id="" name="mtpbkmemoryentryadditemdlg.dll (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
 						<command>install</command>
 						<params>
@@ -1157,24 +465,6 @@
 							<param component-path="phonebooktest" />
 						</params>
 					</step>
-					<step id="" name="testframework_pbkadditemdlg.ini (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
-						<command>install</command>
-						<params>
-							<param type="data"/>
-							<param src="testframework\testframework_pbkadditemdlg.ini"/>
-							<param dst="c:\testframework\testframework.ini"/>
-							<param component-path="phonebooktest" />
-						</params>
-					</step>
-					<step id="" name="tcbctestpbkadditemdlg.cfg (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
-						<command>install</command>
-						<params>
-							<param type="data"/>
-							<param src="testframework\tcbctestpbkadditemdlg.cfg"/>
-							<param dst="c:\testframework\tcbctestpbkadditemdlg.cfg"/>
-							<param component-path="phonebooktest" />
-						</params>
-					</step>
 					<step id="" name="ui_bctestpbkadditemdlg.cfg (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
 						<command>install</command>
 						<params>
@@ -1184,29 +474,6 @@
 							<param component-path="phonebooktest" />
 						</params>
 					</step>
-					<step id="" name="mtpbkmemoryentryadditemdlg (execute)" harness="ATSINTERFACE" enabled="true" passrate="100">
-						<command>execute</command>
-						<params>
-							<param file="atsinterface.exe"/>
-							<param parameters="-testmodule testcombiner -config C:\TestFramework\tcbctestpbkadditemdlg.cfg"/>
-                            <param result-file="c:\spd_logs\xml\testcombiner.xml"/>
-                            <param timeout="3600"/>
-						</params>
-					</step>
-					<step id="" name="mtpbkmemoryentryadditemdlg (fetch-log)" harness="ATSINTERFACE" enabled="true" passrate="100">
-						<command>fetch-log</command>
-						<params>
-							<param path="c:\logs\testframework\TestReport.txt" /> 
-						</params>
-					</step>                
-                </case>
-                <case id="" name="Phonebook Fetch Selection" harness="ATSINTERFACE" enabled="true" passrate="100">
-                    <step id="" name="SPD_Logs XML (makedir)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
-                        <command>makedir</command>
-                        <params>
-                            <param dir="c:\spd_logs\xml" /> 
-                        </params>
-                    </step>
                     <step id="" name="mtpbkfetchdlgselection.dll (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
 						<command>install</command>
 						<params>
@@ -1216,24 +483,6 @@
 							<param component-path="phonebooktest" />
 						</params>
 					</step>
-					<step id="" name="testframework_fetchsel.ini (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
-						<command>install</command>
-						<params>
-							<param type="data"/>
-							<param src="testframework\testframework_fetchsel.ini"/>
-							<param dst="c:\testframework\testframework.ini"/>
-							<param component-path="phonebooktest" />
-						</params>
-					</step>
-					<step id="" name="tcbctestfetchsel.cfg (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
-						<command>install</command>
-						<params>
-							<param type="data"/>
-							<param src="testframework\tcbctestfetchsel.cfg"/>
-							<param dst="c:\testframework\tcbctestfetchsel.cfg"/>
-							<param component-path="phonebooktest" />
-						</params>
-					</step>
 					<step id="" name="ui_bctestfetchsel.cfg (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
 						<command>install</command>
 						<params>
@@ -1243,29 +492,6 @@
 							<param component-path="phonebooktest" />
 						</params>
 					</step>
-					<step id="" name="mtpbkfetchdlgselection (execute)" harness="ATSINTERFACE" enabled="true" passrate="100">
-						<command>execute</command>
-						<params>
-							<param file="atsinterface.exe"/>
-							<param parameters="-testmodule testcombiner -config C:\TestFramework\tcbctestfetchsel.cfg"/>
-                            <param result-file="c:\spd_logs\xml\testcombiner.xml"/>
-                            <param timeout="3600"/>
-						</params>
-					</step>
-					<step id="" name="mtpbkfetchdlgselection (fetch-log)" harness="ATSINTERFACE" enabled="true" passrate="100">
-						<command>fetch-log</command>
-						<params>
-							<param path="c:\logs\testframework\TestReport.txt" /> 
-						</params>
-					</step>                
-                </case>
-                <case id="" name="Phonebook Fetch Callbacks" harness="ATSINTERFACE" enabled="true" passrate="100">
-                    <step id="" name="SPD_Logs XML (makedir)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
-                        <command>makedir</command>
-                        <params>
-                            <param dir="c:\spd_logs\xml" /> 
-                        </params>
-                    </step>
                     <step id="" name="mtpbkfetchcallbacks.dll (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
 						<command>install</command>
 						<params>
@@ -1275,24 +501,6 @@
 							<param component-path="phonebooktest" />
 						</params>
 					</step>
-					<step id="" name="testframework_fcallback.ini (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
-						<command>install</command>
-						<params>
-							<param type="data"/>
-							<param src="testframework\testframework_fcallback.ini"/>
-							<param dst="c:\testframework\testframework.ini"/>
-							<param component-path="phonebooktest" />
-						</params>
-					</step>
-					<step id="" name="tcbctestfcallback.cfg (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
-						<command>install</command>
-						<params>
-							<param type="data"/>
-							<param src="testframework\tcbctestfcallback.cfg"/>
-							<param dst="c:\testframework\tcbctestfcallback.cfg"/>
-							<param component-path="phonebooktest" />
-						</params>
-					</step>
 					<step id="" name="ui_bctestfcallback.cfg (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
 						<command>install</command>
 						<params>
@@ -1302,29 +510,6 @@
 							<param component-path="phonebooktest" />
 						</params>
 					</step>
-					<step id="" name="mtpbkfetchcallbacks (execute)" harness="ATSINTERFACE" enabled="true" passrate="100">
-						<command>execute</command>
-						<params>
-							<param file="atsinterface.exe"/>
-							<param parameters="-testmodule testcombiner -config C:\TestFramework\tcbctestfcallback.cfg"/>
-                            <param result-file="c:\spd_logs\xml\testcombiner.xml"/>
-                            <param timeout="3600"/>
-						</params>
-					</step>
-					<step id="" name="mtpbkfetchcallbacks (fetch-log)" harness="ATSINTERFACE" enabled="true" passrate="100">
-						<command>fetch-log</command>
-						<params>
-							<param path="c:\logs\testframework\TestReport.txt" /> 
-						</params>
-					</step>                
-                </case>
-                <case id="" name="Phonebook Email Over SMS" harness="ATSINTERFACE" enabled="true" passrate="100">
-                    <step id="" name="SPD_Logs XML (makedir)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
-                        <command>makedir</command>
-                        <params>
-                            <param dir="c:\spd_logs\xml" /> 
-                        </params>
-                    </step>
                     <step id="" name="mtpbkemailoversms.dll (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
 						<command>install</command>
 						<params>
@@ -1334,24 +519,6 @@
 							<param component-path="phonebooktest" />
 						</params>
 					</step>
-					<step id="" name="testframework_emailoversms.ini (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
-						<command>install</command>
-						<params>
-							<param type="data"/>
-							<param src="testframework\testframework_emailoversms.ini"/>
-							<param dst="c:\testframework\testframework.ini"/>
-							<param component-path="phonebooktest" />
-						</params>
-					</step>
-					<step id="" name="tcbctestemaioversms.cfg (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
-						<command>install</command>
-						<params>
-							<param type="data"/>
-							<param src="testframework\tcbctestemaioversms.cfg"/>
-							<param dst="c:\testframework\tcbctestemaioversms.cfg"/>
-							<param component-path="phonebooktest" />
-						</params>
-					</step>
 					<step id="" name="ui_bctestemaioversms.cfg (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
 						<command>install</command>
 						<params>
@@ -1361,29 +528,6 @@
 							<param component-path="phonebooktest" />
 						</params>
 					</step>
-					<step id="" name="mtpbkemailoversms (execute)" harness="ATSINTERFACE" enabled="true" passrate="100">
-						<command>execute</command>
-						<params>
-							<param file="atsinterface.exe"/>
-							<param parameters="-testmodule testcombiner -config C:\TestFramework\tcbctestemaioversms.cfg"/>
-                            <param result-file="c:\spd_logs\xml\testcombiner.xml"/>
-                            <param timeout="300"/>
-						</params>
-					</step>
-					<step id="" name="mtpbkemailoversms (fetch-log)" harness="ATSINTERFACE" enabled="true" passrate="100">
-						<command>fetch-log</command>
-						<params>
-							<param path="c:\logs\testframework\TestReport.txt" /> 
-						</params>
-					</step>                
-                </case>
-                <case id="" name="Phonebook Email Address Select" harness="ATSINTERFACE" enabled="true" passrate="100">
-                    <step id="" name="SPD_Logs XML (makedir)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
-                        <command>makedir</command>
-                        <params>
-                            <param dir="c:\spd_logs\xml" /> 
-                        </params>
-                    </step>
                     <step id="" name="mtpbkemailaddressselect.dll (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
 						<command>install</command>
 						<params>
@@ -1393,24 +537,6 @@
 							<param component-path="phonebooktest" />
 						</params>
 					</step>
-					<step id="" name="testframework_addemailsel.ini (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
-						<command>install</command>
-						<params>
-							<param type="data"/>
-							<param src="testframework\testframework_addemailsel.ini"/>
-							<param dst="c:\testframework\testframework.ini"/>
-							<param component-path="phonebooktest" />
-						</params>
-					</step>
-					<step id="" name="tcbctestemailaddsel.cfg (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
-						<command>install</command>
-						<params>
-							<param type="data"/>
-							<param src="testframework\tcbctestemailaddsel.cfg"/>
-							<param dst="c:\testframework\tcbctestemailaddsel.cfg"/>
-							<param component-path="phonebooktest" />
-						</params>
-					</step>
 					<step id="" name="ui_bctestemailaddsel.cfg (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
 						<command>install</command>
 						<params>
@@ -1420,29 +546,6 @@
 							<param component-path="phonebooktest" />
 						</params>
 					</step>
-					<step id="" name="mtpbkemailaddressselect (execute)" harness="ATSINTERFACE" enabled="true" passrate="100">
-						<command>execute</command>
-						<params>
-							<param file="atsinterface.exe"/>
-							<param parameters="-testmodule testcombiner -config C:\TestFramework\tcbctestemailaddsel.cfg"/>
-                            <param result-file="c:\spd_logs\xml\testcombiner.xml"/>
-                            <param timeout="3600"/>
-						</params>
-					</step>
-					<step id="" name="mtpbkemailaddressselect (fetch-log)" harness="ATSINTERFACE" enabled="true" passrate="100">
-						<command>fetch-log</command>
-						<params>
-							<param path="c:\logs\testframework\TestReport.txt" /> 
-						</params>
-					</step>                
-                </case>
-                <case id="" name="Phonebook Address Select" harness="ATSINTERFACE" enabled="true" passrate="100">
-                    <step id="" name="SPD_Logs XML (makedir)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
-                        <command>makedir</command>
-                        <params>
-                            <param dir="c:\spd_logs\xml" /> 
-                        </params>
-                    </step>
                     <step id="" name="mtpbkaddressselect.dll (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
 						<command>install</command>
 						<params>
@@ -1452,24 +555,6 @@
 							<param component-path="phonebooktest" />
 						</params>
 					</step>
-					<step id="" name="testframework_pbkaddsel.ini (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
-						<command>install</command>
-						<params>
-							<param type="data"/>
-							<param src="testframework\testframework_pbkaddsel.ini"/>
-							<param dst="c:\testframework\testframework.ini"/>
-							<param component-path="phonebooktest" />
-						</params>
-					</step>
-					<step id="" name="tcbctestpbkaddsel.cfg (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
-						<command>install</command>
-						<params>
-							<param type="data"/>
-							<param src="testframework\tcbctestpbkaddsel.cfg"/>
-							<param dst="c:\testframework\tcbctestpbkaddsel.cfg"/>
-							<param component-path="phonebooktest" />
-						</params>
-					</step>
 					<step id="" name="ui_bctestpbkaddsel.cfg (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
 						<command>install</command>
 						<params>
@@ -1483,34 +568,11 @@
 						<command>install</command>
 						<params>
 							<param type="binary"/>
-							<param src="z/resource/plugins/pbkaddressselect.rsc"/>
-							<param dst="z:\resource\plugins\pbkaddressselect.rsc"/>
+							<param src="z\resource\pbkaddressselect.rsc"/>
+							<param dst="z:\resource\pbkaddressselect.rsc"/>
 							<param component-path="phonebooktest" />
 						</params>
 					</step>
-					<step id="" name="mtpbkaddressselect (execute)" harness="ATSINTERFACE" enabled="true" passrate="100">
-						<command>execute</command>
-						<params>
-							<param file="atsinterface.exe"/>
-							<param parameters="-testmodule testcombiner -config C:\TestFramework\tcbctestpbkaddsel.cfg"/>
-                            <param result-file="c:\spd_logs\xml\testcombiner.xml"/>
-                            <param timeout="3600"/>
-						</params>
-					</step>
-					<step id="" name="mtpbkaddressselect (fetch-log)" harness="ATSINTERFACE" enabled="true" passrate="100">
-						<command>fetch-log</command>
-						<params>
-							<param path="c:\logs\testframework\TestReport.txt" /> 
-						</params>
-					</step>                
-                </case>
-                <case id="" name="Phonebook Phone Number Select" harness="ATSINTERFACE" enabled="true" passrate="100">
-                    <step id="" name="SPD_Logs XML (makedir)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
-                        <command>makedir</command>
-                        <params>
-                            <param dir="c:\spd_logs\xml" /> 
-                        </params>
-                    </step>
                     <step id="" name="mtpbkphonenumberselectbase.dll (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
 						<command>install</command>
 						<params>
@@ -1520,15 +582,6 @@
 							<param component-path="phonebooktest" />
 						</params>
 					</step>
-					<step id="" name="testframework_numsel.ini (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
-						<command>install</command>
-						<params>
-							<param type="data"/>
-							<param src="testframework\testframework_numsel.ini"/>
-							<param dst="c:\testframework\testframework.ini"/>
-							<param component-path="phonebooktest" />
-						</params>
-					</step>
 					<step id="" name="tcbctestnumsel.cfg (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
 						<command>install</command>
 						<params>
@@ -1551,34 +604,11 @@
 						<command>install</command>
 						<params>
 							<param type="binary"/>
-							<param src="z/resource/plugins/mt_cpbkphonenumberselectbase.rsc"/>
-							<param dst="z:\resource\plugins\mt_cpbkphonenumberselectbase.rsc"/>
+							<param src="z\resource\mt_cpbkphonenumberselectbase.rsc"/>
+							<param dst="z:\resource\mt_cpbkphonenumberselectbase.rsc"/>
 							<param component-path="phonebooktest" />
 						</params>
 					</step>
-					<step id="" name="mtpbkphonenumberselectbase (execute)" harness="ATSINTERFACE" enabled="true" passrate="100">
-						<command>execute</command>
-						<params>
-							<param file="atsinterface.exe"/>
-							<param parameters="-testmodule testcombiner -config C:\TestFramework\tcbctestnumsel.cfg"/>
-                            <param result-file="c:\spd_logs\xml\testcombiner.xml"/>
-                            <param timeout="3600"/>
-						</params>
-					</step>
-					<step id="" name="mtpbkphonenumberselectbase (fetch-log)" harness="ATSINTERFACE" enabled="true" passrate="100">
-						<command>fetch-log</command>
-						<params>
-							<param path="c:\logs\testframework\TestReport.txt" /> 
-						</params>
-					</step>                
-                </case>
-                <case id="" name="Phonebook Select Field Dlg" harness="ATSINTERFACE" enabled="true" passrate="100">
-                    <step id="" name="SPD_Logs XML (makedir)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
-                        <command>makedir</command>
-                        <params>
-                            <param dir="c:\spd_logs\xml" /> 
-                        </params>
-                    </step>
                     <step id="" name="mtpbkselectfielddlg.dll (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
 						<command>install</command>
 						<params>
@@ -1588,24 +618,6 @@
 							<param component-path="phonebooktest" />
 						</params>
 					</step>
-					<step id="" name="testframework_fielddlg.ini (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
-						<command>install</command>
-						<params>
-							<param type="data"/>
-							<param src="testframework\testframework_fielddlg.ini"/>
-							<param dst="c:\testframework\testframework.ini"/>
-							<param component-path="phonebooktest" />
-						</params>
-					</step>
-					<step id="" name="tcbctestfielddlg.cfg (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
-						<command>install</command>
-						<params>
-							<param type="data"/>
-							<param src="testframework\tcbctestfielddlg.cfg"/>
-							<param dst="c:\testframework\tcbctestfielddlg.cfg"/>
-							<param component-path="phonebooktest" />
-						</params>
-					</step>
 					<step id="" name="ui_bctestfielddlg.cfg (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
 						<command>install</command>
 						<params>
@@ -1615,29 +627,6 @@
 							<param component-path="phonebooktest" />
 						</params>
 					</step>
-					<step id="" name="mtpbkselectfielddlg (execute)" harness="ATSINTERFACE" enabled="true" passrate="100">
-						<command>execute</command>
-						<params>
-							<param file="atsinterface.exe"/>
-							<param parameters="-testmodule testcombiner -config C:\TestFramework\tcbctestfielddlg.cfg"/>
-                            <param result-file="c:\spd_logs\xml\testcombiner.xml"/>
-                            <param timeout="300"/>
-						</params>
-					</step>
-					<step id="" name="mtpbkselectfielddlg (fetch-log)" harness="ATSINTERFACE" enabled="true" passrate="100">
-						<command>fetch-log</command>
-						<params>
-							<param path="c:\logs\testframework\TestReport.txt" /> 
-						</params>
-					</step>                
-                </case>
-                <case id="" name="Phonebook Single Item Select Dlg" harness="ATSINTERFACE" enabled="true" passrate="100">
-                    <step id="" name="SPD_Logs XML (makedir)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
-                        <command>makedir</command>
-                        <params>
-                            <param dir="c:\spd_logs\xml" /> 
-                        </params>
-                    </step>
                     <step id="" name="mtpbksingleitemfetchdlg.dll (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
 						<command>install</command>
 						<params>
@@ -1647,24 +636,6 @@
 							<param component-path="phonebooktest" />
 						</params>
 					</step>
-					<step id="" name="testframework_sifielddlg.ini (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
-						<command>install</command>
-						<params>
-							<param type="data"/>
-							<param src="testframework\testframework_sifielddlg.ini"/>
-							<param dst="c:\testframework\testframework.ini"/>
-							<param component-path="phonebooktest" />
-						</params>
-					</step>
-					<step id="" name="tcbctestsifielddlg.cfg (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
-						<command>install</command>
-						<params>
-							<param type="data"/>
-							<param src="testframework\tcbctestsifielddlg.cfg"/>
-							<param dst="c:\testframework\tcbctestsifielddlg.cfg"/>
-							<param component-path="phonebooktest" />
-						</params>
-					</step>
 					<step id="" name="ui_bctestsifielddlg.cfg (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
 						<command>install</command>
 						<params>
@@ -1674,24 +645,43 @@
 							<param component-path="phonebooktest" />
 						</params>
 					</step>
-					<step id="" name="mtpbksingleitemfetchdlg (execute)" harness="ATSINTERFACE" enabled="true" passrate="100">
+					
+					<step id="" name="testframework_pbkfetch.ini (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
+						<command>install</command>
+						<params>
+							<param type="data"/>
+							<param src="testframework\testframework_pbkfetch.ini"/>
+							<param dst="c:\testframework\testframework.ini"/>
+							<param component-path="phonebooktest" />
+						</params>
+					</step>
+					
+					<step id="" name="tcbctestpbkfetch.cfg (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
+						<command>install</command>
+						<params>
+							<param type="data"/>
+							<param src="testframework\tcbctestpbkfetch.cfg"/>
+							<param dst="c:\testframework\tcbctestpbkfetch.cfg"/>
+							<param component-path="phonebooktest" />
+						</params>
+					</step>
+					
+					<step id="" name="testpbkfetch (execute)" harness="ATSINTERFACE" enabled="true" passrate="100">
 						<command>execute</command>
 						<params>
 							<param file="atsinterface.exe"/>
-							<param parameters="-testmodule testcombiner -config C:\TestFramework\tcbctestsifielddlg.cfg"/>
+							<param parameters="-testmodule testcombiner -config c:\testframework\tcbctestpbkfetch.cfg"/>
                             <param result-file="c:\spd_logs\xml\testcombiner.xml"/>
-                            <param timeout="3600"/>
+                            <param timeout="1800"/>
 						</params>
 					</step>
-					<step id="" name="mtpbksingleitemfetchdlg (fetch-log)" harness="ATSINTERFACE" enabled="true" passrate="100">
+					<step id="" name="testpbkfetch (fetch-log)" harness="ATSINTERFACE" enabled="true" passrate="100">
 						<command>fetch-log</command>
 						<params>
 							<param path="c:\logs\testframework\TestReport.txt" /> 
 						</params>
 					</step>                
                 </case>
-            </set>
-            <set id="" name="Phonebook UI Utilities" harness="ATSINTERFACE" enabled="true" passrate="100">
                 <case id="" name="Phonebook UI Utilities" harness="ATSINTERFACE" enabled="true" passrate="100">
                     <step id="" name="SPD_Logs XML (makedir)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
                         <command>makedir</command>
@@ -1741,7 +731,7 @@
 							<param file="atsinterface.exe"/>
 							<param parameters="-testmodule testcombiner -config C:\TestFramework\tcbctestpbkuiutil.cfg"/>
                             <param result-file="c:\spd_logs\xml\testcombiner.xml"/>
-                            <param timeout="3600"/>
+                            <param timeout="1800"/>
 						</params>
 					</step>
 					<step id="" name="bctestpbkuiutil (fetch-log)" harness="ATSINTERFACE" enabled="true" passrate="100">
@@ -1751,8 +741,6 @@
 						</params>
 					</step>                
                 </case>
-            </set>
-            <set id="" name="Phonebook VCard Import Export" harness="ATSINTERFACE" enabled="true" passrate="100">
                 <case id="" name="Phonebook VCard Import Export" harness="ATSINTERFACE" enabled="true" passrate="100">
                     <step id="" name="SPD_Logs XML (makedir)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
                         <command>makedir</command>
@@ -1883,7 +871,7 @@
 							<param file="atsinterface.exe"/>
 							<param parameters="-testmodule testcombiner -config C:\TestFramework\tcbctestpbkvcardimportexport.cfg"/>
                             <param result-file="c:\spd_logs\xml\testcombiner.xml"/>
-                            <param timeout="3600"/>
+                            <param timeout="900"/>
 						</params>
 					</step>
 					<step id="" name="bctestpbkvcardimportexport (fetch-log)" harness="ATSINTERFACE" enabled="true" passrate="100">
@@ -1893,8 +881,6 @@
 						</params>
 					</step>                
                 </case>
-            </set>
-            <set id="" name="Phonebook Speed Dial" harness="ATSINTERFACE" enabled="true" passrate="100">
                 <case id="" name="Phonebook Speed Dial" harness="ATSINTERFACE" enabled="true" passrate="100">
                     <step id="" name="SPD_Logs XML (makedir)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
                         <command>makedir</command>
@@ -1944,7 +930,7 @@
 							<param file="atsinterface.exe"/>
 							<param parameters="-testmodule testcombiner -config C:\TestFramework\tcspeeddial.cfg"/>
                             <param result-file="c:\spd_logs\xml\testcombiner.xml"/>
-                            <param timeout="300"/>
+                            <param timeout="900"/>
 						</params>
 					</step>
 					<step id="" name="bctestspeeddial (fetch-log)" harness="ATSINTERFACE" enabled="true" passrate="100">
@@ -1964,64 +950,43 @@
         <file>phonebooktest/general/testframework/ui_bctestpbkdataaddedit.cfg</file>
 
 		<file>phonebooktest/winscw_udeb/mtrpbkviewresourcefile.dll</file>
-		<file>phonebooktest/general/testframework/testframework_pbkvrsc.ini</file>
-        <file>phonebooktest/general/testframework/tcbctestpbkvrsc.cfg</file>
         <file>phonebooktest/general/testframework/ui_bctestpbkvrsc.cfg</file>
 
 		<file>phonebooktest/winscw_udeb/mtpbkidlefinder.dll</file>
-		<file>phonebooktest/general/testframework/testframework_pbkifinder.ini</file>
-        <file>phonebooktest/general/testframework/tcbctestpbkifinder.cfg</file>
         <file>phonebooktest/general/testframework/ui_bctestpbkifinder.cfg</file>
 
 		<file>phonebooktest/winscw_udeb/mtpbkiconinfo.dll</file>
-		<file>phonebooktest/general/testframework/testframework_pbkinfo.ini</file>
-        <file>phonebooktest/general/testframework/tcbctestpbkinfo.cfg</file>
         <file>phonebooktest/general/testframework/ui_bctestpbkinfo.cfg</file>
 
 		<file>phonebooktest/winscw_udeb/mtpbkiconid.dll</file>
-		<file>phonebooktest/general/testframework/testframework_pbkicon.ini</file>
-        <file>phonebooktest/general/testframework/tcbctestpbkicon.cfg</file>
         <file>phonebooktest/general/testframework/ui_bctestpbkicon.cfg</file>
 
 		<file>phonebooktest/winscw_udeb/mtpbkfields.dll</file>
-		<file>phonebooktest/general/testframework/testframework_pbkfeilds.ini</file>
-        <file>phonebooktest/general/testframework/tcbctestpbkfeilds.cfg</file>
         <file>phonebooktest/general/testframework/ui_bctestpbkfeilds.cfg</file>
 
 		<file>phonebooktest/winscw_udeb/mtpbkfielddata.dll</file>
-		<file>phonebooktest/general/testframework/testframework_pbkfdata.ini</file>
-        <file>phonebooktest/general/testframework/tcbctestpbkfdata.cfg</file>
         <file>phonebooktest/general/testframework/ui_bctestpbkfdata.cfg</file>
 
 		<file>phonebooktest/winscw_udeb/mtpbkcontactiter.dll</file>
-		<file>phonebooktest/general/testframework/testframework_pbkiter.ini</file>
-        <file>phonebooktest/general/testframework/tcbctestpbkiter.cfg</file>
         <file>phonebooktest/general/testframework/ui_bctestpbkiter.cfg</file>
 
 		<file>phonebooktest/winscw_udeb/mtpbkcontactitemfield.dll</file>
-		<file>phonebooktest/general/testframework/testframework_pbkcif.ini</file>
-        <file>phonebooktest/general/testframework/tcbctestpbkcif.cfg</file>
         <file>phonebooktest/general/testframework/ui_bctestpbkcif.cfg</file>
 
 		<file>phonebooktest/winscw_udeb/mtpbkcontactengine.dll</file>
-		<file>phonebooktest/general/testframework/testframework_cengine.ini</file>
-        <file>phonebooktest/general/testframework/tcbctestcengine.cfg</file>
         <file>phonebooktest/general/testframework/ui_bctestcengine.cfg</file>
 
 		<file>phonebooktest/winscw_udeb/mtpbkfieldsinfo.dll</file>
-		<file>phonebooktest/general/testframework/testframework_pbkfinfo.ini</file>
-        <file>phonebooktest/general/testframework/tcbctestpbkfinfo.cfg</file>
         <file>phonebooktest/general/testframework/ui_bctestpbkfinfo.cfg</file>
 
 		<file>phonebooktest/winscw_udeb/mtpbkcontactitem.dll</file>
-		<file>phonebooktest/general/testframework/testframework_pbkcitem.ini</file>
-        <file>phonebooktest/general/testframework/tcbctestpbkcitem.cfg</file>
         <file>phonebooktest/general/testframework/ui_bctestpbkcitem.cfg</file>
 
 		<file>phonebooktest/winscw_udeb/mtpbkcontactchangenotifier.dll</file>
-		<file>phonebooktest/general/testframework/testframework_pbknotifier.ini</file>
-        <file>phonebooktest/general/testframework/tcbctestpbknotifier.cfg</file>
         <file>phonebooktest/general/testframework/ui_bctestpbkpbknotifier.cfg</file>
+		
+		<file>phonebooktest/general/testframework/testframework_pbkdmngt.ini</file>
+        <file>phonebooktest/general/testframework/tcbctestpbkdatamngt.cfg</file>		
 
 		<file>phonebooktest/winscw_udeb/mtpbksmsaddressselect.dll</file>
 		<file>phonebooktest/general/testframework/testframework_smsaddsel.ini</file>
@@ -2082,13 +1047,13 @@
 		<file>phonebooktest/general/testframework/testframework_pbkaddsel.ini</file>
         <file>phonebooktest/general/testframework/tcbctestpbkaddsel.cfg</file>
         <file>phonebooktest/general/testframework/ui_bctestpbkaddsel.cfg</file>
-		<file>phonebooktest/winscw_udeb/z/resource/plugins/pbkaddressselect.rsc</file>
+		<file>phonebooktest/winscw_udeb/z/resource/pbkaddressselect.rsc</file>
 
 		<file>phonebooktest/winscw_udeb/mtpbkphonenumberselectbase.dll</file>
 		<file>phonebooktest/general/testframework/testframework_numsel.ini</file>
         <file>phonebooktest/general/testframework/tcbctestnumsel.cfg</file>
         <file>phonebooktest/general/testframework/ui_bctestnumsel.cfg</file>
-		<file>phonebooktest/winscw_udeb/z/resource/plugins/mt_cpbkphonenumberselectbase.rsc</file>
+		<file>phonebooktest/winscw_udeb/z/resource/mt_cpbkphonenumberselectbase.rsc</file>
 
 		<file>phonebooktest/winscw_udeb/mtpbkselectfielddlg.dll</file>
 		<file>phonebooktest/general/testframework/testframework_fielddlg.ini</file>
@@ -2100,6 +1065,9 @@
         <file>phonebooktest/general/testframework/tcbctestsifielddlg.cfg</file>
         <file>phonebooktest/general/testframework/ui_bctestsifielddlg.cfg</file>
 
+		<file>phonebooktest/general/testframework/testframework_pbkfetch.ini</file>
+		<file>phonebooktest/general/testframework/tcbctestpbkfetch.cfg</file>
+		
 		<file>phonebooktest/winscw_udeb/bctestpbkuiutil.dll</file>
 		<file>phonebooktest/general/testframework/testframework_pbkuiutil.ini</file>
 		<file>phonebooktest/general/testframework/tcbctestpbkuiutil.cfg</file>