# HG changeset patch
# User Louis Henry Nayegon <louisn@symbian.org>
# Date 1247560201 -3600
# Node ID 60e228580ee89ec072949b036a5419d9e5b94d06
# Parent  516def754cd84520485b635483237b7e90965eca# Parent  52c893932513e1da0bfac21ca9246f2f2f6c6777
merge

diff -r 52c893932513 -r 60e228580ee8 common/tools/ats/bctest/BC_PLAT.h
--- a/common/tools/ats/bctest/BC_PLAT.h	Fri Jul 10 14:56:28 2009 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,4 +0,0 @@
-#define __SERIES60_30__
-#define __SERIES60_31__
-#define __S60_32__
-#define __S60_50__
diff -r 52c893932513 -r 60e228580ee8 common/tools/ats/bctest/bctest.pl
--- a/common/tools/ats/bctest/bctest.pl	Fri Jul 10 14:56:28 2009 +0100
+++ b/common/tools/ats/bctest/bctest.pl	Tue Jul 14 09:30:01 2009 +0100
@@ -78,6 +78,8 @@
 
 copy($epoc . "data/z/resource/apps/bctestlist_aif.mbm",							"temp/bctest/winscw_udeb/z/resource/apps/bctestlist_aif.mbm");
 copy($epoc . "data/z/resource/apps/bctestlist.rsc",								"temp/bctest/winscw_udeb/z/resource/apps/bctestlist.rsc");
+copy($epoc . "release/winscw/udeb/z/resource/apps/bctestlist.mbm",				"temp/bctest/winscw_udeb/z/resource/apps/bctestlist.mbm");
+copy($epoc . "release/winscw/udeb/z/resource/apps/bctestlist.mif",				"temp/bctest/winscw_udeb/z/resource/apps/bctestlist.mif");
 copy($epoc . "data/z/private/10003a3f/apps/bctestlist_reg.rsc",					"temp/bctest/winscw_udeb/z/private/10003a3f/apps/bctestlist_reg.rsc");
 
 copy($epoc . "data/z/resource/apps/bctestmenu.rsc",								"temp/bctest/winscw_udeb/z/resource/apps/bctestmenu.rsc");
diff -r 52c893932513 -r 60e228580ee8 common/tools/ats/bctest/bctest.xml
--- a/common/tools/ats/bctest/bctest.xml	Fri Jul 10 14:56:28 2009 +0100
+++ b/common/tools/ats/bctest/bctest.xml	Tue Jul 14 09:30:01 2009 +0100
@@ -31,8 +31,17 @@
 						<command>install</command>
 						<params>
 							<param type="data"/>
-							<param src="*"/>
-							<param dst="c:\BCTestLog"/>
+							<param src="config.xml"/>
+							<param dst="c:\BCTestLog\config.xml"/>
+							<param component-path="bctest\BCTestLog" />
+						</params>
+					</step>
+					<step id="" name="Test Step 1 (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
+						<command>install</command>
+						<params>
+							<param type="data"/>
+							<param src="release_note.txt"/>
+							<param dst="c:\BCTestLog\release_note.txt"/>
 							<param component-path="bctest\BCTestLog" />
 						</params>
 					</step>
@@ -40,8 +49,26 @@
 						<command>install</command>
 						<params>
 							<param type="binary"/>
-							<param src="z/resource/apps/bctestlauncher_aif.mbm"/>
-							<param dst="z:\resource\apps\bctestlauncher_aif.mbm"/>
+							<param src="bctestutil.dll"/>
+							<param dst="c:\sys\bin\bctestutil.dll"/>
+							<param component-path="bctest" />
+						</params>
+					</step>
+					<step id="" name="Test Step 1 (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
+						<command>install</command>
+						<params>
+							<param type="binary"/>
+							<param src="bctestlauncher.exe"/>
+							<param dst="c:\sys\bin\bctestlauncher.exe"/>
+							<param component-path="bctest" />
+						</params>
+					</step>
+					<step id="" name="Test Step 1 (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
+						<command>install</command>
+						<params>
+							<param type="binary"/>
+							<param src="z/private/10003a3f/apps/bctestlauncher_reg.r01"/>
+							<param dst="z:\private\10003a3f\import\apps\bctestlauncher_reg.r01"/>
 							<param component-path="bctest" />
 						</params>
 					</step>
@@ -58,8 +85,17 @@
 						<command>install</command>
 						<params>
 							<param type="binary"/>
-							<param src="z/private/10003a3f/apps/bctestlauncher_reg.r01"/>
-							<param dst="z:\private\10003a3f\import\apps\bctestlauncher_reg.r01"/>
+							<param src="z/resource/apps/bctestlauncher_aif.mbm"/>
+							<param dst="z:\resource\apps\bctestlauncher_aif.mbm"/>
+							<param component-path="bctest" />
+						</params>
+					</step>
+					<step id="" name="Test Step 1 (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
+						<command>install</command>
+						<params>
+							<param type="binary"/>
+							<param src="z/private/10003a3f/apps/bctestbuttons_reg.rsc"/>
+							<param dst="z:\private\10003a3f\import\apps\bctestbuttons_reg.rsc"/>
 							<param component-path="bctest" />
 						</params>
 					</step>
@@ -85,17 +121,8 @@
 						<command>install</command>
 						<params>
 							<param type="binary"/>
-							<param src="z/private/10003a3f/apps/bctestbuttons_reg.rsc"/>
-							<param dst="z:\private\10003a3f\import\apps\bctestbuttons_reg.rsc"/>
-							<param component-path="bctest" />
-						</params>
-					</step>
-					<step id="" name="Test Step 1 (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
-						<command>install</command>
-						<params>
-							<param type="binary"/>
-							<param src="z/resource/apps/bctestsliderandicons.rsc"/>
-							<param dst="z:\resource\apps\bctestsliderandicons.rsc"/>
+							<param src="bctestbuttons.exe"/>
+							<param dst="c:\sys\bin\bctestbuttons.exe"/>
 							<param component-path="bctest" />
 						</params>
 					</step>
@@ -112,6 +139,33 @@
 						<command>install</command>
 						<params>
 							<param type="binary"/>
+							<param src="z/resource/apps/bctestsliderandicons.rsc"/>
+							<param dst="z:\resource\apps\bctestsliderandicons.rsc"/>
+							<param component-path="bctest" />
+						</params>
+					</step>
+					<step id="" name="Test Step 1 (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
+						<command>install</command>
+						<params>
+							<param type="binary"/>
+							<param src="bctestsliderandicons.exe"/>
+							<param dst="c:\sys\bin\bctestsliderandicons.exe"/>
+							<param component-path="bctest" />
+						</params>
+					</step>
+					<step id="" name="Test Step 1 (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
+						<command>install</command>
+						<params>
+							<param type="binary"/>
+							<param src="z/private/10003a3f/apps/bctestaknsound_reg.rsc"/>
+							<param dst="z:\private\10003a3f\import\apps\bctestaknsound_reg.rsc"/>
+							<param component-path="bctest" />
+						</params>
+					</step>
+					<step id="" name="Test Step 1 (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
+						<command>install</command>
+						<params>
+							<param type="binary"/>
 							<param src="z/resource/apps/bctestaknsound.mbm"/>
 							<param dst="z:\resource\apps\bctestaknsound.mbm"/>
 							<param component-path="bctest" />
@@ -121,6 +175,15 @@
 						<command>install</command>
 						<params>
 							<param type="binary"/>
+							<param src="z/resource/apps/bctestaknsound.rsc"/>
+							<param dst="z:\resource\apps\bctestaknsound.rsc"/>
+							<param component-path="bctest" />
+						</params>
+					</step>
+					<step id="" name="Test Step 1 (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
+						<command>install</command>
+						<params>
+							<param type="binary"/>
 							<param src="z/resource/apps/bctestaknsound_aif.mbm"/>
 							<param dst="z:\resource\apps\bctestaknsound_aif.mbm"/>
 							<param component-path="bctest" />
@@ -130,26 +193,8 @@
 						<command>install</command>
 						<params>
 							<param type="binary"/>
-							<param src="z/resource/apps/bctestaknsound.rsc"/>
-							<param dst="z:\resource\apps\bctestaknsound.rsc"/>
-							<param component-path="bctest" />
-						</params>
-					</step>
-					<step id="" name="Test Step 1 (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
-						<command>install</command>
-						<params>
-							<param type="binary"/>
-							<param src="z/private/10003a3f/apps/bctestaknsound_reg.rsc"/>
-							<param dst="z:\private\10003a3f\import\apps\bctestaknsound_reg.rsc"/>
-							<param component-path="bctest" />
-						</params>
-					</step>
-					<step id="" name="Test Step 1 (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
-						<command>install</command>
-						<params>
-							<param type="binary"/>
-							<param src="z/resource/apps/bctestappfrm.rsc"/>
-							<param dst="z:\resource\apps\bctestappfrm.rsc"/>
+							<param src="bctestaknsound.exe"/>
+							<param dst="c:\sys\bin\bctestaknsound.exe"/>
 							<param component-path="bctest" />
 						</params>
 					</step>
@@ -166,8 +211,17 @@
 						<command>install</command>
 						<params>
 							<param type="binary"/>
-							<param src="z/resource/apps/bctestcmdlg.rsc"/>
-							<param dst="z:\resource\apps\bctestcmdlg.rsc"/>
+							<param src="z/resource/apps/bctestappfrm.rsc"/>
+							<param dst="z:\resource\apps\bctestappfrm.rsc"/>
+							<param component-path="bctest" />
+						</params>
+					</step>
+					<step id="" name="Test Step 1 (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
+						<command>install</command>
+						<params>
+							<param type="binary"/>
+							<param src="bctestappfrm.exe"/>
+							<param dst="c:\sys\bin\bctestappfrm.exe"/>
 							<param component-path="bctest" />
 						</params>
 					</step>
@@ -184,8 +238,17 @@
 						<command>install</command>
 						<params>
 							<param type="binary"/>
-							<param src="z/resource/apps/bctestdocandinit.rsc"/>
-							<param dst="z:\resource\apps\bctestdocandinit.rsc"/>
+							<param src="z/resource/apps/bctestcmdlg.rsc"/>
+							<param dst="z:\resource\apps\bctestcmdlg.rsc"/>
+							<param component-path="bctest" />
+						</params>
+					</step>
+					<step id="" name="Test Step 1 (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
+						<command>install</command>
+						<params>
+							<param type="binary"/>
+							<param src="bctestcmdlg.exe"/>
+							<param dst="c:\sys\bin\bctestcmdlg.exe"/>
 							<param component-path="bctest" />
 						</params>
 					</step>
@@ -202,8 +265,17 @@
 						<command>install</command>
 						<params>
 							<param type="binary"/>
-							<param src="z/resource/apps/bctesteditor.rsc"/>
-							<param dst="z:\resource\apps\bctesteditor.rsc"/>
+							<param src="z/resource/apps/bctestdocandinit.rsc"/>
+							<param dst="z:\resource\apps\bctestdocandinit.rsc"/>
+							<param component-path="bctest" />
+						</params>
+					</step>
+					<step id="" name="Test Step 1 (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
+						<command>install</command>
+						<params>
+							<param type="binary"/>
+							<param src="bctestdocandinit.exe"/>
+							<param dst="c:\sys\bin\bctestdocandinit.exe"/>
 							<param component-path="bctest" />
 						</params>
 					</step>
@@ -220,8 +292,17 @@
 						<command>install</command>
 						<params>
 							<param type="binary"/>
-							<param src="z/resource/apps/bctesteh.rsc"/>
-							<param dst="z:\resource\apps\bctesteh.rsc"/>
+							<param src="z/resource/apps/bctesteditor.rsc"/>
+							<param dst="z:\resource\apps\bctesteditor.rsc"/>
+							<param component-path="bctest" />
+						</params>
+					</step>
+					<step id="" name="Test Step 1 (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
+						<command>install</command>
+						<params>
+							<param type="binary"/>
+							<param src="bctesteditor.exe"/>
+							<param dst="c:\sys\bin\bctesteditor.exe"/>
 							<param component-path="bctest" />
 						</params>
 					</step>
@@ -238,8 +319,8 @@
 						<command>install</command>
 						<params>
 							<param type="binary"/>
-							<param src="z/resource/apps/bctesteikbctrl_aif.mbm"/>
-							<param dst="z:\resource\apps\bctesteikbctrl_aif.mbm"/>
+							<param src="z/resource/apps/bctesteh.rsc"/>
+							<param dst="z:\resource\apps\bctesteh.rsc"/>
 							<param component-path="bctest" />
 						</params>
 					</step>
