diff --git a/script/tests/tests/Collimator Tests/Motor Test 2/Motor Test 2.py b/script/tests/tests/Collimator Tests/Motor Test 2/Motor Test 2.py
index 6e827c2..34a2432 100644
--- a/script/tests/tests/Collimator Tests/Motor Test 2/Motor Test 2.py	
+++ b/script/tests/tests/Collimator Tests/Motor Test 2/Motor Test 2.py	
@@ -15,46 +15,45 @@ scan = ManualScan(['idX'], ['idMotorStatus', 'idLogicalPosition', 'idDiameter',
 scan.start()
 
 #Creating channels: dimension 1
-try:
-	##################### beginning of A######################
-	#RegionPositioner idInkr
-	#idInkr = 0 #= Channel(DEVICE+':INKR:2', type = 'd')
-	idInkr = 0 #= Channel(DEVICE+':MOTOR.VAL', type = 'd')
-	#ScalarDetector idMotorStatus
-	#idMotorStatus = 0 #= Channel(DEVICE+':STA:1', type = 'd')
-	idMotorStatus = 0 #= Channel(DEVICE+':MOTOR.MSTA', type = 'd')
-	#ScalarDetector idLogicalPosition
-	#idLogicalPosition = 0 #= Channel(DEVICE+':IST:2', type = 'd')
-	idLogicalPosition = 0 #= Channel(DEVICE+':MOTOR.RVAL', type = 'd')
-	#ScalarDetector idDiameter
-	#idDiameter = 0 #= Channel(DEVICE+':DIAM:2', type = 'd')
-	idDiameter = 0 #= Channel(DEVICE+':ENCODERoff', type = 'd')
-	#ScalarDetector idMotorPosition
-	#idMotorPosition = 0 #= Channel(DEVICE+':IST1:2', type = 'd')
-	idMotorPosition = 0 #= Channel(DEVICE+':MOTOR.RBV', type = 'd')
-	#ScalarDetector idPotiRaw
-	#idPotiRaw = 0 #= Channel(DEVICE+':POSA:1', type = 'd')
-	idPotiRaw = 0 #= Channel(DEVICE+':ENCODERraw', type = 'd')
-	#ScalarDetector idPotiProc
-	#idPotiProc = 0 #= Channel(DEVICE+':POSA:2', type = 'd')
-	idPotiProc = 0 #= Channel(DEVICE+':ENCODER', type = 'd')
-	#ScalarDetector idBtvsRaw
-	#idBtvsRaw = 0 #= Channel(DEVICE+':IST3:1', type = 'd')
-	idBtvsRaw = 0 #= Channel(DEVICE+':MOTOR.LLS', type = 'd')
-	#ScalarDetector idBtvsProc
-	#idBtvsProc = 0 #= Channel(DEVICE+':IST3:2', type = 'd')
-	idBtvsProc = 0 #= Channel(DEVICE+':MOTOR.HLS', type = 'd')
-	#ScalarDetector idEndSwitchL
-	#idBtvsRaw = 0 #= Channel(DEVICE+':IST3:1', type = 'd')
-	idEndSwitchL = 0 #= Channel(DEVICE+':MOTOR.LLS', type = 'd')
-	#ScalarDetector idEndSwitchH
-	#idBtvsProc = 0 #= Channel(DEVICE+':IST3:2', type = 'd')
-	idEndSwitchH = 0 #= Channel(DEVICE+':MOTOR.HLS', type = 'd')
-	#high position limit
-	idLimitH = 0 #= Channel(DEVICE+':MOTOR.HLM', type = 'd')
-	#low position limit
-	idLimitL = 0 #= Channel(DEVICE+':MOTOR.LLM', type = 'd')
-	######################## end of A ####################
+##################### beginning of A######################
+#RegionPositioner idInkr
+#idInkr = 0 #= Channel(DEVICE+':INKR:2', type = 'd')
+idInkr = 0 #= Channel(DEVICE+':MOTOR.VAL', type = 'd')
+#ScalarDetector idMotorStatus
+#idMotorStatus = 0 #= Channel(DEVICE+':STA:1', type = 'd')
+idMotorStatus = 0 #= Channel(DEVICE+':MOTOR.MSTA', type = 'd')
+#ScalarDetector idLogicalPosition
+#idLogicalPosition = 0 #= Channel(DEVICE+':IST:2', type = 'd')
+idLogicalPosition = 0 #= Channel(DEVICE+':MOTOR.RVAL', type = 'd')
+#ScalarDetector idDiameter
+#idDiameter = 0 #= Channel(DEVICE+':DIAM:2', type = 'd')
+idDiameter = 0 #= Channel(DEVICE+':ENCODERoff', type = 'd')
+#ScalarDetector idMotorPosition
+#idMotorPosition = 0 #= Channel(DEVICE+':IST1:2', type = 'd')
+idMotorPosition = 0 #= Channel(DEVICE+':MOTOR.RBV', type = 'd')
+#ScalarDetector idPotiRaw
+#idPotiRaw = 0 #= Channel(DEVICE+':POSA:1', type = 'd')
+idPotiRaw = 0 #= Channel(DEVICE+':ENCODERraw', type = 'd')
+#ScalarDetector idPotiProc
+#idPotiProc = 0 #= Channel(DEVICE+':POSA:2', type = 'd')
+idPotiProc = 0 #= Channel(DEVICE+':ENCODER', type = 'd')
+#ScalarDetector idBtvsRaw
+#idBtvsRaw = 0 #= Channel(DEVICE+':IST3:1', type = 'd')
+idBtvsRaw = 0 #= Channel(DEVICE+':MOTOR.LLS', type = 'd')
+#ScalarDetector idBtvsProc
+#idBtvsProc = 0 #= Channel(DEVICE+':IST3:2', type = 'd')
+idBtvsProc = 0 #= Channel(DEVICE+':MOTOR.HLS', type = 'd')
+#ScalarDetector idEndSwitchL
+#idBtvsRaw = 0 #= Channel(DEVICE+':IST3:1', type = 'd')
+idEndSwitchL = 0 #= Channel(DEVICE+':MOTOR.LLS', type = 'd')
+#ScalarDetector idEndSwitchH
+#idBtvsProc = 0 #= Channel(DEVICE+':IST3:2', type = 'd')
+idEndSwitchH = 0 #= Channel(DEVICE+':MOTOR.HLS', type = 'd')
+#high position limit
+idLimitH = 0 #= Channel(DEVICE+':MOTOR.HLM', type = 'd')
+#low position limit
+idLimitL = 0 #= Channel(DEVICE+':MOTOR.LLM', type = 'd')
+######################## end of A ####################
 #Dimension 1
 direction = 1.0
 middle = 40.0