diff --git a/script/tests/devices/DMAF1/.config b/script/tests/devices/DMAF1/.config
index 27ff671..c6cdc32 100644
--- a/script/tests/devices/DMAF1/.config
+++ b/script/tests/devices/DMAF1/.config
@@ -1,3 +1,3 @@
-name=PROF02:DMAF1
-description=Collimators
-tests=Collimator Tests pro
+name=PROF02:DMAF1
+description=Collimators
+tests=Collimator Tests pro
diff --git a/script/tests/devices/PO2DV-NCS-LS/.config b/script/tests/devices/PO2DV-NCS-LS/.config
index f8e665f..24fb82e 100644
--- a/script/tests/devices/PO2DV-NCS-LS/.config
+++ b/script/tests/devices/PO2DV-NCS-LS/.config
@@ -1,4 +1,4 @@
-name=PO2DV-NCS-LS
-description=Optis 2 Linear Slide in test office setup
-#tests=Collimator Tests
+name=PO2DV-NCS-LS
+description=Optis 2 Linear Slide in test office setup
+#tests=Collimator Tests
 tests=Linear Slide Tests
\ No newline at end of file
diff --git a/script/tests/devices/PO2DV-NCS-VHQ1/.config b/script/tests/devices/PO2DV-NCS-VHQ1/.config
index 0138ca6..efd82e9 100644
--- a/script/tests/devices/PO2DV-NCS-VHQ1/.config
+++ b/script/tests/devices/PO2DV-NCS-VHQ1/.config
@@ -1,3 +1,3 @@
-name=PO2DV-NCS-VHQ1
-description=Optis 2 Linear Slide in test office setup
-tests=PS Tests
+name=PO2DV-NCS-VHQ1
+description=Optis 2 Linear Slide in test office setup
+tests=PS Tests
diff --git a/script/tests/devices/Production/DMAF1/.config b/script/tests/devices/Production/DMAF1/.config
index 27ff671..c6cdc32 100644
--- a/script/tests/devices/Production/DMAF1/.config
+++ b/script/tests/devices/Production/DMAF1/.config
@@ -1,3 +1,3 @@
-name=PROF02:DMAF1
-description=Collimators
-tests=Collimator Tests pro
+name=PROF02:DMAF1
+description=Collimators
+tests=Collimator Tests pro
diff --git a/script/tests/devices/Production/PO2DV-NCS-VHQ1/.config b/script/tests/devices/Production/PO2DV-NCS-VHQ1/.config
index 0138ca6..efd82e9 100644
--- a/script/tests/devices/Production/PO2DV-NCS-VHQ1/.config
+++ b/script/tests/devices/Production/PO2DV-NCS-VHQ1/.config
@@ -1,3 +1,3 @@
-name=PO2DV-NCS-VHQ1
-description=Optis 2 Linear Slide in test office setup
-tests=PS Tests
+name=PO2DV-NCS-VHQ1
+description=Optis 2 Linear Slide in test office setup
+tests=PS Tests
diff --git a/script/tests/devices/Production/PO2TC-NCS-FIXL/.config b/script/tests/devices/Production/PO2TC-NCS-FIXL/.config
index 78146dc..31547bd 100644
--- a/script/tests/devices/Production/PO2TC-NCS-FIXL/.config
+++ b/script/tests/devices/Production/PO2TC-NCS-FIXL/.config
@@ -1,3 +1,3 @@
-name=PO2TC-NCS-FIXL
-description=FIXL: Fixation Light       
-tests=Display Tests
+name=PO2TC-NCS-FIXL
+description=FIXL: Fixation Light       
+tests=Display Tests
diff --git a/script/tests/devices/Production/PO2TC-NCS-MWD/.config b/script/tests/devices/Production/PO2TC-NCS-MWD/.config
index 24ba199..d0d828d 100644
--- a/script/tests/devices/Production/PO2TC-NCS-MWD/.config
+++ b/script/tests/devices/Production/PO2TC-NCS-MWD/.config
@@ -1,3 +1,3 @@
-name=PO2TC-NCS-MWD
-description=MWD: Modulator Wheel Display
-tests=Display Tests
+name=PO2TC-NCS-MWD
+description=MWD: Modulator Wheel Display
+tests=Display Tests
diff --git a/script/tests/devices/Production/PO2TC-NCS-RS/.config b/script/tests/devices/Production/PO2TC-NCS-RS/.config
index 192671b..44d7c4d 100644
--- a/script/tests/devices/Production/PO2TC-NCS-RS/.config
+++ b/script/tests/devices/Production/PO2TC-NCS-RS/.config
@@ -1,3 +1,3 @@
-name=PO2TC-NCS-RS
-description=RS: Range Shifter        
-tests=Range Shifter Tests
+name=PO2TC-NCS-RS
+description=RS: Range Shifter        
+tests=Range Shifter Tests
diff --git a/script/tests/devices/Production/PO2TC-NCS-SC21/.config b/script/tests/devices/Production/PO2TC-NCS-SC21/.config
index 4421815..74727bb 100644
--- a/script/tests/devices/Production/PO2TC-NCS-SC21/.config
+++ b/script/tests/devices/Production/PO2TC-NCS-SC21/.config
@@ -1,3 +1,3 @@
-name=PO2TC-NCS-SC21
-description=SC21: Scatter Foil 2.1
-tests=Linear Slide Tests
+name=PO2TC-NCS-SC21
+description=SC21: Scatter Foil 2.1
+tests=Linear Slide Tests
diff --git a/script/tests/devices/Production/PO2TC-NCS-SC22/.config b/script/tests/devices/Production/PO2TC-NCS-SC22/.config
index 77904ce..b904587 100644
--- a/script/tests/devices/Production/PO2TC-NCS-SC22/.config
+++ b/script/tests/devices/Production/PO2TC-NCS-SC22/.config
@@ -1,3 +1,3 @@
-name=PO2TC-NCS-SC22
-description=SC21: Scatter Foil 2.2
-tests=Linear Slide Tests
+name=PO2TC-NCS-SC22
+description=SC21: Scatter Foil 2.2
+tests=Linear Slide Tests
diff --git a/script/tests/devices/Production/PO2TC-NCS-SC23/.config b/script/tests/devices/Production/PO2TC-NCS-SC23/.config
index ba7e6a0..c1a0b5c 100644
--- a/script/tests/devices/Production/PO2TC-NCS-SC23/.config
+++ b/script/tests/devices/Production/PO2TC-NCS-SC23/.config
@@ -1,3 +1,3 @@
-name=PO2TC-NCS-SC23
-description=SC23: Scatter Foil 2.3
-tests=Linear Slide Tests
+name=PO2TC-NCS-SC23
+description=SC23: Scatter Foil 2.3
+tests=Linear Slide Tests
diff --git a/script/tests/tests/Display Tests/.config b/script/tests/tests/Display Tests/.config
index 46cc90a..fa926ac 100644
--- a/script/tests/tests/Display Tests/.config	
+++ b/script/tests/tests/Display Tests/.config	
@@ -1,2 +1,2 @@
-name=Modulator Wheel Display Tests
-description=Tests on the OPTIS2 Modulator Wheel Display
+name=Modulator Wheel Display Tests
+description=Tests on the OPTIS2 Modulator Wheel Display
diff --git a/script/tests/tests/Display Tests/Display Test/Display Test.xml b/script/tests/tests/Display Tests/Display Test/Display Test.xml
index 4b87e8a..69b8eb8 100644
--- a/script/tests/tests/Display Tests/Display Test/Display Test.xml	
+++ b/script/tests/tests/Display Tests/Display Test/Display Test.xml	
@@ -1,32 +1,32 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<configuration xmlns="http://www.psi.ch/~ebner/models/scan/1.0" numberOfExecution="1" failOnSensorError="true">
-    <data fileName="Display Test.fda"/>
-    <scan>
-    
-        <!-- Pause -->
-        <preAction xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="ShellAction" command="/bin/sleep 2" exitValue="0"/>
-
-        <dimension>
-            <!-- Set up a Pseudo Positioner that samples every 50ms for 1500  samples -->
-           <positioner xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="PseudoPositioner" settlingTime="0.01" id="id000000">
-                <counts>1000</counts>
-            </positioner>
-            
-            <positioner xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="LinearPositioner" name="PO2TC-NCS-{DEVICE}:DEMAND" settlingTime="0.8" id="id000001">
-                <start>1</start>
-                <end>143</end>
-                <stepSize>1</stepSize>
-            </positioner>
-        
-        </dimension>
-        <dimension>
-            <!-- Set up a Pseudo Positioner that samples every 50ms for 1500  samples -->
-           <positioner xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="PseudoPositioner" settlingTime="0.01" id="id000002">
-                <counts>1</counts>
-            </positioner>
-
-        </dimension>
-        
-    </scan>
-    <visualization xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="LinePlot" x="id000000" y="id000001" title="Demand Value"/> 
-</configuration>
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<configuration xmlns="http://www.psi.ch/~ebner/models/scan/1.0" numberOfExecution="1" failOnSensorError="true">
+    <data fileName="Display Test.fda"/>
+    <scan>
+    
+        <!-- Pause -->
+        <preAction xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="ShellAction" command="/bin/sleep 2" exitValue="0"/>
+
+        <dimension>
+            <!-- Set up a Pseudo Positioner that samples every 50ms for 1500  samples -->
+           <positioner xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="PseudoPositioner" settlingTime="0.01" id="id000000">
+                <counts>1000</counts>
+            </positioner>
+            
+            <positioner xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="LinearPositioner" name="PO2TC-NCS-{DEVICE}:DEMAND" settlingTime="0.8" id="id000001">
+                <start>1</start>
+                <end>143</end>
+                <stepSize>1</stepSize>
+            </positioner>
+        
+        </dimension>
+        <dimension>
+            <!-- Set up a Pseudo Positioner that samples every 50ms for 1500  samples -->
+           <positioner xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="PseudoPositioner" settlingTime="0.01" id="id000002">
+                <counts>1</counts>
+            </positioner>
+
+        </dimension>
+        
+    </scan>
+    <visualization xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="LinePlot" x="id000000" y="id000001" title="Demand Value"/> 
+</configuration>