@@ -247,8 +328,8 @@
 						<command>install</command>
 						<params>
 							<param type="binary"/>
-							<param src="z/resource/apps/bctesteikbctrl.rsc"/>
-							<param dst="z:\resource\apps\bctesteikbctrl.rsc"/>
+							<param src="bctesteh.exe"/>
+							<param dst="c:\sys\bin\bctesteh.exe"/>
 							<param component-path="bctest" />
 						</params>
 					</step>
@@ -265,8 +346,26 @@
 						<command>install</command>
 						<params>
 							<param type="binary"/>
-							<param src="z/resource/apps/bctesteikfrm.r01"/>
-							<param dst="z:\resource\apps\bctesteikfrm.r01"/>
+							<param src="z/resource/apps/bctesteikbctrl.rsc"/>
+							<param dst="z:\resource\apps\bctesteikbctrl.rsc"/>
+							<param component-path="bctest" />
+						</params>
+					</step>
+					<step id="" name="Test Step 1 (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
+						<command>install</command>
+						<params>
+							<param type="binary"/>
+							<param src="z/resource/apps/bctesteikbctrl_aif.mbm"/>
+							<param dst="z:\resource\apps\bctesteikbctrl_aif.mbm"/>
+							<param component-path="bctest" />
+						</params>
+					</step>
+					<step id="" name="Test Step 1 (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
+						<command>install</command>
+						<params>
+							<param type="binary"/>
+							<param src="bctesteikbctrl.exe"/>
+							<param dst="c:\sys\bin\bctesteikbctrl.exe"/>
 							<param component-path="bctest" />
 						</params>
 					</step>
@@ -283,6 +382,33 @@
 						<command>install</command>
 						<params>
 							<param type="binary"/>
+							<param src="z/resource/apps/bctesteikfrm.r01"/>
+							<param dst="z:\resource\apps\bctesteikfrm.r01"/>
+							<param component-path="bctest" />
+						</params>
+					</step>
+					<step id="" name="Test Step 1 (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
+						<command>install</command>
+						<params>
+							<param type="binary"/>
+							<param src="bctesteikfrm.exe"/>
+							<param dst="c:\sys\bin\bctesteikfrm.exe"/>
+							<param component-path="bctest" />
+						</params>
+					</step>
+					<step id="" name="Test Step 1 (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
+						<command>install</command>
+						<params>
+							<param type="binary"/>
+							<param src="z/private/10003a3f/apps/bctestfontinput_reg.rsc"/>
+							<param dst="z:\private\10003a3f\import\apps\bctestfontinput_reg.rsc"/>
+							<param component-path="bctest" />
+						</params>
+					</step>
+					<step id="" name="Test Step 1 (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
+						<command>install</command>
+						<params>
+							<param type="binary"/>
 							<param src="z/resource/apps/bctestfontinput.mbm"/>
 							<param dst="z:\resource\apps\bctestfontinput.mbm"/>
 							<param component-path="bctest" />
@@ -292,6 +418,15 @@
 						<command>install</command>
 						<params>
 							<param type="binary"/>
+							<param src="z/resource/apps/bctestfontinput.rsc"/>
+							<param dst="z:\resource\apps\bctestfontinput.rsc"/>
+							<param component-path="bctest" />
+						</params>
+					</step>
+					<step id="" name="Test Step 1 (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
+						<command>install</command>
+						<params>
+							<param type="binary"/>
 							<param src="z/resource/apps/bctestfontinput_aif.mbm"/>
 							<param dst="z:\resource\apps\bctestfontinput_aif.mbm"/>
 							<param component-path="bctest" />
@@ -301,8 +436,8 @@
 						<command>install</command>
 						<params>
 							<param type="binary"/>
-							<param src="z/resource/apps/bctestfontinput.rsc"/>
-							<param dst="z:\resource\apps\bctestfontinput.rsc"/>
+							<param src="bctestfontinput.exe"/>
+							<param dst="c:\sys\bin\bctestfontinput.exe"/>
 							<param component-path="bctest" />
 						</params>
 					</step>
@@ -310,8 +445,8 @@
 						<command>install</command>
 						<params>
 							<param type="binary"/>
-							<param src="z/private/10003a3f/apps/bctestfontinput_reg.rsc"/>
-							<param dst="z:\private\10003a3f\import\apps\bctestfontinput_reg.rsc"/>
+							<param src="z/private/10003a3f/apps/bctestform_reg.rsc"/>
+							<param dst="z:\private\10003a3f\import\apps\bctestform_reg.rsc"/>
 							<param component-path="bctest" />
 						</params>
 					</step>
@@ -328,17 +463,8 @@
 						<command>install</command>
 						<params>
 							<param type="binary"/>
-							<param src="z/private/10003a3f/apps/bctestform_reg.rsc"/>
-							<param dst="z:\private\10003a3f\import\apps\bctestform_reg.rsc"/>
-							<param component-path="bctest" />
-						</params>
-					</step>
-					<step id="" name="Test Step 1 (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
-						<command>install</command>
-						<params>
-							<param type="binary"/>
-							<param src="z/resource/apps/bctestgrids.rsc"/>
-							<param dst="z:\resource\apps\bctestgrids.rsc"/>
+							<param src="bctestform.exe"/>
+							<param dst="c:\sys\bin\bctestform.exe"/>
 							<param component-path="bctest" />
 						</params>
 					</step>
@@ -355,8 +481,26 @@
 						<command>install</command>
 						<params>
 							<param type="binary"/>
-							<param src="z/resource/apps/bctestimage_aif.mbm"/>
-							<param dst="z:\resource\apps\bctestimage_aif.mbm"/>
+							<param src="z/resource/apps/bctestgrids.rsc"/>
+							<param dst="z:\resource\apps\bctestgrids.rsc"/>
+							<param component-path="bctest" />
+						</params>
+					</step>
+					<step id="" name="Test Step 1 (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
+						<command>install</command>
+						<params>
+							<param type="binary"/>
+							<param src="bctestgrids.exe"/>
+							<param dst="c:\sys\bin\bctestgrids.exe"/>
+							<param component-path="bctest" />
+						</params>
+					</step>
+					<step id="" name="Test Step 1 (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
+						<command>install</command>
+						<params>
+							<param type="binary"/>
+							<param src="z/private/10003a3f/apps/bctestimage_reg.rsc"/>
+							<param dst="z:\private\10003a3f\import\apps\bctestimage_reg.rsc"/>
 							<param component-path="bctest" />
 						</params>
 					</step>
@@ -373,8 +517,8 @@
 						<command>install</command>
 						<params>
 							<param type="binary"/>
-							<param src="z/private/10003a3f/apps/bctestimage_reg.rsc"/>
-							<param dst="z:\private\10003a3f\import\apps\bctestimage_reg.rsc"/>
+							<param src="z/resource/apps/bctestimage_aif.mbm"/>
+							<param dst="z:\resource\apps\bctestimage_aif.mbm"/>
 							<param component-path="bctest" />
 						</params>
 					</step>
@@ -382,8 +526,8 @@
 						<command>install</command>
 						<params>
 							<param type="binary"/>
-							<param src="z/resource/apps/bctestkeylock.rsc"/>
-							<param dst="z:\resource\apps\bctestkeylock.rsc"/>
+							<param src="bctestimage.exe"/>
+							<param dst="c:\sys\bin\bctestimage.exe"/>
 							<param component-path="bctest" />
 						</params>
 					</step>
@@ -400,6 +544,33 @@
 						<command>install</command>
 						<params>
 							<param type="binary"/>
+							<param src="z/resource/apps/bctestkeylock.rsc"/>
+							<param dst="z:\resource\apps\bctestkeylock.rsc"/>
+							<param component-path="bctest" />
+						</params>
+					</step>
+					<step id="" name="Test Step 1 (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
+						<command>install</command>
+						<params>
+							<param type="binary"/>
+							<param src="bctestkeylock.exe"/>
+							<param dst="c:\sys\bin\bctestkeylock.exe"/>
+							<param component-path="bctest" />
+						</params>
+					</step>
+					<step id="" name="Test Step 1 (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
+						<command>install</command>
+						<params>
+							<param type="binary"/>
+							<param src="z/private/10003a3f/apps/bctestlabelinfoindicators_reg.rsc"/>
+							<param dst="z:\private\10003a3f\import\apps\bctestlabelinfoindicators_reg.rsc"/>
+							<param component-path="bctest" />
+						</params>
+					</step>
+					<step id="" name="Test Step 1 (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
+						<command>install</command>
+						<params>
+							<param type="binary"/>
 							<param src="z/resource/apps/bctestlabelinfoindicators.rsc"/>
 							<param dst="z:\resource\apps\bctestlabelinfoindicators.rsc"/>
 							<param component-path="bctest" />
@@ -409,8 +580,26 @@
 						<command>install</command>
 						<params>
 							<param type="binary"/>
-							<param src="z/private/10003a3f/apps/bctestlabelinfoindicators_reg.rsc"/>
-							<param dst="z:\private\10003a3f\import\apps\bctestlabelinfoindicators_reg.rsc"/>
+							<param src="bctestlabelinfoindicators.exe"/>
+							<param dst="c:\sys\bin\bctestlabelinfoindicators.exe"/>
+							<param component-path="bctest" />
+						</params>
+					</step>
+					<step id="" name="Test Step 1 (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
+						<command>install</command>
+						<params>
+							<param type="binary"/>
+							<param src="z/private/10003a3f/apps/bctestlist_reg.rsc"/>
+							<param dst="z:\private\10003a3f\import\apps\bctestlist_reg.rsc"/>
+							<param component-path="bctest" />
+						</params>
+					</step>
+					<step id="" name="Test Step 1 (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
+						<command>install</command>
+						<params>
+							<param type="binary"/>
+							<param src="z/resource/apps/bctestlist.rsc"/>
+							<param dst="z:\resource\apps\bctestlist.rsc"/>
 							<param component-path="bctest" />
 						</params>
 					</step>
@@ -427,8 +616,8 @@
 						<command>install</command>
 						<params>
 							<param type="binary"/>
-							<param src="z/resource/apps/bctestlist.rsc"/>
-							<param dst="z:\resource\apps\bctestlist.rsc"/>
+							<param src="z/resource/apps/bctestlist.mbm"/>
+							<param dst="z:\resource\apps\bctestlist.mbm"/>
 							<param component-path="bctest" />
 						</params>
 					</step>
@@ -436,8 +625,26 @@
 						<command>install</command>
 						<params>
 							<param type="binary"/>
-							<param src="z/private/10003a3f/apps/bctestlist_reg.rsc"/>
-							<param dst="z:\private\10003a3f\import\apps\bctestlist_reg.rsc"/>
+							<param src="z/resource/apps/bctestlist.mif"/>
+							<param dst="z:\resource\apps\bctestlist.mif"/>
+							<param component-path="bctest" />
+						</params>
+					</step>
+					<step id="" name="Test Step 1 (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
+						<command>install</command>
+						<params>
+							<param type="binary"/>
+							<param src="bctestlist.exe"/>
+							<param dst="c:\sys\bin\bctestlist.exe"/>
+							<param component-path="bctest" />
+						</params>
+					</step>
+					<step id="" name="Test Step 1 (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
+						<command>install</command>
+						<params>
+							<param type="binary"/>
+							<param src="z/private/10003a3f/apps/bctestmenu_reg.rsc"/>
+							<param dst="z:\private\10003a3f\import\apps\bctestmenu_reg.rsc"/>
 							<param component-path="bctest" />
 						</params>
 					</step>
@@ -454,8 +661,53 @@
 						<command>install</command>
 						<params>
 							<param type="binary"/>
