diff --git a/ch.psi.fda/src/main/java/ch/psi/fda/core/loops/TemplateOTF.java b/ch.psi.fda/src/main/java/ch/psi/fda/core/loops/TemplateOTF.java
index 6d64a4c..3d51297 100644
--- a/ch.psi.fda/src/main/java/ch/psi/fda/core/loops/TemplateOTF.java
+++ b/ch.psi.fda/src/main/java/ch/psi/fda/core/loops/TemplateOTF.java
@@ -58,7 +58,7 @@ public class TemplateOTF {
 	@CaChannel(type=Double.class, name="${PREFIX}:UEND")
 	private Channel<Double> end;
 	
-	@CaChannel(type=Double.class, name=":UEND.DRVL")
+	@CaChannel(type=Double.class, name="${PREFIX}:UEND.DRVL")
 	private Channel<Double> endMin;
 	
 	@CaChannel(type=Double.class, name="${PREFIX}:UEND.DRVH")
diff --git a/ch.psi.fda/src/test/java/ch/psi/fda/TestConfiguration.java b/ch.psi.fda/src/test/java/ch/psi/fda/TestConfiguration.java
index 0a24c4e..4dc3ccf 100644
--- a/ch.psi.fda/src/test/java/ch/psi/fda/TestConfiguration.java
+++ b/ch.psi.fda/src/test/java/ch/psi/fda/TestConfiguration.java
@@ -30,7 +30,7 @@ public class TestConfiguration {
 	private final String prefixScaler = "MTEST-HW3:JS";
 	private final String server = "yoke.psi.ch";
 	private final String share = "/usr/nfs";
-	private final String smbShare = "smb://:@"+server+"/nfs/"; // It is important to have the last slash / !
+	private final String smbShare = "smb://test:test@"+server+"/nfs/"; // It is important to have the last slash / !
 	
 	private final String motor1 = "MTEST-HW3:MOT1";
 	private final String analogIn1 = "MTEST-HW3-AI1:AI_01";
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 0d3b121..0bfee22 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
@@ -80,7 +80,7 @@ public class OTFLoopTest {
 		Map<String, String> macros = new HashMap<>();
 		macros.put("PREFIX", configuration.getOtfPrefix());
 		TemplateOTF template = new TemplateOTF();
-		cservice.createAnnotatedChannels(template);
+		cservice.createAnnotatedChannels(template, macros);
 		
 		
 		// ZigZag loop