diff --git a/ch.psi.fda/src/test/java/ch/psi/fda/core/loops/OTFLoopTest.java b/ch.psi.fda/src/test/java/ch/psi/fda/core/loops/OTFLoopTest.java
index 50d92a8..eb0fe9c 100644
--- a/ch.psi.fda/src/test/java/ch/psi/fda/core/loops/OTFLoopTest.java
+++ b/ch.psi.fda/src/test/java/ch/psi/fda/core/loops/OTFLoopTest.java
@@ -84,6 +84,7 @@ public class OTFLoopTest {
 	
 	private static final String motor = "MTEST-HW3:MOT1";
 	private static final String channelPrefix = "MTEST-HW3-OTFX";
+	private static final String channelAnalogIn = "MTEST-HW3-AI1:AI_01";
 	private static final String server = "slsyoke1.psi.ch";
 	private static final String share = "/usr/local/nfsshare";
 	private static final String smbShare = "smb://:@slsyoke1.psi.ch/otftemp/";
@@ -106,7 +107,7 @@ public class OTFLoopTest {
 		OTFScalerChannelSensor s2 = new OTFScalerChannelSensor("id1", 0);
 		OTFScalerChannelSensor s3 = new OTFScalerChannelSensor("id2", 1);
 		MillisecondTimestampSensor s4 = new MillisecondTimestampSensor("id3");
-		OTFNamedChannelSensor s5 = new OTFNamedChannelSensor("id4", "MTEST-HW3-AI1:AI_01");
+		OTFNamedChannelSensor s5 = new OTFNamedChannelSensor("id4", channelAnalogIn);
 		
 		
 		// ZigZag loop
@@ -136,14 +137,6 @@ public class OTFLoopTest {
 	public void tearDown() throws Exception {
 	}
 
-	/**
-	 * Test method for {@link ch.psi.fda.core.loops.OTFLoop#OTFLoop(java.lang.String, java.lang.String, java.lang.String, java.lang.String, boolean)}.
-	 */
-	@Test
-	public void testOTFLoop() {
-		fail("Not yet implemented");
-	}
-
 	/**
 	 * Test method for {@link ch.psi.fda.core.loops.OTFLoop#execute()}.
 	 * Test ordinary 1D OTF scan
@@ -249,7 +242,5 @@ public class OTFLoopTest {
 			fail("Ids of the component metadata elements inside the data message metadata is not correct");
 		}
 	}
-	
-	// TODO Need to test abort at initialization/stop time
 
 }
diff --git a/ch.psi.fda/src/test/java/ch/psi/fda/core/loops/cr/CrlogicLoopTest.java b/ch.psi.fda/src/test/java/ch/psi/fda/core/loops/cr/CrlogicLoopTest.java
deleted file mode 100644
index 631cc1f..0000000
--- a/ch.psi.fda/src/test/java/ch/psi/fda/core/loops/cr/CrlogicLoopTest.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/**
- * 
- * Copyright 2010 Paul Scherrer Institute. All rights reserved.
- * 
- * This code is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- * 
- * This code is distributed in the hope that it will be useful,
- * but without any warranty; without even the implied warranty of
- * merchantability or fitness for a particular purpose. See the
- * GNU Lesser General Public License for more details.
- * 
- * You should have received a copy of the GNU Lesser General Public License
- * along with this code. If not, see <http://www.gnu.org/licenses/>.
- * 
- */
-
-package ch.psi.fda.core.loops.cr;
-
-
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-
-/**
- * @author ebner
- *
- */
-public class CrlogicLoopTest {
-
-	/**
-	 * @throws java.lang.Exception
-	 */
-	@Before
-	public void setUp() throws Exception {
-	}
-
-	/**
-	 * @throws java.lang.Exception
-	 */
-	@After
-	public void tearDown() throws Exception {
-	}
-	
-	@Test
-	public void testExecute(){
-		
-	}
-
-}
diff --git a/ch.psi.fda/src/test/resources/home/scans/templates/scan1d-waitError.xml b/ch.psi.fda/src/test/resources/home/scans/templates/scan1d-waitError.xml
index e1244e2..306683a 100644
--- a/ch.psi.fda/src/test/resources/home/scans/templates/scan1d-waitError.xml
+++ b/ch.psi.fda/src/test/resources/home/scans/templates/scan1d-waitError.xml
@@ -2,13 +2,14 @@
 <configuration xmlns="http://www.psi.ch/~ebner/models/scan/1.0" numberOfExecution="1" failOnSensorError="true">
     <data format="txt" fileName="scan1d"/>
     <scan>
+    	<preAction xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="ChannelAction" channel="MTEST-PC-FDA:BO" value="1" operation="put" type="Integer"/>
         <dimension zigzag="true">
             <positioner xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="LinearPositioner" name="MTEST-HW3:MOT1" settlingTime="0.1" doneValue="1" doneDelay="0.0" id="id0">
                 <start>0.0</start>
                 <end>8.0</end>
                 <stepSize>0.5</stepSize>
             </positioner>
-            <action xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="ChannelAction" channel="MTEST-PC-JCAE:BO" value="0" operation="wait" type="Integer"/>
+            <action xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="ChannelAction" channel="MTEST-PC-FDA:BO" value="0" operation="wait" type="Integer"/>
             <detector xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="ScalarDetector" name="MTEST-HW3:MOT1.RRBV" id="idD0"/>
             <detector xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="ScalarDetector" name="MTEST-HW3:MOT1.RBV" id="idD1"/>
             <detector xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="Timestamp" id="timestamp"/>
diff --git a/ch.psi.fda/src/test/resources/jcae.properties b/ch.psi.fda/src/test/resources/jcae.properties
index d6de35c..6dbdcb1 100644
--- a/ch.psi.fda/src/test/resources/jcae.properties
+++ b/ch.psi.fda/src/test/resources/jcae.properties
@@ -1,4 +1,4 @@
 # Test properties file
-ch.psi.jcae.ContextFactory.addressList=129.129.130.255 129.129.130.37 129.129.145.26 129.129.130.88
+ch.psi.jcae.ContextFactory.addressList=129.129.130.255 129.129.130.37 129.129.145.26 129.129.130.88 129.129.130.142
 
 ch.psi.jcae.ChannelBeanFactory.retries=4
\ No newline at end of file