-							<param src="z/private/10003a3f/apps/bctestmenu_reg.rsc"/>
-							<param dst="z:\private\10003a3f\import\apps\bctestmenu_reg.rsc"/>
+							<param src="bctestmenu.exe"/>
+							<param dst="c:\sys\bin\bctestmenu.exe"/>
+							<param component-path="bctest" />
+						</params>
+					</step>
+					<step id="" name="Test Step 1 (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
+						<command>install</command>
+						<params>
+							<param type="binary"/>
+							<param src="z/private/10003a3f/apps/bctestmisccontrol_reg.rsc"/>
+							<param dst="z:\private\10003a3f\import\apps\bctestmisccontrol_reg.rsc"/>
+							<param component-path="bctest" />
+						</params>
+					</step>
+					<step id="" name="Test Step 1 (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
+						<command>install</command>
+						<params>
+							<param type="binary"/>
+							<param src="z/resource/apps/bctestmisccontrol.mbm"/>
+							<param dst="z:\resource\apps\bctestmisccontrol.mbm"/>
+							<param component-path="bctest" />
+						</params>
+					</step>
+					<step id="" name="Test Step 1 (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
+						<command>install</command>
+						<params>
+							<param type="binary"/>
+							<param src="z/resource/apps/bctestmisccontrol.rsc"/>
+							<param dst="z:\resource\apps\bctestmisccontrol.rsc"/>
+							<param component-path="bctest" />
+						</params>
+					</step>
+					<step id="" name="Test Step 1 (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
+						<command>install</command>
+						<params>
+							<param type="binary"/>
+							<param src="bctestmisccontrol.exe"/>
+							<param dst="c:\sys\bin\bctestmisccontrol.exe"/>
+							<param component-path="bctest" />
+						</params>
+					</step>
+					<step id="" name="Test Step 1 (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
+						<command>install</command>
+						<params>
+							<param type="binary"/>
+							<param src="z/private/10003a3f/apps/bctestnote_reg.rsc"/>
+							<param dst="z:\private\10003a3f\import\apps\bctestnote_reg.rsc"/>
 							<param component-path="bctest" />
 						</params>
 					</step>
@@ -481,8 +733,17 @@
 						<command>install</command>
 						<params>
 							<param type="binary"/>
-							<param src="z/private/10003a3f/apps/bctestnote_reg.rsc"/>
-							<param dst="z:\private\10003a3f\import\apps\bctestnote_reg.rsc"/>
+							<param src="bctestnote.exe"/>
+							<param dst="c:\sys\bin\bctestnote.exe"/>
+							<param component-path="bctest" />
+						</params>
+					</step>
+					<step id="" name="Test Step 1 (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
+						<command>install</command>
+						<params>
+							<param type="binary"/>
+							<param src="z/private/10003a3f/apps/bctestnotifier_reg.rsc"/>
+							<param dst="z:\private\10003a3f\import\apps\bctestnotifier_reg.rsc"/>
 							<param component-path="bctest" />
 						</params>
 					</step>
@@ -499,8 +760,17 @@
 						<command>install</command>
 						<params>
 							<param type="binary"/>
-							<param src="z/private/10003a3f/apps/bctestnotifier_reg.rsc"/>
-							<param dst="z:\private\10003a3f\import\apps\bctestnotifier_reg.rsc"/>
+							<param src="bctestnotifier.exe"/>
+							<param dst="c:\sys\bin\bctestnotifier.exe"/>
+							<param component-path="bctest" />
+						</params>
+					</step>
+					<step id="" name="Test Step 1 (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
+						<command>install</command>
+						<params>
+							<param type="binary"/>
+							<param src="z/private/10003a3f/apps/bctestpane_reg.rsc"/>
+							<param dst="z:\private\10003a3f\import\apps\bctestpane_reg.rsc"/>
 							<param component-path="bctest" />
 						</params>
 					</step>
@@ -517,8 +787,17 @@
 						<command>install</command>
 						<params>
 							<param type="binary"/>
-							<param src="z/private/10003a3f/apps/bctestpane_reg.rsc"/>
-							<param dst="z:\private\10003a3f\import\apps\bctestpane_reg.rsc"/>
+							<param src="bctestpane.exe"/>
+							<param dst="c:\sys\bin\bctestpane.exe"/>
+							<param component-path="bctest" />
+						</params>
+					</step>
+					<step id="" name="Test Step 1 (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
+						<command>install</command>
+						<params>
+							<param type="binary"/>
+							<param src="z/private/10003a3f/apps/bctestpopups_reg.rsc"/>
+							<param dst="z:\private\10003a3f\import\apps\bctestpopups_reg.rsc"/>
 							<param component-path="bctest" />
 						</params>
 					</step>
@@ -544,8 +823,17 @@
 						<command>install</command>
 						<params>
 							<param type="binary"/>
-							<param src="z/private/10003a3f/apps/bctestpopups_reg.rsc"/>
-							<param dst="z:\private\10003a3f\import\apps\bctestpopups_reg.rsc"/>
+							<param src="bctestpopups.exe"/>
+							<param dst="c:\sys\bin\bctestpopups.exe"/>
+							<param component-path="bctest" />
+						</params>
+					</step>
+					<step id="" name="Test Step 1 (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
+						<command>install</command>
+						<params>
+							<param type="binary"/>
+							<param src="z/private/10003a3f/apps/bctestprivateuifrm_reg.rsc"/>
+							<param dst="z:\private\10003a3f\import\apps\bctestprivateuifrm_reg.rsc"/>
 							<param component-path="bctest" />
 						</params>
 					</step>
@@ -562,17 +850,8 @@
 						<command>install</command>
 						<params>
 							<param type="binary"/>
-							<param src="z/private/10003a3f/apps/bctestprivateuifrm_reg.rsc"/>
-							<param dst="z:\private\10003a3f\import\apps\bctestprivateuifrm_reg.rsc"/>
-							<param component-path="bctest" />
-						</params>
-					</step>
-					<step id="" name="Test Step 1 (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
-						<command>install</command>
-						<params>
-							<param type="binary"/>
-							<param src="z/resource/apps/bctestptieng.rsc"/>
-							<param dst="z:\resource\apps\bctestptieng.rsc"/>
+							<param src="bctestprivateuifrm.exe"/>
+							<param dst="c:\sys\bin\bctestprivateuifrm.exe"/>
 							<param component-path="bctest" />
 						</params>
 					</step>
@@ -589,8 +868,17 @@
 						<command>install</command>
 						<params>
 							<param type="binary"/>
-							<param src="z/resource/apps/bctestquery.rsc"/>
-							<param dst="z:\resource\apps\bctestquery.rsc"/>
+							<param src="z/resource/apps/bctestptieng.rsc"/>
+							<param dst="z:\resource\apps\bctestptieng.rsc"/>
+							<param component-path="bctest" />
+						</params>
+					</step>
+					<step id="" name="Test Step 1 (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
+						<command>install</command>
+						<params>
+							<param type="binary"/>
+							<param src="bctestptieng.exe"/>
+							<param dst="c:\sys\bin\bctestptieng.exe"/>
 							<param component-path="bctest" />
 						</params>
 					</step>
@@ -607,6 +895,33 @@
 						<command>install</command>
 						<params>
 							<param type="binary"/>
+							<param src="z/resource/apps/bctestquery.rsc"/>
+							<param dst="z:\resource\apps\bctestquery.rsc"/>
+							<param component-path="bctest" />
+						</params>
+					</step>
+					<step id="" name="Test Step 1 (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
+						<command>install</command>
+						<params>
+							<param type="binary"/>
+							<param src="bctestquery.exe"/>
+							<param dst="c:\sys\bin\bctestquery.exe"/>
+							<param component-path="bctest" />
+						</params>
+					</step>
+					<step id="" name="Test Step 1 (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
+						<command>install</command>
+						<params>
+							<param type="binary"/>
+							<param src="z/private/10003a3f/apps/bctestscreenclearer_reg.rsc"/>
+							<param dst="z:\private\10003a3f\import\apps\bctestscreenclearer_reg.rsc"/>
+							<param component-path="bctest" />
+						</params>
+					</step>
+					<step id="" name="Test Step 1 (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
+						<command>install</command>
+						<params>
+							<param type="binary"/>
 							<param src="z/resource/apps/bctestscreenclearer.mbm"/>
 							<param dst="z:\resource\apps\bctestscreenclearer.mbm"/>
 							<param component-path="bctest" />
@@ -616,6 +931,15 @@
 						<command>install</command>
 						<params>
 							<param type="binary"/>
+							<param src="z/resource/apps/bctestscreenclearer.rsc"/>
+							<param dst="z:\resource\apps\bctestscreenclearer.rsc"/>
+							<param component-path="bctest" />
+						</params>
+					</step>
+					<step id="" name="Test Step 1 (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
+						<command>install</command>
+						<params>
+							<param type="binary"/>
 							<param src="z/resource/apps/bctestscreenclearer_aif.mbm"/>
 							<param dst="z:\resource\apps\bctestscreenclearer_aif.mbm"/>
 							<param component-path="bctest" />
@@ -625,8 +949,8 @@
 						<command>install</command>
 						<params>
 							<param type="binary"/>
-							<param src="z/resource/apps/bctestscreenclearer.rsc"/>
-							<param dst="z:\resource\apps\bctestscreenclearer.rsc"/>
+							<param src="bctestscreenclearer.exe"/>
+							<param dst="c:\sys\bin\bctestscreenclearer.exe"/>
 							<param component-path="bctest" />
 						</params>
 					</step>
@@ -634,8 +958,8 @@
 						<command>install</command>
 						<params>
 							<param type="binary"/>
-							<param src="z/private/10003a3f/apps/bctestscreenclearer_reg.rsc"/>
-							<param dst="z:\private\10003a3f\import\apps\bctestscreenclearer_reg.rsc"/>
+							<param src="z/private/10003a3f/apps/bctestscroller_reg.rsc"/>
+							<param dst="z:\private\10003a3f\import\apps\bctestscroller_reg.rsc"/>
 							<param component-path="bctest" />
 						</params>
 					</step>
@@ -652,8 +976,17 @@
 						<command>install</command>
 						<params>
 							<param type="binary"/>
-							<param src="z/private/10003a3f/apps/bctestscroller_reg.rsc"/>
-							<param dst="z:\private\10003a3f\import\apps\bctestscroller_reg.rsc"/>
+							<param src="bctestscroller.exe"/>
+							<param dst="c:\sys\bin\bctestscroller.exe"/>
+							<param component-path="bctest" />
+						</params>
+					</step>
+					<step id="" name="Test Step 1 (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
+						<command>install</command>
+						<params>
+							<param type="binary"/>
+							<param src="z/private/10003a3f/apps/bctestsearchfield_reg.rsc"/>
+							<param dst="z:\private\10003a3f\import\apps\bctestsearchfield_reg.rsc"/>
 							<param component-path="bctest" />
 						</params>
 					</step>
@@ -670,8 +1003,17 @@
 						<command>install</command>
 						<params>
 							<param type="binary"/>
-							<param src="z/private/10003a3f/apps/bctestsearchfield_reg.rsc"/>
-							<param dst="z:\private\10003a3f\import\apps\bctestsearchfield_reg.rsc"/>
+							<param src="bctestsearchfield.exe"/>
+							<param dst="c:\sys\bin\bctestsearchfield.exe"/>
+							<param component-path="bctest" />
+						</params>
+					</step>
+					<step id="" name="Test Step 1 (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
+						<command>install</command>
+						<params>
+							<param type="binary"/>
+							<param src="z/private/10003a3f/apps/bctestserverapp_reg.rsc"/>
+							<param dst="z:\private\10003a3f\import\apps\bctestserverapp_reg.rsc"/>
 							<param component-path="bctest" />
 						</params>
 					</step>
@@ -688,8 +1030,35 @@
 						<command>install</command>
 						<params>
 							<param type="binary"/>
-							<param src="z/private/10003a3f/apps/bctestserverapp_reg.rsc"/>
-							<param dst="z:\private\10003a3f\import\apps\bctestserverapp_reg.rsc"/>
+							<param src="bctestserverapp.exe"/>
+							<param dst="c:\sys\bin\bctestserverapp.exe"/>
+							<param component-path="bctest" />
+						</params>
+					</step>
+					<step id="" name="Test Step 1 (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
+						<command>install</command>
+						<params>
+							<param type="binary"/>
+							<param src="z/private/10003a3f/apps/bctestsettingpage_reg.rsc"/>
+							<param dst="z:\private\10003a3f\import\apps\bctestsettingpage_reg.rsc"/>
+							<param component-path="bctest" />
+						</params>
+					</step>
+					<step id="" name="Test Step 1 (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
+						<command>install</command>
+						<params>
+							<param type="binary"/>
+							<param src="z/resource/apps/bctestsettingpage.rsc"/>
+							<param dst="z:\resource\apps\bctestsettingpage.rsc"/>
+							<param component-path="bctest" />
+						</params>
+					</step>
+					<step id="" name="Test Step 1 (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
+						<command>install</command>
+						<params>
+							<param type="binary"/>
+							<param src="z/resource/apps/bctestsettingpage_aif.mbm"/>
+							<param dst="z:\resource\apps\bctestsettingpage_aif.mbm"/>
 							<param component-path="bctest" />
 						</params>
 					</step>
