diff --git a/config/standard.properties b/config/standard.properties
index 9ce7a45..a18769e 100644
--- a/config/standard.properties
+++ b/config/standard.properties
@@ -1,15 +1,15 @@
-#Thu Sep 03 15:31:44 CEST 2015
-denyConfig=false
-denyConsole=false
-denyDeviceConfig=false
-denyDeviceWrite=false
-denyEdit=false
-denyPrefs=false
-denyRun=false
-denyVersioning=false
-hideConsole=true
-hideData=false
-hideDevices=true
-hideEditor=true
-hideScripts=true
-hideToolbar=true
+#Fri Oct 13 14:46:51 CEST 2017
+denyConfig=false
+denyConsole=false
+denyDeviceConfig=true
+denyDeviceWrite=true
+denyEdit=false
+denyPrefs=false
+denyRun=true
+denyVersioning=true
+hideConsole=true
+hideData=false
+hideDevices=true
+hideEditor=true
+hideScripts=true
+hideToolbar=true
diff --git a/plugins/NewTest.form b/plugins/NewTest.form
index af30795..d1d9d1f 100644
--- a/plugins/NewTest.form
+++ b/plugins/NewTest.form
@@ -234,6 +234,7 @@
             <Property name="lineWrap" type="boolean" value="true"/>
             <Property name="rows" type="int" value="5"/>
             <Property name="toolTipText" type="java.lang.String" value="Add here a detailed description"/>
+            <Property name="wrapStyleWord" type="boolean" value="true"/>
           </Properties>
         </Component>
       </SubComponents>
