diff --git a/script/tests/tests/Collimator Tests/power-supply/.config b/script/tests/tests/Collimator Tests/power-supply/.config
deleted file mode 100644
index db5d8ae..0000000
--- a/script/tests/tests/Collimator Tests/power-supply/.config	
+++ /dev/null
@@ -1,3 +0,0 @@
-name=power-supply
-description=Moves HV            
-filename=Calibrate.xml
diff --git a/script/tests/tests/Collimator Tests/power-supply/power-supply.py b/script/tests/tests/Collimator Tests/power-supply/power-supply.py
deleted file mode 100644
index f3fc9e3..0000000
--- a/script/tests/tests/Collimator Tests/power-supply/power-supply.py	
+++ /dev/null
@@ -1,75 +0,0 @@
-#TODO: Set the diplay names of positioners and detectors
-#ManualScan(writables, readables, start = None, end = None, steps = None, relative = False)
-
-#by default, failed
-ret = 'Test failed'
-status = False
-DEVICE = 'PO2DV-NCS-VHQ1'
-
-scan = ManualScan(['time'], ['SetVA', 'ActualVA', 'ActualIA'] , [0.0], [10.0], [10])
-scan.start()
-
-#Creating channels: dimension 1
-#Ramp rate
-SetRamp = Channel('PO2DV-NCS-VHQ1:Set-RampA', type = 'd')
-#SetRamp = Channel('pw84:ai', type = 'd')
-#LinearPositioner SetVA
-SetVA = Channel('PO2DV-NCS-VHQ1:Set-VA', type = 'd')
-#SetVA = Channel('pw84:ai', type = 'd')
-#Timestamp time
-#ScalarDetector ActualVA
-ActualVA = Channel('PO2DV-NCS-VHQ1:Actual-VA', type = 'd')
-#ActualVA = Channel('pw84:ai', type = 'd')
-#ScalarDetector ActualIA
-ActualIA = Channel('PO2DV-NCS-VHQ1:Actual-IA', type = 'd')
-#ActualIA = Channel('pw84:ai', type = 'd')
-
-#Init
-SetRamp.put(10.0, timeout=None)
-
-#set voltage to 0
-print 'Ramping down power supply to 0V'
-SetVA.put(0.0, timeout=None)
-
-#wait up to 2 minutes for voltage to be ~0
-for setpoint1 in frange(0.0, 120.0, 1.0, True):
-    detector2 = ActualVA.get()
-    if detector2 <= 1.0:
-        break
-    sleep(0.5)
-
-#Dimension 1
-#LinearPositioner SetVA
-print 'Ramping up power supply'
-for setpoint1 in frange(0.0, 10.0, 10.0, True): 
-    if setpoint1 > 50.0 or setpoint1 < 0.0:
-        break
-    SetVA.put(setpoint1, timeout=None) # TODO: Set appropriate timeout
-    readback1 = SetVA.get()
-    if abs(readback1 - setpoint1) > 0.5 : # TODO: Check accuracy
-        raise Exception('Actor SetVA could not be set to the value ' + str(setpoint1))
-        break
-    #scan quickly the output during some seconds
-    for setpoint2 in range(0, 20):
-        #Detector time
-        detector1 = float(java.lang.System.currentTimeMillis())
-        #Detector ActualVA
-        detector2 = ActualVA.get()
-        detector3 = ActualIA.get()
-        #scan.append ([setpoint1], [readback1], [detector1, detector2])
-        #append(setpoints, positions, values)
-        scan.append ([detector1], [detector1], [readback1, detector2, detector3]) 
-        sleep( 0.1 ) # Settling time        
-    ret = 'Test completed'
-    status = True
-
-#reset output to 0V
-SetVA.put(0.0, timeout=None)
-#Closing channels
-SetVA.close()
-ActualVA.close()
-ActualIA.close()
-
-
-
-scan.end()
diff --git a/script/tests/tests/PS Tests/power-supply/power-supply.py b/script/tests/tests/PS Tests/power-supply/power-supply.py
index f3fc9e3..70b32f1 100644
--- a/script/tests/tests/PS Tests/power-supply/power-supply.py	
+++ b/script/tests/tests/PS Tests/power-supply/power-supply.py	
@@ -4,24 +4,23 @@
 #by default, failed
 ret = 'Test failed'
 status = False
-DEVICE = 'PO2DV-NCS-VHQ1'
 
 scan = ManualScan(['time'], ['SetVA', 'ActualVA', 'ActualIA'] , [0.0], [10.0], [10])
 scan.start()
 
 #Creating channels: dimension 1
 #Ramp rate
-SetRamp = Channel('PO2DV-NCS-VHQ1:Set-RampA', type = 'd')
+SetRamp = Channel(DEVICE + ':Set-RampA', type = 'd')
 #SetRamp = Channel('pw84:ai', type = 'd')
 #LinearPositioner SetVA
-SetVA = Channel('PO2DV-NCS-VHQ1:Set-VA', type = 'd')
+SetVA = Channel(DEVICE + ':Set-VA', type = 'd')
 #SetVA = Channel('pw84:ai', type = 'd')
 #Timestamp time
 #ScalarDetector ActualVA
-ActualVA = Channel('PO2DV-NCS-VHQ1:Actual-VA', type = 'd')
+ActualVA = Channel(DEVICE + ':Actual-VA', type = 'd')
 #ActualVA = Channel('pw84:ai', type = 'd')
 #ScalarDetector ActualIA
-ActualIA = Channel('PO2DV-NCS-VHQ1:Actual-IA', type = 'd')
+ActualIA = Channel(DEVICE + ':Actual-IA', type = 'd')
 #ActualIA = Channel('pw84:ai', type = 'd')
 
 #Init
@@ -46,7 +45,7 @@ for setpoint1 in frange(0.0, 10.0, 10.0, True):
         break
     SetVA.put(setpoint1, timeout=None) # TODO: Set appropriate timeout
     readback1 = SetVA.get()
-    if abs(readback1 - setpoint1) > 0.5 : # TODO: Check accuracy
+    if abs(readback1 - setpoint1) > 0.9 : # TODO: Check accuracy
         raise Exception('Actor SetVA could not be set to the value ' + str(setpoint1))
         break
     #scan quickly the output during some seconds