@@ -706,8 +1075,8 @@
 						<command>install</command>
 						<params>
 							<param type="binary"/>
-							<param src="z/resource/apps/bctestsettingpage_aif.mbm"/>
-							<param dst="z:\resource\apps\bctestsettingpage_aif.mbm"/>
+							<param src="bctestsettingpage.exe"/>
+							<param dst="c:\sys\bin\bctestsettingpage.exe"/>
 							<param component-path="bctest" />
 						</params>
 					</step>
@@ -715,17 +1084,8 @@
 						<command>install</command>
 						<params>
 							<param type="binary"/>
-							<param src="z/resource/apps/bctestsettingpage.rsc"/>
-							<param dst="z:\resource\apps\bctestsettingpage.rsc"/>
-							<param component-path="bctest" />
-						</params>
-					</step>
-					<step id="" name="Test Step 1 (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
-						<command>install</command>
-						<params>
-							<param type="binary"/>
-							<param src="z/private/10003a3f/apps/bctestsettingpage_reg.rsc"/>
-							<param dst="z:\private\10003a3f\import\apps\bctestsettingpage_reg.rsc"/>
+							<param src="z/private/10003a3f/apps/bctestskins_reg.rsc"/>
+							<param dst="z:\private\10003a3f\import\apps\bctestskins_reg.rsc"/>
 							<param component-path="bctest" />
 						</params>
 					</step>
@@ -742,8 +1102,17 @@
 						<command>install</command>
 						<params>
 							<param type="binary"/>
-							<param src="z/private/10003a3f/apps/bctestskins_reg.rsc"/>
-							<param dst="z:\private\10003a3f\import\apps\bctestskins_reg.rsc"/>
+							<param src="bctestskins.exe"/>
+							<param dst="c:\sys\bin\bctestskins.exe"/>
+							<param component-path="bctest" />
+						</params>
+					</step>
+					<step id="" name="Test Step 1 (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
+						<command>install</command>
+						<params>
+							<param type="binary"/>
+							<param src="z/private/10003a3f/apps/bctestutilities_reg.rsc"/>
+							<param dst="z:\private\10003a3f\import\apps\bctestutilities_reg.rsc"/>
 							<param component-path="bctest" />
 						</params>
 					</step>
@@ -760,8 +1129,17 @@
 						<command>install</command>
 						<params>
 							<param type="binary"/>
-							<param src="z/private/10003a3f/apps/bctestutilities_reg.rsc"/>
-							<param dst="z:\private\10003a3f\import\apps\bctestutilities_reg.rsc"/>
+							<param src="bctestutilities.exe"/>
+							<param dst="c:\sys\bin\bctestutilities.exe"/>
+							<param component-path="bctest" />
+						</params>
+					</step>
+					<step id="" name="Test Step 1 (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
+						<command>install</command>
+						<params>
+							<param type="binary"/>
+							<param src="z/private/10003a3f/apps/bctestvolume_reg.rsc"/>
+							<param dst="z:\private\10003a3f\import\apps\bctestvolume_reg.rsc"/>
 							<param component-path="bctest" />
 						</params>
 					</step>
@@ -787,17 +1165,8 @@
 						<command>install</command>
 						<params>
 							<param type="binary"/>
-							<param src="z/private/10003a3f/apps/bctestvolume_reg.rsc"/>
-							<param dst="z:\private\10003a3f\import\apps\bctestvolume_reg.rsc"/>
-							<param component-path="bctest" />
-						</params>
-					</step>
-					<step id="" name="Test Step 1 (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
-						<command>install</command>
-						<params>
-							<param type="binary"/>
-							<param src="z/resource/apps/bctestocr.rsc"/>
-							<param dst="z:\resource\apps\bctestocr.rsc"/>
+							<param src="bctestvolume.exe"/>
+							<param dst="c:\sys\bin\bctestvolume.exe"/>
 							<param component-path="bctest" />
 						</params>
 					</step>
@@ -814,8 +1183,17 @@
 						<command>install</command>
 						<params>
 							<param type="binary"/>
-							<param src="z/resource/apps/bctestmisc.rsc"/>
-							<param dst="z:\resource\apps\bctestmisc.rsc"/>
+							<param src="z/resource/apps/bctestocr.rsc"/>
+							<param dst="z:\resource\apps\bctestocr.rsc"/>
+							<param component-path="bctest" />
+						</params>
+					</step>
+					<step id="" name="Test Step 1 (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
+						<command>install</command>
+						<params>
+							<param type="binary"/>
+							<param src="bctestocr.exe"/>
+							<param dst="c:\sys\bin\bctestocr.exe"/>
 							<param component-path="bctest" />
 						</params>
 					</step>
@@ -832,6 +1210,33 @@
 						<command>install</command>
 						<params>
 							<param type="binary"/>
+							<param src="z/resource/apps/bctestmisc.rsc"/>
+							<param dst="z:\resource\apps\bctestmisc.rsc"/>
+							<param component-path="bctest" />
+						</params>
+					</step>
+					<step id="" name="Test Step 1 (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
+						<command>install</command>
+						<params>
+							<param type="binary"/>
+							<param src="bctestmisc.exe"/>
+							<param dst="c:\sys\bin\bctestmisc.exe"/>
+							<param component-path="bctest" />
+						</params>
+					</step>
+					<step id="" name="Test Step 1 (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
+						<command>install</command>
+						<params>
+							<param type="binary"/>
+							<param src="z/private/10003a3f/apps/bctestlocation_reg.rsc"/>
+							<param dst="z:\private\10003a3f\import\apps\bctestlocation_reg.rsc"/>
+							<param component-path="bctest" />
+						</params>
+					</step>
+					<step id="" name="Test Step 1 (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
+						<command>install</command>
+						<params>
+							<param type="binary"/>
 							<param src="z/resource/apps/bctestlocation.rsc"/>
 							<param dst="z:\resource\apps\bctestlocation.rsc"/>
 							<param component-path="bctest" />
@@ -841,8 +1246,17 @@
 						<command>install</command>
 						<params>
 							<param type="binary"/>
-							<param src="z/private/10003a3f/apps/bctestlocation_reg.rsc"/>
-							<param dst="z:\private\10003a3f\import\apps\bctestlocation_reg.rsc"/>
+							<param src="bctestlocation.exe"/>
+							<param dst="c:\sys\bin\bctestlocation.exe"/>
+							<param component-path="bctest" />
+						</params>
+					</step>
+					<step id="" name="Test Step 1 (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
+						<command>install</command>
+						<params>
+							<param type="binary"/>
+							<param src="z/private/10003a3f/apps/bctestuniteditor_reg.rsc"/>
+							<param dst="z:\private\10003a3f\import\apps\bctestuniteditor_reg.rsc"/>
 							<param component-path="bctest" />
 						</params>
 					</step>
@@ -859,8 +1273,17 @@
 						<command>install</command>
 						<params>
 							<param type="binary"/>
-							<param src="z/private/10003a3f/apps/bctestuniteditor_reg.rsc"/>
-							<param dst="z:\private\10003a3f\import\apps\bctestuniteditor_reg.rsc"/>
+							<param src="bctestuniteditor.exe"/>
+							<param dst="c:\sys\bin\bctestuniteditor.exe"/>
+							<param component-path="bctest" />
+						</params>
+					</step>
+					<step id="" name="Test Step 1 (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
+						<command>install</command>
+						<params>
+							<param type="binary"/>
+							<param src="z/private/10003a3f/apps/bctestmisc32_reg.rsc"/>
+							<param dst="z:\private\10003a3f\import\apps\bctestmisc32_reg.rsc"/>
 							<param component-path="bctest" />
 						</params>
 					</step>
@@ -877,8 +1300,17 @@
 						<command>install</command>
 						<params>
 							<param type="binary"/>
-							<param src="z/private/10003a3f/apps/bctestmisc32_reg.rsc"/>
-							<param dst="z:\private\10003a3f\import\apps\bctestmisc32_reg.rsc"/>
+							<param src="bctestmisc32.exe"/>
+							<param dst="c:\sys\bin\bctestmisc32.exe"/>
+							<param component-path="bctest" />
+						</params>
+					</step>
+					<step id="" name="Test Step 1 (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
+						<command>install</command>
+						<params>
+							<param type="binary"/>
+							<param src="z/private/10003a3f/apps/bctestlocalizer_reg.rsc"/>
+							<param dst="z:\private\10003a3f\import\apps\bctestlocalizer_reg.rsc"/>
 							<param component-path="bctest" />
 						</params>
 					</step>
@@ -895,8 +1327,17 @@
 						<command>install</command>
 						<params>
 							<param type="binary"/>
-							<param src="z/private/10003a3f/apps/bctestlocalizer_reg.rsc"/>
-							<param dst="z:\private\10003a3f\import\apps\bctestlocalizer_reg.rsc"/>
+							<param src="bctestlocalizer.exe"/>
+							<param dst="c:\sys\bin\bctestlocalizer.exe"/>
+							<param component-path="bctest" />
+						</params>
+					</step>
+					<step id="" name="Test Step 1 (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
+						<command>install</command>
+						<params>
+							<param type="binary"/>
+							<param src="z/private/10003a3f/apps/bctestpreviewpopup_reg.rsc"/>
+							<param dst="z:\private\10003a3f\import\apps\bctestpreviewpopup_reg.rsc"/>
 							<param component-path="bctest" />
 						</params>
 					</step>
@@ -913,8 +1354,17 @@
 						<command>install</command>
 						<params>
 							<param type="binary"/>
-							<param src="z/private/10003a3f/apps/bctestpreviewpopup_reg.rsc"/>
-							<param dst="z:\private\10003a3f\import\apps\bctestpreviewpopup_reg.rsc"/>
+							<param src="bctestpreviewpopup.exe"/>
+							<param dst="c:\sys\bin\bctestpreviewpopup.exe"/>
+							<param component-path="bctest" />
+						</params>
+					</step>
+					<step id="" name="Test Step 1 (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
+						<command>install</command>
+						<params>
+							<param type="binary"/>
+							<param src="z/private/10003a3f/apps/bctestservicehandler_reg.rsc"/>
+							<param dst="z:\private\10003a3f\import\apps\bctestservicehandler_reg.rsc"/>
 							<param component-path="bctest" />
 						</params>
 					</step>
@@ -931,8 +1381,17 @@
 						<command>install</command>
 						<params>
 							<param type="binary"/>
-							<param src="z/private/10003a3f/apps/bctestservicehandler_reg.rsc"/>
-							<param dst="z:\private\10003a3f\import\apps\bctestservicehandler_reg.rsc"/>
+							<param src="bctestservicehandler.exe"/>
+							<param dst="c:\sys\bin\bctestservicehandler.exe"/>
+							<param component-path="bctest" />
+						</params>
+					</step>
+					<step id="" name="Test Step 1 (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
+						<command>install</command>
+						<params>
+							<param type="binary"/>
+							<param src="z/private/10003a3f/apps/bctestbutton_reg.rsc"/>
+							<param dst="z:\private\10003a3f\import\apps\bctestbutton_reg.rsc"/>
 							<param component-path="bctest" />
 						</params>
 					</step>
@@ -949,17 +1408,8 @@
 						<command>install</command>
 						<params>
 							<param type="binary"/>
-							<param src="z/private/10003a3f/apps/bctestbutton_reg.rsc"/>
-							<param dst="z:\private\10003a3f\import\apps\bctestbutton_reg.rsc"/>
-							<param component-path="bctest" />
-						</params>
-					</step>
-					<step id="" name="Test Step 1 (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
-						<command>install</command>
-						<params>
-							<param type="binary"/>
-							<param src="z/resource/apps/bctestchoicelist.rsc"/>
-							<param dst="z:\resource\apps\bctestchoicelist.rsc"/>
+							<param src="bctestbutton.exe"/>
+							<param dst="c:\sys\bin\bctestbutton.exe"/>
 							<param component-path="bctest" />
 						</params>
 					</step>
@@ -976,152 +1426,8 @@
 						<command>install</command>
 						<params>
 							<param type="binary"/>
