--- a/common/build.test.xml	Wed Jul 28 14:18:15 2010 +0100
+++ b/common/build.test.xml	Thu Jul 29 14:46:54 2010 +0100
@@ -4,6 +4,7 @@
     <target name="sf-test-smoketest" depends="sf-prebuild,sf-build-smoketestpkg,sf-send-testpkg,sf-zip-logs,sf-publish" />
     <target name="sf-test-bc-check" depends="sf-prebuild,sf-bc-check,sf-zip-logs,sf-publish" />
 
+	<!-- Calculate the location where the ATS Worker is installed, so that it can be launched -->
     <target name="sf-find-ATS-worker-root">
       <exec executable="perl" dir="${sf.common.config.dir}/tools/ats/devices" failonerror="false" outputproperty="sf.spec.test.workerroot">
         <arg value="-pe"/>
@@ -13,6 +14,7 @@
       <echo message="ATS Worker Root = ${sf.spec.test.workerroot}"/> 
     </target>
     
+	<!-- Map the location of the epoc32 to the fixed location used by the ATS Worker/Agent -->
     <target name ="sf-make-junction" depends="sf-find-ATS-worker-root">        
         <mkdir dir="${sf.spec.test.workerroot}/${sf.spec.test.epocroot}"/>
         <exec executable="perl" dir="${sf.common.config.dir}/tools/ats" failonerror="false" output="${build.log.dir}/ATS_${build.id}_make_junction.log">
@@ -104,6 +106,7 @@
 
             <if><istrue value="${sf.spec.bccheck.enable.dynamic}"/>
                 <then>
+					<!-- Submit each test drop in the ats3_testdrop_arrivals/bctest directory of the ATS server to the server for execution --> 
                     <for param="file">
 						<path>
 							<fileset dir="${sf.spec.test.package.location}/../bctest" includes="*.zip"/>
@@ -193,22 +196,28 @@
           <arg value="--publish=${publish.dir}\ats_reports"/>
           <arg value="--bld-drive=${build.drive}"/>
           <arg value="--test-target=${sf.spec.test.target}"/>
-          <arg value="--image-path=${sf.spec.test.imagepath}"/>
+          <arg value="--image-path=${sf.spec.test.image}"/>
           <arg value="--ats-version=${sf.spec.ats.version}"/>
         </exec>
 
         <!-- Now ready to send to ATS -->
-    </target>   
+    </target>  
+
+	<!-- Prepare hardware for execution -->
+	<target name="sf-prepare-hw">
+	    <if><equals arg1="${sf.spec.test.target}" arg2="syborg"/>
+        <then>
+            <delete file="${sf.spec.test.workerroot}/syborg.dtb" quiet="true"/>
+            <copy file="${sf.spec.baseline.location}/ROMs/syborg/syborg.dtb" todir="${sf.spec.test.workerroot}" failonerror="false"/>
+			
+		    <!-- Perhaps copy a NV Memory IMG from somewhere -->
+        </then>
+        </if>
+	</target>
 
 	<!-- Sending testdrop to ATS -->
 	
-    <target name="sf-send-testpkg" depends="sf-start-ats,sf-find-ATS-worker-root,sf-make-junction">
-        <if><equals arg1="${sf.spec.test.target}" arg2="syborg"/>
-          <then>
-            <delete file="${sf.spec.test.workerroot}/syborg.dtb" quiet="true"/>
-            <copy file="${build.drive}/epoc32/rom/syborg/syborg.dtb" todir="${sf.spec.test.workerroot}" failonerror="false"/>
-          </then>
-        </if>
+    <target name="sf-send-testpkg" depends="sf-prepare-hw,sf-start-ats,sf-find-ATS-worker-root,sf-make-junction">
         <mkdir dir="${sf.spec.test.workerroot}/${sf.spec.test.package.droppath}"/>
         <echo message="Sending test package ${sf.spec.test.package.name} to ${sf.spec.test.host.name} path ${sf.spec.test.host.droppath}"/>
         <exec executable="perl" dir="${sf.common.config.dir}/tools/ats" failonerror="false" output="${build.log.dir}/ATS_${build.id}_testdrop.log">