diff --git a/plugins/NewTest.java b/plugins/NewTest.java
index 9072b49..ef95bdb 100644
--- a/plugins/NewTest.java
+++ b/plugins/NewTest.java
@@ -175,6 +175,7 @@ public class NewTest extends javax.swing.JPanel {
         txtTestDescription.setLineWrap(true);
         txtTestDescription.setRows(5);
         txtTestDescription.setToolTipText("Add here a detailed description");
+        txtTestDescription.setWrapStyleWord(true);
         jScrollPane3.setViewportView(txtTestDescription);
 
         txtContactName.setFont(new java.awt.Font("Tahoma", 0, 14)); // NOI18N
diff --git a/plugins/TestingList.form b/plugins/TestingList.form
index 1e7ce3c..d5e71d7 100644
--- a/plugins/TestingList.form
+++ b/plugins/TestingList.form
@@ -263,7 +263,7 @@
               <SubComponents>
                 <Component class="javax.swing.JButton" name="jButtonOptions">
                   <Properties>
-                    <Property name="toolTipText" type="java.lang.String" value="Optional actions"/>
+                    <Property name="toolTipText" type="java.lang.String" value="More actions"/>
                     <Property name="maximumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
                       <Dimension value="[60, 40]"/>
                     </Property>
@@ -285,7 +285,7 @@
                 </Component>
                 <Component class="javax.swing.JButton" name="jButtonSave">
                   <Properties>
-                    <Property name="toolTipText" type="java.lang.String" value="Save current configuration"/>
+                    <Property name="toolTipText" type="java.lang.String" value="Save current list of tests"/>
                     <Property name="maximumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
                       <Dimension value="[60, 40]"/>
                     </Property>
@@ -307,7 +307,7 @@
                 </Component>
                 <Component class="javax.swing.JButton" name="jButtonOpen">
                   <Properties>
-                    <Property name="toolTipText" type="java.lang.String" value="Open configuration"/>
+                    <Property name="toolTipText" type="java.lang.String" value="Open a list of tests"/>
                     <Property name="minimumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
                       <Dimension value="[0, 9]"/>
                     </Property>
diff --git a/plugins/TestingList.java b/plugins/TestingList.java
index 2ea7fce..c1d23e5 100644
--- a/plugins/TestingList.java
+++ b/plugins/TestingList.java
@@ -815,7 +815,6 @@ public class TestingList extends Panel {
         jPopupMenuTable.add(jMenuItemShowDetails);
         jPopupMenuTable.add(jSeparator5);
 
-        jMenuItemRunSingleTest.setIcon(new javax.swing.ImageIcon(getClass().getResource("/icons/play-circled-16-000000.png"))); // NOI18N
         jMenuItemRunSingleTest.setText("Run this test now");
         jMenuItemRunSingleTest.addActionListener(new java.awt.event.ActionListener() {
             public void actionPerformed(java.awt.event.ActionEvent evt) {
@@ -908,8 +907,7 @@ public class TestingList extends Panel {
         jPanelButtons.setPreferredSize(new java.awt.Dimension(100, 80));
         jPanelButtons.setLayout(new java.awt.BorderLayout());
 
-        jButtonOptions.setIcon(new javax.swing.ImageIcon(getClass().getResource("/icons/listing-option-32px.png"))); // NOI18N
-        jButtonOptions.setToolTipText("Optional actions");
+        jButtonOptions.setToolTipText("More actions");
         jButtonOptions.setMaximumSize(new java.awt.Dimension(60, 40));
         jButtonOptions.setMinimumSize(new java.awt.Dimension(0, 40));
         jButtonOptions.setPreferredSize(new java.awt.Dimension(50, 40));
@@ -920,8 +918,7 @@ public class TestingList extends Panel {
         });
         jPanelButtons.add(jButtonOptions, java.awt.BorderLayout.LINE_START);
 
-        jButtonSave.setIcon(new javax.swing.ImageIcon(getClass().getResource("/icons/android-save-24-000000.png"))); // NOI18N
-        jButtonSave.setToolTipText("Save current configuration");
+        jButtonSave.setToolTipText("Save current list of tests");
         jButtonSave.setMaximumSize(new java.awt.Dimension(60, 40));
         jButtonSave.setMinimumSize(new java.awt.Dimension(0, 40));
         jButtonSave.setPreferredSize(new java.awt.Dimension(50, 40));
@@ -932,8 +929,7 @@ public class TestingList extends Panel {
         });
         jPanelButtons.add(jButtonSave, java.awt.BorderLayout.LINE_END);
 
-        jButtonOpen.setIcon(new javax.swing.ImageIcon(getClass().getResource("/icons/folder-open-24-000000.png"))); // NOI18N
-        jButtonOpen.setToolTipText("Open configuration");
+        jButtonOpen.setToolTipText("Open a list of tests");
         jButtonOpen.setMinimumSize(new java.awt.Dimension(0, 9));
         jButtonOpen.setPreferredSize(new java.awt.Dimension(33, 50));
         jButtonOpen.addActionListener(new java.awt.event.ActionListener() {
@@ -945,7 +941,6 @@ public class TestingList extends Panel {
 
         jPanelTopCommands.add(jPanelButtons, java.awt.BorderLayout.EAST);
 
-        jButtonRun.setIcon(new javax.swing.ImageIcon(getClass().getResource("/icons/play-circled-64-000000.png"))); // NOI18N
         jButtonRun.setToolTipText("Run enabled tests");
         jButtonRun.setMaximumSize(new java.awt.Dimension(330000, 39));
         jButtonRun.setMinimumSize(new java.awt.Dimension(90, 90));
@@ -969,7 +964,6 @@ public class TestingList extends Panel {
         });
         jPanelSelection.add(jCheckBoxEnableDisable, java.awt.BorderLayout.WEST);
 
-        jButtonMoveDown.setIcon(new javax.swing.ImageIcon(getClass().getResource("/icons/chevron-down-16-000000.png"))); // NOI18N
         jButtonMoveDown.setToolTipText("Move the selected tests down");
         jButtonMoveDown.setMaximumSize(new java.awt.Dimension(25, 25));
         jButtonMoveDown.setMinimumSize(new java.awt.Dimension(25, 25));
@@ -981,7 +975,6 @@ public class TestingList extends Panel {
         });
         jPanelSelection.add(jButtonMoveDown, java.awt.BorderLayout.SOUTH);
 
-        jButtonMoveUp.setIcon(new javax.swing.ImageIcon(getClass().getResource("/icons/chevron-up-16-000000.png"))); // NOI18N
         jButtonMoveUp.setToolTipText("Move the selected tests up");
         jButtonMoveUp.setMaximumSize(new java.awt.Dimension(25, 25));
         jButtonMoveUp.setMinimumSize(new java.awt.Dimension(25, 25));
@@ -1047,12 +1040,10 @@ public class TestingList extends Panel {
         jPanelCustomHeader.setLayout(new java.awt.BorderLayout());
 
         jButtonX.setFont(new java.awt.Font("Tahoma", 0, 8)); // NOI18N
-        jButtonX.setIcon(new javax.swing.ImageIcon(getClass().getResource("/icons/x-darker-8px.png"))); // NOI18N
         jButtonX.setToolTipText("Close this custom panel");
         jButtonX.setMaximumSize(new java.awt.Dimension(12, 12));
         jButtonX.setMinimumSize(new java.awt.Dimension(12, 12));
         jButtonX.setPreferredSize(new java.awt.Dimension(12, 12));
-        jButtonX.setRolloverIcon(new javax.swing.ImageIcon(getClass().getResource("/icons/x-darker-8px.png"))); // NOI18N
         jButtonX.addActionListener(new java.awt.event.ActionListener() {
             public void actionPerformed(java.awt.event.ActionEvent evt) {
                 jButtonXActionPerformed(evt);
@@ -2022,7 +2013,7 @@ public class TestingList extends Panel {
             sPythonParams = sPythonParams.replace(", ", ",");
             sPythonParams = sPythonParams.replace(" ,", ",");
             sPythonParams = sPythonParams.replace("{{", "#@");
-            sPythonParams = sPythonParams.replace("}}", "@#");
+            sPythonParams = sPythonParams.replace("\"}}", "@#");
             sPythonParams = sPythonParams.replace("\"},", "@%#");
             sPythonParams = sPythonParams.replace(",{", "#%@");
             sPythonParams = sPythonParams.replace("={", "^%&");
diff --git a/plugins/TestingListDetails.form b/plugins/TestingListDetails.form
index 1242246..07a84b9 100644
--- a/plugins/TestingListDetails.form
+++ b/plugins/TestingListDetails.form
@@ -379,6 +379,7 @@
             </Property>
             <Property name="lineWrap" type="boolean" value="true"/>
             <Property name="rows" type="int" value="5"/>
+            <Property name="wrapStyleWord" type="boolean" value="true"/>
           </Properties>
         </Component>
       </SubComponents>
diff --git a/plugins/TestingListDetails.java b/plugins/TestingListDetails.java
index f440581..adbc5a1 100644
--- a/plugins/TestingListDetails.java
+++ b/plugins/TestingListDetails.java
@@ -183,6 +183,7 @@ public class TestingListDetails extends javax.swing.JPanel {
         txtTestDescription.setFont(new java.awt.Font("Tahoma", 0, 14)); // NOI18N
         txtTestDescription.setLineWrap(true);
         txtTestDescription.setRows(5);
+        txtTestDescription.setWrapStyleWord(true);
         jScrollPaneTestDesc.setViewportView(txtTestDescription);
 
         jEditorPaneHelp.setContentType("text/html"); // NOI18N
diff --git a/script/tests/config/rps-test b/script/tests/config/rps-test
index c72fdbe..fbf68ec 100644
Binary files a/script/tests/config/rps-test and b/script/tests/config/rps-test differ
diff --git a/script/tests/devices/bis-BMA1/.config b/script/tests/devices/bis-BMA1/.config
index 3548ada..415aa38 100644
--- a/script/tests/devices/bis-BMA1/.config
+++ b/script/tests/devices/bis-BMA1/.config
@@ -1,5 +1,5 @@
 #Fri Oct 13 11:25:53 CEST 2017
 name=bis-BMA1
 tests=RPS Tests Betriebsmode
-parameters=channel&"PXXF\:VAL\:2"&"ssp";ds&"2,IQCOM,$BMA1,1,DIA"&"vla";
+parameters=channel&"PXXF\:VAL\:2"&"ssp";mode&"2,IQCOM,$BMA1,1,DIA"&"vla";
 description=rps section till BMA1
diff --git a/script/tests/tests.properties b/script/tests/tests.properties
index 8a1ea6a..3b6abdc 100644
--- a/script/tests/tests.properties
+++ b/script/tests/tests.properties
@@ -1,5 +1,5 @@
 #TestingList for pshell: configuration properties
-#Fri Oct 13 14:23:21 CEST 2017
+#Fri Oct 13 15:10:10 CEST 2017
 customPanel=
 showEnabledTestsOnly=true
 listFilter=rps-test
diff --git a/script/tests/tests/RPS Tests Betriebsmode/Betriebsmode/.config b/script/tests/tests/RPS Tests Betriebsmode/Betriebsmode/.config
index eba4108..24f6de8 100644
--- a/script/tests/tests/RPS Tests Betriebsmode/Betriebsmode/.config	
+++ b/script/tests/tests/RPS Tests Betriebsmode/Betriebsmode/.config	
@@ -1,4 +1,4 @@
 #Fri Oct 13 11:12:22 CEST 2017
 name=Betriebsmode
-parameters=mode&"2,IQCOM,$BMA1,1,DIA"&"[string] Betriebs mode";expectedVal14&"0x0000"&"[hex] Expected value for channels 1-4";expectedVal58&"0x0000"&"[hex] Expected value for channels 5-8";setGetDelay&"1000"&"[ms] delay between set and get";
-description=betriebsmode
+parameters=mode&"2,IQCOM,$BMA1,1,DIA"&"[string] Betriebsmode";expectedVal14&"0x0000"&"[hex] Expected value for channels 1-4";expectedVal58&"0x0000"&"[hex] Expected value for channels 5-8";setGetDelay&"1000"&"[ms] delay between set and get";
+description=Verify that the different RPS Modes give correct Outputs on the RPS modules
diff --git a/script/tests/tests/RPS Tests Betriebsmode/Betriebsmode/Betriebsmode.py b/script/tests/tests/RPS Tests Betriebsmode/Betriebsmode/Betriebsmode.py
index 95d54d7..a653072 100644
--- a/script/tests/tests/RPS Tests Betriebsmode/Betriebsmode/Betriebsmode.py	
+++ b/script/tests/tests/RPS Tests Betriebsmode/Betriebsmode/Betriebsmode.py	
@@ -65,8 +65,9 @@ def startTest(testName, DEVICE, params):
         ########## Example (can be removed) ######
 
         # print the list of parameters passed. If any error, stop and send feedback.
-        test.log("Example - Test name:   " + test.getName())
-        test.log("Example - Device name: " + test.getDeviceName() )
+        test.log("")
+        test.log("========================================================================")
+        test.log("Test " + test.getName() + " for " + test.getDeviceName() )
         try:
             test.log("Running test with the following parameters:")
             test.printParams()
diff --git a/script/tests/tests/RPS Tests Betriebsmode/Betriebsmode/help.html b/script/tests/tests/RPS Tests Betriebsmode/Betriebsmode/help.html
index 80208a8..65fe035 100644
--- a/script/tests/tests/RPS Tests Betriebsmode/Betriebsmode/help.html	
+++ b/script/tests/tests/RPS Tests Betriebsmode/Betriebsmode/help.html	
@@ -2,7 +2,7 @@
 <!-- Copyright (c) 2015 Paul Scherrer Institute. All rights reserved. -->    
 <body>
 <h2>Description</h2>
-betriebsmode
+Verify that the different RPS Modes give correct Outputs on the RPS modules
 <h2>Parameters</h2>
 <table>
 <tr><td><code>mode </code></td><td>[string] Betriebs mode</td></tr>