-							<param src="z/resource/apps/bctestmix50.rsc"/>
-							<param dst="z:\resource\apps\bctestmix50.rsc"/>
-							<param component-path="bctest" />
-						</params>
-					</step>
-					<step id="" name="Test Step 1 (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
-						<command>install</command>
-						<params>
-							<param type="binary"/>
-							<param src="z/private/10003a3f/apps/bctestmix50_reg.rsc"/>
-							<param dst="z:\private\10003a3f\import\apps\bctestmix50_reg.rsc"/>
-							<param component-path="bctest" />
-						</params>
-					</step>
-					<step id="" name="Test Step 1 (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
-						<command>install</command>
-						<params>
-							<param type="binary"/>
-							<param src="z/resource/apps/bctesttoolbar.rsc"/>
-							<param dst="z:\resource\apps\bctesttoolbar.rsc"/>
-							<param component-path="bctest" />
-						</params>
-					</step>
-					<step id="" name="Test Step 1 (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
-						<command>install</command>
-						<params>
-							<param type="binary"/>
-							<param src="z/private/10003a3f/apps/bctesttoolbar_reg.rsc"/>
-							<param dst="z:\private\10003a3f\import\apps\bctesttoolbar_reg.rsc"/>
-							<param component-path="bctest" />
-						</params>
-					</step>
-					<step id="" name="Test Step 1 (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
-						<command>install</command>
-						<params>
-							<param type="binary"/>
-							<param src="z/resource/apps/bctesttouchpane.rsc"/>
-							<param dst="z:\resource\apps\bctesttouchpane.rsc"/>
-							<param component-path="bctest" />
-						</params>
-					</step>
-					<step id="" name="Test Step 1 (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
-						<command>install</command>
-						<params>
-							<param type="binary"/>
-							<param src="z/private/10003a3f/apps/bctesttouchpane_reg.rsc"/>
-							<param dst="z:\private\10003a3f\import\apps\bctesttouchpane_reg.rsc"/>
-							<param component-path="bctest" />
-						</params>
-					</step>
-					<step id="" name="Test Step 1 (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
-						<command>install</command>
-						<params>
-							<param type="binary"/>
-							<param src="z/resource/apps/bctesttreelist.rsc"/>
-							<param dst="z:\resource\apps\bctesttreelist.rsc"/>
-							<param component-path="bctest" />
-						</params>
-					</step>
-					<step id="" name="Test Step 1 (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
-						<command>install</command>
-						<params>
-							<param type="binary"/>
-							<param src="z/private/10003a3f/apps/bctesttreelist_reg.rsc"/>
-							<param dst="z:\private\10003a3f\import\apps\bctesttreelist_reg.rsc"/>
-							<param component-path="bctest" />
-						</params>
-					</step>
-					<step id="" name="Test Step 1 (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
-						<command>install</command>
-						<params>
-							<param type="binary"/>
-							<param src="z/resource/apps/bctestmisccontrol.mbm"/>
-							<param dst="z:\resource\apps\bctestmisccontrol.mbm"/>
-							<param component-path="bctest" />
-						</params>
-					</step>
-					<step id="" name="Test Step 1 (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
-						<command>install</command>
-						<params>
-							<param type="binary"/>
-							<param src="z/resource/apps/bctestmisccontrol.rsc"/>
-							<param dst="z:\resource\apps\bctestmisccontrol.rsc"/>
-							<param component-path="bctest" />
-						</params>
-					</step>
-					<step id="" name="Test Step 1 (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
-						<command>install</command>
-						<params>
-							<param type="binary"/>
-							<param src="z/private/10003a3f/apps/bctestmisccontrol_reg.rsc"/>
-							<param dst="z:\private\10003a3f\import\apps\bctestmisccontrol_reg.rsc"/>
-							<param component-path="bctest" />
-						</params>
-					</step>
-					<step id="" name="Test Step 1 (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
-						<command>install</command>
-						<params>
-							<param type="binary"/>
-							<param src="bctestutil.dll"/>
-							<param dst="c:\sys\bin\bctestutil.dll"/>
-							<param component-path="bctest" />
-						</params>
-					</step>
-					<step id="" name="Test Step 1 (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
-						<command>install</command>
-						<params>
-							<param type="binary"/>
-							<param src="bctestlauncher.exe"/>
-							<param dst="c:\sys\bin\bctestlauncher.exe"/>
-							<param component-path="bctest" />
-						</params>
-					</step>
-					<step id="" name="Test Step 1 (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
-						<command>install</command>
-						<params>
-							<param type="binary"/>
-							<param src="bctestaknsound.exe"/>
-							<param dst="c:\sys\bin\bctestaknsound.exe"/>
-							<param component-path="bctest" />
-						</params>
-					</step>
-					<step id="" name="Test Step 1 (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
-						<command>install</command>
-						<params>
-							<param type="binary"/>
-							<param src="bctestappfrm.exe"/>
-							<param dst="c:\sys\bin\bctestappfrm.exe"/>
-							<param component-path="bctest" />
-						</params>
-					</step>
-					<step id="" name="Test Step 1 (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
-						<command>install</command>
-						<params>
-							<param type="binary"/>
-							<param src="bctestbutton.exe"/>
-							<param dst="c:\sys\bin\bctestbutton.exe"/>
-							<param component-path="bctest" />
-						</params>
-					</step>
-					<step id="" name="Test Step 1 (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
-						<command>install</command>
-						<params>
-							<param type="binary"/>
-							<param src="bctestbuttons.exe"/>
-							<param dst="c:\sys\bin\bctestbuttons.exe"/>
+							<param src="z/resource/apps/bctestchoicelist.rsc"/>
+							<param dst="z:\resource\apps\bctestchoicelist.rsc"/>
 							<param component-path="bctest" />
 						</params>
 					</step>
@@ -1138,80 +1444,8 @@
 						<command>install</command>
 						<params>
 							<param type="binary"/>
-							<param src="bctestcmdlg.exe"/>
-							<param dst="c:\sys\bin\bctestcmdlg.exe"/>
-							<param component-path="bctest" />
-						</params>
-					</step>
-					<step id="" name="Test Step 1 (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
-						<command>install</command>
-						<params>
-							<param type="binary"/>
-							<param src="bctestdocandinit.exe"/>
-							<param dst="c:\sys\bin\bctestdocandinit.exe"/>
-							<param component-path="bctest" />
-						</params>
-					</step>
-					<step id="" name="Test Step 1 (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
-						<command>install</command>
-						<params>
-							<param type="binary"/>
-							<param src="bctesteditor.exe"/>
-							<param dst="c:\sys\bin\bctesteditor.exe"/>
-							<param component-path="bctest" />
-						</params>
-					</step>
-					<step id="" name="Test Step 1 (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
-						<command>install</command>
-						<params>
-							<param type="binary"/>
-							<param src="bctesteh.exe"/>
-							<param dst="c:\sys\bin\bctesteh.exe"/>
-							<param component-path="bctest" />
-						</params>
-					</step>
-					<step id="" name="Test Step 1 (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
-						<command>install</command>
-						<params>
-							<param type="binary"/>
-							<param src="bctesteikbctrl.exe"/>
-							<param dst="c:\sys\bin\bctesteikbctrl.exe"/>
-							<param component-path="bctest" />
-						</params>
-					</step>
-					<step id="" name="Test Step 1 (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
-						<command>install</command>
-						<params>
-							<param type="binary"/>
-							<param src="bctesteikfrm.exe"/>
-							<param dst="c:\sys\bin\bctesteikfrm.exe"/>
-							<param component-path="bctest" />
-						</params>
-					</step>
-					<step id="" name="Test Step 1 (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
-						<command>install</command>
-						<params>
-							<param type="binary"/>
-							<param src="bctestfontinput.exe"/>
-							<param dst="c:\sys\bin\bctestfontinput.exe"/>
-							<param component-path="bctest" />
-						</params>
-					</step>
-					<step id="" name="Test Step 1 (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
-						<command>install</command>
-						<params>
-							<param type="binary"/>
-							<param src="bctestform.exe"/>
-							<param dst="c:\sys\bin\bctestform.exe"/>
-							<param component-path="bctest" />
-						</params>
-					</step>
-					<step id="" name="Test Step 1 (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
-						<command>install</command>
-						<params>
-							<param type="binary"/>
-							<param src="bctestgrids.exe"/>
-							<param dst="c:\sys\bin\bctestgrids.exe"/>
+							<param src="z/private/10003a3f/apps/bctestmix50_reg.rsc"/>
+							<param dst="z:\private\10003a3f\import\apps\bctestmix50_reg.rsc"/>
 							<param component-path="bctest" />
 						</params>
 					</step>
@@ -1219,89 +1453,8 @@
 						<command>install</command>
 						<params>
 							<param type="binary"/>
-							<param src="bctestimage.exe"/>
-							<param dst="c:\sys\bin\bctestimage.exe"/>
-							<param component-path="bctest" />
-						</params>
-					</step>
-					<step id="" name="Test Step 1 (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
-						<command>install</command>
-						<params>
-							<param type="binary"/>
-							<param src="bctestkeylock.exe"/>
-							<param dst="c:\sys\bin\bctestkeylock.exe"/>
-							<param component-path="bctest" />
-						</params>
-					</step>
-					<step id="" name="Test Step 1 (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
-						<command>install</command>
-						<params>
-							<param type="binary"/>
-							<param src="bctestlabelinfoindicators.exe"/>
-							<param dst="c:\sys\bin\bctestlabelinfoindicators.exe"/>
-							<param component-path="bctest" />
-						</params>
-					</step>
-					<step id="" name="Test Step 1 (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
-						<command>install</command>
-						<params>
-							<param type="binary"/>
-							<param src="bctestlist.exe"/>
-							<param dst="c:\sys\bin\bctestlist.exe"/>
-							<param component-path="bctest" />
-						</params>
-					</step>
-					<step id="" name="Test Step 1 (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
-						<command>install</command>
-						<params>
-							<param type="binary"/>
-							<param src="bctestlocalizer.exe"/>
-							<param dst="c:\sys\bin\bctestlocalizer.exe"/>
-							<param component-path="bctest" />
-						</params>
-					</step>
-					<step id="" name="Test Step 1 (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
-						<command>install</command>
-						<params>
-							<param type="binary"/>
-							<param src="bctestlocation.exe"/>
-							<param dst="c:\sys\bin\bctestlocation.exe"/>
-							<param component-path="bctest" />
-						</params>
-					</step>
-					<step id="" name="Test Step 1 (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
-						<command>install</command>
-						<params>
-							<param type="binary"/>
-							<param src="bctestmenu.exe"/>
-							<param dst="c:\sys\bin\bctestmenu.exe"/>
-							<param component-path="bctest" />
-						</params>
-					</step>
-					<step id="" name="Test Step 1 (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
-						<command>install</command>
-						<params>
-							<param type="binary"/>
-							<param src="bctestmisc.exe"/>
-							<param dst="c:\sys\bin\bctestmisc.exe"/>
-							<param component-path="bctest" />
-						</params>
-					</step>
-					<step id="" name="Test Step 1 (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
-						<command>install</command>
-						<params>
-							<param type="binary"/>
-							<param src="bctestmisc32.exe"/>
-							<param dst="c:\sys\bin\bctestmisc32.exe"/>
-							<param component-path="bctest" />
-						</params>
-					</step>
-					<step id="" name="Test Step 1 (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
-						<command>install</command>
-						<params>
-							<param type="binary"/>
-							<param src="bctestmisccontrol.exe"/>
-							<param dst="c:\sys\bin\bctestmisccontrol.exe"/>
+							<param src="z/resource/apps/bctestmix50.rsc"/>
+							<param dst="z:\resource\apps\bctestmix50.rsc"/>
 							<param component-path="bctest" />
 						</params>
 					</step>
@@ -1318,71 +1471,8 @@
 						<command>install</command>
 						<params>
 							<param type="binary"/>
-							<param src="bctestnote.exe"/>
-							<param dst="c:\sys\bin\bctestnote.exe"/>
-							<param component-path="bctest" />
-						</params>
-					</step>
-					<step id="" name="Test Step 1 (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
-						<command>install</command>
-						<params>
-							<param type="binary"/>
-							<param src="bctestnotifier.exe"/>
-							<param dst="c:\sys\bin\bctestnotifier.exe"/>
-							<param component-path="bctest" />
-						</params>
-					</step>
-					<step id="" name="Test Step 1 (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
-						<command>install</command>
-						<params>
-							<param type="binary"/>
-							<param src="bctestocr.exe"/>
-							<param dst="c:\sys\bin\bctestocr.exe"/>
-							<param component-path="bctest" />
-						</params>
-					</step>
-					<step id="" name="Test Step 1 (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
-						<command>install</command>
-						<params>
-							<param type="binary"/>
-							<param src="bctestpane.exe"/>
-							<param dst="c:\sys\bin\bctestpane.exe"/>
-							<param component-path="bctest" />
-						</params>
-					</step>
-					<step id="" name="Test Step 1 (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
-						<command>install</command>
-						<params>
-							<param type="binary"/>
-							<param src="bctestpopups.exe"/>
-							<param dst="c:\sys\bin\bctestpopups.exe"/>
-							<param component-path="bctest" />
-						</params>
-					</step>
-					<step id="" name="Test Step 1 (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
-						<command>install</command>
-						<params>
-							<param type="binary"/>
-							<param src="bctestpreviewpopup.exe"/>
-							<param dst="c:\sys\bin\bctestpreviewpopup.exe"/>
-							<param component-path="bctest" />
-						</params>
-					</step>
-					<step id="" name="Test Step 1 (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
-						<command>install</command>
-						<params>
-							<param type="binary"/>
-							<param src="bctestprivateuifrm.exe"/>
-							<param dst="c:\sys\bin\bctestprivateuifrm.exe"/>
-							<param component-path="bctest" />
-						</params>
-					</step>
-					<step id="" name="Test Step 1 (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
-						<command>install</command>
-						<params>
-							<param type="binary"/>
-							<param src="bctestptieng.exe"/>
-							<param dst="c:\sys\bin\bctestptieng.exe"/>
+							<param src="z/private/10003a3f/apps/bctesttoolbar_reg.rsc"/>
+							<param dst="z:\private\10003a3f\import\apps\bctesttoolbar_reg.rsc"/>
 							<param component-path="bctest" />
 						</params>
 					</step>
@@ -1390,80 +1480,8 @@
 						<command>install</command>
 						<params>
 							<param type="binary"/>
-							<param src="bctestquery.exe"/>
-							<param dst="c:\sys\bin\bctestquery.exe"/>
-							<param component-path="bctest" />
-						</params>
-					</step>
-					<step id="" name="Test Step 1 (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
-						<command>install</command>
-						<params>
-							<param type="binary"/>
-							<param src="bctestscreenclearer.exe"/>
-							<param dst="c:\sys\bin\bctestscreenclearer.exe"/>
-							<param component-path="bctest" />
-						</params>
-					</step>
-					<step id="" name="Test Step 1 (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
-						<command>install</command>
-						<params>
-							<param type="binary"/>
-							<param src="bctestscroller.exe"/>
-							<param dst="c:\sys\bin\bctestscroller.exe"/>
-							<param component-path="bctest" />
-						</params>
-					</step>
-					<step id="" name="Test Step 1 (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
-						<command>install</command>
-						<params>
-							<param type="binary"/>
-							<param src="bctestsearchfield.exe"/>
-							<param dst="c:\sys\bin\bctestsearchfield.exe"/>
-							<param component-path="bctest" />
-						</params>
-					</step>
-					<step id="" name="Test Step 1 (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
-						<command>install</command>
-						<params>
-							<param type="binary"/>
-							<param src="bctestserverapp.exe"/>
-							<param dst="c:\sys\bin\bctestserverapp.exe"/>
-							<param component-path="bctest" />
-						</params>
-					</step>
-					<step id="" name="Test Step 1 (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
-						<command>install</command>
-						<params>
-							<param type="binary"/>
-							<param src="bctestservicehandler.exe"/>
-							<param dst="c:\sys\bin\bctestservicehandler.exe"/>
-							<param component-path="bctest" />
-						</params>
-					</step>
-					<step id="" name="Test Step 1 (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
-						<command>install</command>
-						<params>
-							<param type="binary"/>
-							<param src="bctestsettingpage.exe"/>
-							<param dst="c:\sys\bin\bctestsettingpage.exe"/>
-							<param component-path="bctest" />
-						</params>
-					</step>
-					<step id="" name="Test Step 1 (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
-						<command>install</command>
-						<params>
-							<param type="binary"/>
-							<param src="bctestskins.exe"/>
-							<param dst="c:\sys\bin\bctestskins.exe"/>
-							<param component-path="bctest" />
-						</params>
-					</step>
-					<step id="" name="Test Step 1 (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
-						<command>install</command>
-						<params>
-							<param type="binary"/>
-							<param src="bctestsliderandicons.exe"/>
-							<param dst="c:\sys\bin\bctestsliderandicons.exe"/>
+							<param src="z/resource/apps/bctesttoolbar.rsc"/>
+							<param dst="z:\resource\apps\bctesttoolbar.rsc"/>
 							<param component-path="bctest" />
 						</params>
 					</step>
@@ -1480,6 +1498,24 @@
 						<command>install</command>
 						<params>
 							<param type="binary"/>
+							<param src="z/private/10003a3f/apps/bctesttouchpane_reg.rsc"/>
+							<param dst="z:\private\10003a3f\import\apps\bctesttouchpane_reg.rsc"/>
+							<param component-path="bctest" />
+						</params>
+					</step>
+					<step id="" name="Test Step 1 (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
+						<command>install</command>
+						<params>
+							<param type="binary"/>
+							<param src="z/resource/apps/bctesttouchpane.rsc"/>
+							<param dst="z:\resource\apps\bctesttouchpane.rsc"/>
+							<param component-path="bctest" />
+						</params>
+					</step>
+					<step id="" name="Test Step 1 (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
+						<command>install</command>
+						<params>
+							<param type="binary"/>
 							<param src="bctesttouchpane.exe"/>
 							<param dst="c:\sys\bin\bctesttouchpane.exe"/>
 							<param component-path="bctest" />
@@ -1489,38 +1525,29 @@
 						<command>install</command>
 						<params>
 							<param type="binary"/>
+							<param src="z/private/10003a3f/apps/bctesttreelist_reg.rsc"/>
+							<param dst="z:\private\10003a3f\import\apps\bctesttreelist_reg.rsc"/>
+							<param component-path="bctest" />
+						</params>
+					</step>
+					<step id="" name="Test Step 1 (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
+						<command>install</command>
+						<params>
+							<param type="binary"/>
+							<param src="z/resource/apps/bctesttreelist.rsc"/>
+							<param dst="z:\resource\apps\bctesttreelist.rsc"/>
+							<param component-path="bctest" />
+						</params>
+					</step>
+					<step id="" name="Test Step 1 (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
+						<command>install</command>
+						<params>
+							<param type="binary"/>
 							<param src="bctesttreelist.exe"/>
 							<param dst="c:\sys\bin\bctesttreelist.exe"/>
 							<param component-path="bctest" />
 						</params>
 					</step>
-					<step id="" name="Test Step 1 (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
-						<command>install</command>
-						<params>
-							<param type="binary"/>
-							<param src="bctestuniteditor.exe"/>
-							<param dst="c:\sys\bin\bctestuniteditor.exe"/>
-							<param component-path="bctest" />
-						</params>
-					</step>
-					<step id="" name="Test Step 1 (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
-						<command>install</command>
-						<params>
-							<param type="binary"/>
-							<param src="bctestutilities.exe"/>
-							<param dst="c:\sys\bin\bctestutilities.exe"/>
-							<param component-path="bctest" />
-						</params>
-					</step>
-					<step id="" name="Test Step 1 (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
-						<command>install</command>
-						<params>
-							<param type="binary"/>
-							<param src="bctestvolume.exe"/>
-							<param dst="c:\sys\bin\bctestvolume.exe"/>
-							<param component-path="bctest" />
-						</params>
-					</step>
 					<step id="" name="Test Step 2 (execute)" harness="GENERIC" enabled="true" passrate="100">
 						<command>execute</command>
 						<params>
@@ -1675,16 +1702,6 @@
 						<command>execute</command>
 						<params>
 							<param file="bctestlauncher.exe"/>
-							<param parameters="bctestkeylock"/>
-							<param result-file="c:\BCTestLog\bctestkeylock_TestLog.txt"/>
-							<param parser="BCTestResultParser"/>
-							<param timeout="1000"/>
-						</params>
-					</step>
-					<step id="" name="Test Step 2 (execute)" harness="GENERIC" enabled="true" passrate="100">
-						<command>execute</command>
-						<params>
-							<param file="bctestlauncher.exe"/>
 							<param parameters="bctestlabelinfoindicators"/>
 							<param result-file="c:\BCTestLog\bctestlabelinfoindicators_TestLog.txt"/>
 							<param parser="BCTestResultParser"/>
@@ -2001,6 +2018,16 @@
 							<param timeout="1000"/>
 						</params>
 					</step>
+					<step id="" name="Test Step 2 (execute)" harness="GENERIC" enabled="true" passrate="100">
+						<command>execute</command>
+						<params>
+							<param file="bctestlauncher.exe"/>
+							<param parameters="bctestkeylock"/>
+							<param result-file="c:\BCTestLog\bctestkeylock_TestLog.txt"/>
+							<param parser="BCTestResultParser"/>
+							<param timeout="1000"/>
+						</params>
+					</step>
 				</case>
 			</set>
 		</session>
@@ -2009,170 +2036,172 @@
 		<file>bctest/general/UIFW.bat</file>
 		<file>bctest/BCTestLog/general/release_note.txt</file>
 		<file>bctest/BCTestLog/general/config.xml</file>
-		<file>bctest/winscw_udeb/z/resource/apps/bctestlauncher_aif.mbm</file>
+		<file>bctest/winscw_udeb/bctestutil.dll</file>
+		<file>bctest/winscw_udeb/bctestlauncher.exe</file>
+		<file>bctest/winscw_udeb/z/private/10003a3f/apps/bctestlauncher_reg.r01</file>
 		<file>bctest/winscw_udeb/z/resource/apps/bctestlauncher.r01</file>
-		<file>bctest/winscw_udeb/z/private/10003a3f/apps/bctestlauncher_reg.r01</file>
+		<file>bctest/winscw_udeb/z/resource/apps/bctestlauncher_aif.mbm</file>
+		<file>bctest/winscw_udeb/z/private/10003a3f/apps/bctestbuttons_reg.rsc</file>
 		<file>bctest/winscw_udeb/z/resource/apps/bctestbuttons.mbm</file>
 		<file>bctest/winscw_udeb/z/resource/apps/bctestbuttons.rsc</file>
-		<file>bctest/winscw_udeb/z/private/10003a3f/apps/bctestbuttons_reg.rsc</file>
+		<file>bctest/winscw_udeb/bctestbuttons.exe</file>
+		<file>bctest/winscw_udeb/z/private/10003a3f/apps/bctestsliderandicons_reg.rsc</file>
 		<file>bctest/winscw_udeb/z/resource/apps/bctestsliderandicons.rsc</file>
-		<file>bctest/winscw_udeb/z/private/10003a3f/apps/bctestsliderandicons_reg.rsc</file>
+		<file>bctest/winscw_udeb/bctestsliderandicons.exe</file>
+		<file>bctest/winscw_udeb/z/private/10003a3f/apps/bctestaknsound_reg.rsc</file>
 		<file>bctest/winscw_udeb/z/resource/apps/bctestaknsound.mbm</file>
+		<file>bctest/winscw_udeb/z/resource/apps/bctestaknsound.rsc</file>
 		<file>bctest/winscw_udeb/z/resource/apps/bctestaknsound_aif.mbm</file>
-		<file>bctest/winscw_udeb/z/resource/apps/bctestaknsound.rsc</file>
-		<file>bctest/winscw_udeb/z/private/10003a3f/apps/bctestaknsound_reg.rsc</file>
+		<file>bctest/winscw_udeb/bctestaknsound.exe</file>
+		<file>bctest/winscw_udeb/z/private/10003a3f/apps/bctestappfrm_reg.rsc</file>
 		<file>bctest/winscw_udeb/z/resource/apps/bctestappfrm.rsc</file>
-		<file>bctest/winscw_udeb/z/private/10003a3f/apps/bctestappfrm_reg.rsc</file>
+		<file>bctest/winscw_udeb/bctestappfrm.exe</file>
+		<file>bctest/winscw_udeb/z/private/10003a3f/apps/bctestcmdlg_reg.rsc</file>
 		<file>bctest/winscw_udeb/z/resource/apps/bctestcmdlg.rsc</file>
-		<file>bctest/winscw_udeb/z/private/10003a3f/apps/bctestcmdlg_reg.rsc</file>
+		<file>bctest/winscw_udeb/bctestcmdlg.exe</file>
+		<file>bctest/winscw_udeb/z/private/10003a3f/apps/bctestdocandinit_reg.rsc</file>
 		<file>bctest/winscw_udeb/z/resource/apps/bctestdocandinit.rsc</file>
-		<file>bctest/winscw_udeb/z/private/10003a3f/apps/bctestdocandinit_reg.rsc</file>
-		<file>bctest/winscw_udeb/z/resource/apps/bctesteditor.rsc</file>
+		<file>bctest/winscw_udeb/bctestdocandinit.exe</file>
 		<file>bctest/winscw_udeb/z/private/10003a3f/apps/bctesteditor_reg.rsc</file>
+		<file>bctest/winscw_udeb/z/resource/apps/bctesteditor.rsc</file>
+		<file>bctest/winscw_udeb/bctesteditor.exe</file>
+		<file>bctest/winscw_udeb/z/private/10003a3f/apps/bctesteh_reg.rsc</file>
 		<file>bctest/winscw_udeb/z/resource/apps/bctesteh.rsc</file>
-		<file>bctest/winscw_udeb/z/private/10003a3f/apps/bctesteh_reg.rsc</file>
+		<file>bctest/winscw_udeb/bctesteh.exe</file>
+		<file>bctest/winscw_udeb/z/private/10003a3f/apps/bctesteikbctrl_reg.rsc</file>
+		<file>bctest/winscw_udeb/z/resource/apps/bctesteikbctrl.rsc</file>
 		<file>bctest/winscw_udeb/z/resource/apps/bctesteikbctrl_aif.mbm</file>
-		<file>bctest/winscw_udeb/z/resource/apps/bctesteikbctrl.rsc</file>
-		<file>bctest/winscw_udeb/z/private/10003a3f/apps/bctesteikbctrl_reg.rsc</file>
+		<file>bctest/winscw_udeb/bctesteikbctrl.exe</file>
+		<file>bctest/winscw_udeb/z/private/10003a3f/apps/bctesteikfrm_reg.r01</file>
 		<file>bctest/winscw_udeb/z/resource/apps/bctesteikfrm.r01</file>
-		<file>bctest/winscw_udeb/z/private/10003a3f/apps/bctesteikfrm_reg.r01</file>
-		<file>bctest/winscw_udeb/z/resource/apps/bctestfontinput.mbm</file>
-		<file>bctest/winscw_udeb/z/resource/apps/bctestfontinput_aif.mbm</file>
-		<file>bctest/winscw_udeb/z/resource/apps/bctestfontinput.rsc</file>
+		<file>bctest/winscw_udeb/bctesteikfrm.exe</file>
 		<file>bctest/winscw_udeb/z/private/10003a3f/apps/bctestfontinput_reg.rsc</file>
+		<file>bctest/winscw_udeb/z/resource/apps/bctestfontinput.mbm</file>
+		<file>bctest/winscw_udeb/z/resource/apps/bctestfontinput.rsc</file>
+		<file>bctest/winscw_udeb/z/resource/apps/bctestfontinput_aif.mbm</file>
+		<file>bctest/winscw_udeb/bctestfontinput.exe</file>
+		<file>bctest/winscw_udeb/z/private/10003a3f/apps/bctestform_reg.rsc</file>
 		<file>bctest/winscw_udeb/z/resource/apps/bctestform.rsc</file>
-		<file>bctest/winscw_udeb/z/private/10003a3f/apps/bctestform_reg.rsc</file>
+		<file>bctest/winscw_udeb/bctestform.exe</file>
+		<file>bctest/winscw_udeb/z/private/10003a3f/apps/bctestgrids_reg.rsc</file>
 		<file>bctest/winscw_udeb/z/resource/apps/bctestgrids.rsc</file>
-		<file>bctest/winscw_udeb/z/private/10003a3f/apps/bctestgrids_reg.rsc</file>
-		<file>bctest/winscw_udeb/z/resource/apps/bctestimage_aif.mbm</file>
+		<file>bctest/winscw_udeb/bctestgrids.exe</file>
+		<file>bctest/winscw_udeb/z/private/10003a3f/apps/bctestimage_reg.rsc</file>
 		<file>bctest/winscw_udeb/z/resource/apps/bctestimage.rsc</file>
-		<file>bctest/winscw_udeb/z/private/10003a3f/apps/bctestimage_reg.rsc</file>
+		<file>bctest/winscw_udeb/z/resource/apps/bctestimage_aif.mbm</file>
+		<file>bctest/winscw_udeb/bctestimage.exe</file>
+		<file>bctest/winscw_udeb/z/private/10003a3f/apps/bctestkeylock_reg.rsc</file>
 		<file>bctest/winscw_udeb/z/resource/apps/bctestkeylock.rsc</file>
-		<file>bctest/winscw_udeb/z/private/10003a3f/apps/bctestkeylock_reg.rsc</file>
-		<file>bctest/winscw_udeb/z/resource/apps/bctestlabelinfoindicators.rsc</file>
+		<file>bctest/winscw_udeb/bctestkeylock.exe</file>
 		<file>bctest/winscw_udeb/z/private/10003a3f/apps/bctestlabelinfoindicators_reg.rsc</file>
-		<file>bctest/winscw_udeb/z/resource/apps/bctestlist_aif.mbm</file>
+		<file>bctest/winscw_udeb/z/resource/apps/bctestlabelinfoindicators.rsc</file>
+		<file>bctest/winscw_udeb/bctestlabelinfoindicators.exe</file>
+		<file>bctest/winscw_udeb/z/private/10003a3f/apps/bctestlist_reg.rsc</file>
 		<file>bctest/winscw_udeb/z/resource/apps/bctestlist.rsc</file>
-		<file>bctest/winscw_udeb/z/private/10003a3f/apps/bctestist_reg.rsc</file>
+		<file>bctest/winscw_udeb/z/resource/apps/bctestlist_aif.mbm</file>
+		<file>bctest/winscw_udeb/z/resource/apps/bctestlist.mbm</file>
+		<file>bctest/winscw_udeb/z/resource/apps/bctestlist.mif</file>
+		<file>bctest/winscw_udeb/bctestlist.exe</file>
+		<file>bctest/winscw_udeb/z/private/10003a3f/apps/bctestmenu_reg.rsc</file>
 		<file>bctest/winscw_udeb/z/resource/apps/bctestmenu.rsc</file>
-		<file>bctest/winscw_udeb/z/private/10003a3f/apps/bctestmenu_reg.rsc</file>
+		<file>bctest/winscw_udeb/bctestmenu.exe</file>
+		<file>bctest/winscw_udeb/z/private/10003a3f/apps/bctestmisccontrol_reg.rsc</file>
+		<file>bctest/winscw_udeb/z/resource/apps/bctestmisccontrol.mbm</file>
+		<file>bctest/winscw_udeb/z/resource/apps/bctestmisccontrol.rsc</file>
+		<file>bctest/winscw_udeb/bctestmisccontrol.exe</file>
+		<file>bctest/winscw_udeb/z/private/10003a3f/apps/bctestnote_reg.rsc</file>
 		<file>bctest/winscw_udeb/z/resource/apps/bctestnote.mbm</file>
 		<file>bctest/winscw_udeb/z/resource/apps/bctestnote.rsc</file>
-		<file>bctest/winscw_udeb/z/private/10003a3f/apps/bctestnote_reg.rsc</file>
-		<file>bctest/winscw_udeb/z/resource/apps/bctestnotifier.rsc</file>
+		<file>bctest/winscw_udeb/bctestnote.exe</file>
 		<file>bctest/winscw_udeb/z/private/10003a3f/apps/bctestnotifier_reg.rsc</file>
+		<file>bctest/winscw_udeb/z/resource/apps/bctestnotifier.rsc</file>
+		<file>bctest/winscw_udeb/bctestnotifier.exe</file>
+		<file>bctest/winscw_udeb/z/private/10003a3f/apps/bctestpane_reg.rsc</file>
 		<file>bctest/winscw_udeb/z/resource/apps/bctestpane.rsc</file>
-		<file>bctest/winscw_udeb/z/private/10003a3f/apps/bctestpane_reg.rsc</file>
+		<file>bctest/winscw_udeb/bctestpane.exe</file>
+		<file>bctest/winscw_udeb/z/private/10003a3f/apps/bctestpopups_reg.rsc</file>
 		<file>bctest/winscw_udeb/z/resource/apps/bctestpopups.mbm</file>
 		<file>bctest/winscw_udeb/z/resource/apps/bctestpopups.rsc</file>
-		<file>bctest/winscw_udeb/z/private/10003a3f/apps/bctestpopups_reg.rsc</file>
-		<file>bctest/winscw_udeb/z/resource/apps/bctestprivateuifrm.rsc</file>
+		<file>bctest/winscw_udeb/bctestpopups.exe</file>
 		<file>bctest/winscw_udeb/z/private/10003a3f/apps/bctestprivateuifrm_reg.rsc</file>
+		<file>bctest/winscw_udeb/z/resource/apps/bctestprivateuifrm.rsc</file>
+		<file>bctest/winscw_udeb/bctestprivateuifrm.exe</file>
+		<file>bctest/winscw_udeb/z/private/10003a3f/apps/bctestptieng_reg.rsc</file>
 		<file>bctest/winscw_udeb/z/resource/apps/bctestptieng.rsc</file>
-		<file>bctest/winscw_udeb/z/private/10003a3f/apps/bctestptieng_reg.rsc</file>
+		<file>bctest/winscw_udeb/bctestptieng.exe</file>
+		<file>bctest/winscw_udeb/z/private/10003a3f/apps/bctestquery_reg.rsc</file>
 		<file>bctest/winscw_udeb/z/resource/apps/bctestquery.rsc</file>
-		<file>bctest/winscw_udeb/z/private/10003a3f/apps/bctestquery_reg.rsc</file>
+		<file>bctest/winscw_udeb/bctestquery.exe</file>
+		<file>bctest/winscw_udeb/z/private/10003a3f/apps/bctestscreenclearer_reg.rsc</file>
 		<file>bctest/winscw_udeb/z/resource/apps/bctestscreenclearer.mbm</file>
+		<file>bctest/winscw_udeb/z/resource/apps/bctestscreenclearer.rsc</file>
 		<file>bctest/winscw_udeb/z/resource/apps/bctestscreenclearer_aif.mbm</file>
-		<file>bctest/winscw_udeb/z/resource/apps/bctestscreenclearer.rsc</file>
-		<file>bctest/winscw_udeb/z/private/10003a3f/apps/bctestscreenclearer_reg.rsc</file>
-		<file>bctest/winscw_udeb/z/resource/apps/bctestscroller.rsc</file>
+		<file>bctest/winscw_udeb/bctestscreenclearer.exe</file>
 		<file>bctest/winscw_udeb/z/private/10003a3f/apps/bctestscroller_reg.rsc</file>
+		<file>bctest/winscw_udeb/z/resource/apps/bctestscroller.rsc</file>
+		<file>bctest/winscw_udeb/bctestscroller.exe</file>
+		<file>bctest/winscw_udeb/z/private/10003a3f/apps/bctestsearchfield_reg.rsc</file>
 		<file>bctest/winscw_udeb/z/resource/apps/bctestsearchfield.rsc</file>
-		<file>bctest/winscw_udeb/z/private/10003a3f/apps/bctestsearchfield_reg.rsc</file>
+		<file>bctest/winscw_udeb/bctestsearchfield.exe</file>
+		<file>bctest/winscw_udeb/z/private/10003a3f/apps/bctestserverapp_reg.rsc</file>
 		<file>bctest/winscw_udeb/z/resource/apps/bctestserverapp.rsc</file>
-		<file>bctest/winscw_udeb/z/private/10003a3f/apps/bctestserverapp_reg.rsc</file>
-		<file>bctest/winscw_udeb/z/resource/apps/bctestsettingpage.mbm</file>
+		<file>bctest/winscw_udeb/bctestserverapp.exe</file>
+		<file>bctest/winscw_udeb/z/private/10003a3f/apps/bctestsettingpage_reg.rsc</file>
+		<file>bctest/winscw_udeb/z/resource/apps/bctestsettingpage.rsc</file>
 		<file>bctest/winscw_udeb/z/resource/apps/bctestsettingpage_aif.mbm</file>
-		<file>bctest/winscw_udeb/z/resource/apps/bctestsettingpage.rsc</file>
-		<file>bctest/winscw_udeb/z/private/10003a3f/apps/bctestsettingpage_reg.rsc</file>
+		<file>bctest/winscw_udeb/z/resource/apps/bctestsettingpage.mbm</file>
+		<file>bctest/winscw_udeb/bctestsettingpage.exe</file>
+		<file>bctest/winscw_udeb/z/private/10003a3f/apps/bctestskins_reg.rsc</file>
 		<file>bctest/winscw_udeb/z/resource/apps/bctestskins.rsc</file>
-		<file>bctest/winscw_udeb/z/private/10003a3f/apps/bctestskins_reg.rsc</file>
+		<file>bctest/winscw_udeb/bctestskins.exe</file>
+		<file>bctest/winscw_udeb/z/private/10003a3f/apps/bctestutilities_reg.rsc</file>
 		<file>bctest/winscw_udeb/z/resource/apps/bctestutilities.rsc</file>
-		<file>bctest/winscw_udeb/z/private/10003a3f/apps/bctestutilities_reg.rsc</file>
+		<file>bctest/winscw_udeb/bctestutilities.exe</file>
+		<file>bctest/winscw_udeb/z/private/10003a3f/apps/bctestvolume_reg.rsc</file>
 		<file>bctest/winscw_udeb/z/resource/apps/bctestvolume.mbm</file>
 		<file>bctest/winscw_udeb/z/resource/apps/bctestvolume.rsc</file>
-		<file>bctest/winscw_udeb/z/private/10003a3f/apps/bctestvolume_reg.rsc</file>
+		<file>bctest/winscw_udeb/bctestvolume.exe</file>
+		<file>bctest/winscw_udeb/z/private/10003a3f/apps/bctestocr_reg.rsc</file>
 		<file>bctest/winscw_udeb/z/resource/apps/bctestocr.rsc</file>
-		<file>bctest/winscw_udeb/z/private/10003a3f/apps/bctestocr_reg.rsc</file>
+		<file>bctest/winscw_udeb/bctestocr.exe</file>
+		<file>bctest/winscw_udeb/z/private/10003a3f/apps/bctestmisc_reg.rsc</file>
 		<file>bctest/winscw_udeb/z/resource/apps/bctestmisc.rsc</file>
-		<file>bctest/winscw_udeb/z/private/10003a3f/apps/bctestmisc_reg.rsc</file>
+		<file>bctest/winscw_udeb/bctestmisc.exe</file>
+		<file>bctest/winscw_udeb/z/private/10003a3f/apps/bctestlocation_reg.rsc</file>
 		<file>bctest/winscw_udeb/z/resource/apps/bctestlocation.rsc</file>
-		<file>bctest/winscw_udeb/z/private/10003a3f/apps/bctestlocation_reg.rsc</file>
-		<file>bctest/winscw_udeb/z/resource/apps/bctestuniteditor.rsc</file>
+		<file>bctest/winscw_udeb/bctestlocation.exe</file>
 		<file>bctest/winscw_udeb/z/private/10003a3f/apps/bctestuniteditor_reg.rsc</file>
-		<file>bctest/winscw_udeb/z/resource/apps/bctestmisc32.rsc</file>
+		<file>bctest/winscw_udeb/z/resource/apps/bctestuniteditor.rsc</file>
+		<file>bctest/winscw_udeb/bctestuniteditor.exe</file>
 		<file>bctest/winscw_udeb/z/private/10003a3f/apps/bctestmisc32_reg.rsc</file>
+		<file>bctest/winscw_udeb/z/resource/apps/bctestmisc32.rsc</file>
+		<file>bctest/winscw_udeb/bctestmisc32.exe</file>
+		<file>bctest/winscw_udeb/z/private/10003a3f/apps/bctestlocalizer_reg.rsc</file>
 		<file>bctest/winscw_udeb/z/resource/apps/bctestlocalizer.rsc</file>
-		<file>bctest/winscw_udeb/z/private/10003a3f/apps/bctestlocalizer_reg.rsc</file>
+		<file>bctest/winscw_udeb/bctestlocalizer.exe</file>
+		<file>bctest/winscw_udeb/z/private/10003a3f/apps/bctestpreviewpopup_reg.rsc</file>
 		<file>bctest/winscw_udeb/z/resource/apps/bctestpreviewpopup.rsc</file>
-		<file>bctest/winscw_udeb/z/private/10003a3f/apps/bctestpreviewpopup_reg.rsc</file>
+		<file>bctest/winscw_udeb/bctestpreviewpopup.exe</file>
+		<file>bctest/winscw_udeb/z/private/10003a3f/apps/bctestservicehandler_reg.rsc</file>
 		<file>bctest/winscw_udeb/z/resource/apps/bctestservicehandler.rsc</file>
-		<file>bctest/winscw_udeb/z/private/10003a3f/apps/bctestservicehandler_reg.rsc</file>
-		<file>bctest/winscw_udeb/z/resource/apps/bctestbutton.rsc</file>
+		<file>bctest/winscw_udeb/bctestservicehandler.exe</file>
 		<file>bctest/winscw_udeb/z/private/10003a3f/apps/bctestbutton_reg.rsc</file>
-		<file>bctest/winscw_udeb/z/resource/apps/bctestchoicelist.rsc</file>
+		<file>bctest/winscw_udeb/z/resource/apps/bctestbutton.rsc</file>
+		<file>bctest/winscw_udeb/bctestbutton.exe</file>
 		<file>bctest/winscw_udeb/z/private/10003a3f/apps/bctestchoicelist_reg.rsc</file>
-		<file>bctest/winscw_udeb/z/resource/apps/bctestmix50.rsc</file>
-		<file>bctest/winscw_udeb/z/private/10003a3f/apps/bctestmix50_reg.rsc</file>
-		<file>bctest/winscw_udeb/z/resource/apps/bctesttoolbar.rsc</file>
-		<file>bctest/winscw_udeb/z/private/10003a3f/apps/bctesttoolbar_reg.rsc</file>
-		<file>bctest/winscw_udeb/z/resource/apps/bctesttouchpane.rsc</file>
-		<file>bctest/winscw_udeb/z/private/10003a3f/apps/bctesttouchpane_reg.rsc</file>
-		<file>bctest/winscw_udeb/z/resource/apps/bctesttreelist.rsc</file>
-		<file>bctest/winscw_udeb/z/private/10003a3f/apps/bctesttreelist_reg.rsc</file>
-		<file>bctest/winscw_udeb/z/resource/apps/bctestmisccontrol.mbm</file>
-		<file>bctest/winscw_udeb/z/resource/apps/bctestmisccontrol.rsc</file>
-		<file>bctest/winscw_udeb/z/private/10003a3f/apps/bctestmisccontrol_reg.rsc</file>
-		<file>bctest/winscw_udeb/bctestutil.dll</file>
-		<file>bctest/winscw_udeb/bctestlauncher.exe</file>
-		<file>bctest/winscw_udeb/bctestaknsound.exe</file>
-		<file>bctest/winscw_udeb/bctestappfrm.exe</file>
-		<file>bctest/winscw_udeb/bctestbutton.exe</file>
-		<file>bctest/winscw_udeb/bctestbuttons.exe</file>
+		<file>bctest/winscw_udeb/z/resource/apps/bctestchoicelist.rsc</file>
 		<file>bctest/winscw_udeb/bctestchoicelist.exe</file>
-		<file>bctest/winscw_udeb/bctestcmdlg.exe</file>
-		<file>bctest/winscw_udeb/bctestdocandinit.exe</file>
-		<file>bctest/winscw_udeb/bctesteditor.exe</file>
-		<file>bctest/winscw_udeb/bctesteh.exe</file>
-		<file>bctest/winscw_udeb/bcteikbctrl.exe</file>
-		<file>bctest/winscw_udeb/bctesteikfrm.exe"</file>
-		<file>bctest/winscw_udeb/bctestfontinput.exe"</file>
-		<file>bctest/winscw_udeb/bctestform.exe"</file>
-		<file>bctest/winscw_udeb/bctestgrids.exe"</file>
-		<file>bctest/winscw_udeb/bctestimage.exe"</file>
-		<file>bctest/winscw_udeb/bctestkeylock.exe"</file>
-		<file>bctest/winscw_udeb/bctestlabelinfoindicators.exe"</file>
-		<file>bctest/winscw_udeb/bctestlist.exe"</file>
-		<file>bctest/winscw_udeb/bctestlocalizer.exe"</file>
-		<file>bctest/winscw_udeb/bctestlocation.exe"</file>
-		<file>bctest/winscw_udeb/bctestmenu.exe"</file>
-		<file>bctest/winscw_udeb/bctestmisc.exe"</file>
-		<file>bctest/winscw_udeb/bctestmisc32.exe"</file>
-		<file>bctest/winscw_udeb/bctestmisccontrol.exe"</file>
-		<file>bctest/winscw_udeb/bctestmix50.exe"</file>
-		<file>bctest/winscw_udeb/bctestnote.exe"</file>
-		<file>bctest/winscw_udeb/bctestnotifier.exe"</file>
-		<file>bctest/winscw_udeb/bctestocr.exe"</file>
-		<file>bctest/winscw_udeb/bctestpane.exe"</file>
-		<file>bctest/winscw_udeb/bctestpopups.exe"</file>
-		<file>bctest/winscw_udeb/bctestpreviewpopup.exe"</file>
-		<file>bctest/winscw_udeb/bctestprivateuifrm.exe"</file>
-		<file>bctest/winscw_udeb/bctestptieng.exe"</file>
-		<file>bctest/winscw_udeb/bctestquery.exe"</file>
-		<file>bctest/winscw_udeb/bctestscreenclearer.exe"</file>
-		<file>bctest/winscw_udeb/bctestscroller.exe"</file>
-		<file>bctest/winscw_udeb/bctestsearchfield.exe"</file>
-		<file>bctest/winscw_udeb/bctestserverapp.exe"</file>
-		<file>bctest/winscw_udeb/bctestservicehandler.exe"</file>
-		<file>bctest/winscw_udeb/bctestsettingpage.exe"</file>
-		<file>bctest/winscw_udeb/bctestskins.exe"</file>
-		<file>bctest/winscw_udeb/bctestsliderandicons.exe"</file>
-		<file>bctest/winscw_udeb/bctesttoolbar.exe"</file>
-		<file>bctest/winscw_udeb/bctesttouchpane.exe"</file>
-		<file>bctest/winscw_udeb/bctesttreelist.exe"</file>
-		<file>bctest/winscw_udeb/bctestuniteditor.exe"</file>
-		<file>bctest/winscw_udeb/bctestutilities.exe"</file>
-		<file>bctest/winscw_udeb/bctestvolume.exe"</file>
+		<file>bctest/winscw_udeb/z/private/10003a3f/apps/bctestmix50_reg.rsc</file>
+		<file>bctest/winscw_udeb/z/resource/apps/bctestmix50.rsc</file>
+		<file>bctest/winscw_udeb/bctestmix50.exe</file>
+		<file>bctest/winscw_udeb/z/private/10003a3f/apps/bctesttoolbar_reg.rsc</file>
+		<file>bctest/winscw_udeb/z/resource/apps/bctesttoolbar.rsc</file>
+		<file>bctest/winscw_udeb/bctesttoolbar.exe</file>
+		<file>bctest/winscw_udeb/z/private/10003a3f/apps/bctesttouchpane_reg.rsc</file>
+		<file>bctest/winscw_udeb/z/resource/apps/bctesttouchpane.rsc</file>
+		<file>bctest/winscw_udeb/bctesttouchpane.exe</file>
+		<file>bctest/winscw_udeb/z/private/10003a3f/apps/bctesttreelist_reg.rsc</file>
+		<file>bctest/winscw_udeb/z/resource/apps/bctesttreelist.rsc</file>
+		<file>bctest/winscw_udeb/bctesttreelist.exe</file>
 	</files>
 </test>
diff -r 52c893932513 -r 60e228580ee8 common/tools/ats/bctest/bctestprebuild.pl
--- a/common/tools/ats/bctest/bctestprebuild.pl	Fri Jul 10 14:56:28 2009 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,8 +0,0 @@
-#!/usr/bin/perl
-
-use strict;
-use File::Copy;
-use File::Path;
-
-my $epoc=$ENV{'EPOCROOT'} . "epoc32/";
-copy("BC_PLAT.h",	$epoc . "include");