diff --git a/maxscale-system-test/bug547.cpp b/maxscale-system-test/bug547.cpp
index 8649f14a2..001fa1cc4 100644
--- a/maxscale-system-test/bug547.cpp
+++ b/maxscale-system-test/bug547.cpp
@@ -43,12 +43,12 @@ int main(int argc, char *argv[])
 
     Test->set_timeout(30);
     Test->tprintf("Trying some queries, expecting failure, but not a crash\n");
-    execute_query(Test->conn_rwsplit, (char *) "DROP TABLE IF EXISTS t1");
-    execute_query(Test->conn_rwsplit, (char *) "CREATE TABLE t1 (x INT)");
-    execute_query(Test->conn_rwsplit, (char *) "INSERT INTO t1 (x) VALUES (1)");
-    execute_query(Test->conn_rwsplit, (char *) "select * from t1");
-    execute_query(Test->conn_master, (char *) "select * from t1");
-    execute_query(Test->conn_slave, (char *) "select * from t1");
+    execute_query(Test->conn_rwsplit, "DROP TABLE IF EXISTS t1");
+    execute_query(Test->conn_rwsplit, "CREATE TABLE t1 (x INT)");
+    execute_query(Test->conn_rwsplit, "INSERT INTO t1 (x) VALUES (1)");
+    execute_query(Test->conn_rwsplit, "select * from t1");
+    execute_query(Test->conn_master, "select * from t1");
+    execute_query(Test->conn_slave, "select * from t1");
 
     Test->set_timeout(10);
     Test->close_maxscale_connections();
@@ -58,12 +58,8 @@ int main(int argc, char *argv[])
 
     Test->stop_timeout();
     sleep(15);
-    Test->check_log_err((char *) "fatal signal 11", false);
-    Test->check_log_err((char *) "Failed to create new router session for service 'RW-Split-Router'", true);
-    Test->check_log_err((char *)
-                        "Failed to create new router session for service 'Read-Connection-Router-Master'", true);
-    Test->check_log_err((char *) "Failed to create new router session for service 'Read-Connection-Router-Slave'",
-                        true);
+    Test->check_log_err("fatal signal 11", false);
+    Test->check_log_err("Failed to create new router session for service", true);
 
     int rval = Test->global_result;
     delete Test;
diff --git a/maxscale-system-test/bug643.cpp b/maxscale-system-test/bug643.cpp
index 6a3974882..acccc97c3 100644
--- a/maxscale-system-test/bug643.cpp
+++ b/maxscale-system-test/bug643.cpp
@@ -22,16 +22,6 @@ service=RW Split Router
  * - check warnig in the log "RW Split Router: Recursive use of tee filter in service"
  */
 
-/*
-Mark Riddoch 2014-12-11 11:59:19 UTC
-There is a recursive use of the tee filter in the configuration.
-
-The "RW Split Router" uses the"duplicate" filter that will then duplicate all traffic to the original destination and another copy of the "RW Split Router", which again will  duplicate all traffic to the original destination and another copy of the "RW Split Router"...
-
-Really this needs to be trapped as a configuration error.
-*/
-
-
 #include <iostream>
 #include "testconnections.h"
 
@@ -56,7 +46,7 @@ int main(int argc, char *argv[])
         Test->add_result(1, "FAIL: Query to broken service succeeded!\n");
     }
     Test->close_maxscale_connections();
-    Test->check_log_err((char *) "RW-Split-Router: Recursive use of tee filter in service", true);
+    Test->check_log_err("Recursive use of tee filter in service", true);
 
     int rval = Test->global_result;
     delete Test;
diff --git a/maxscale-system-test/bug681.cpp b/maxscale-system-test/bug681.cpp
index 53350a3de..519ff660b 100644
--- a/maxscale-system-test/bug681.cpp
+++ b/maxscale-system-test/bug681.cpp
@@ -44,8 +44,7 @@ int main(int argc, char *argv[])
 
     Test->close_maxscale_connections();
 
-    Test->check_log_err((char *)
-                        "Unable to start RW-Split-Router service. There are too few backend servers configured in", true);
+    Test->check_log_err("There are too few backend servers configured in", true);
 
     int rval = Test->global_result;
     delete Test;
diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.check_backend b/maxscale-system-test/cnf/maxscale.cnf.template.check_backend
index 3dd76b1a7..e72455854 100755
--- a/maxscale-system-test/cnf/maxscale.cnf.template.check_backend
+++ b/maxscale-system-test/cnf/maxscale.cnf.template.check_backend
@@ -18,7 +18,7 @@ servers=gserver1,gserver2,gserver3,gserver4
 user=maxskysql
 passwd=skysql
 monitor_interval=1000
-root_node_as_master=false
+#root_node_as_master=false
 
 [RW Split Router]
 type=service
diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.galera b/maxscale-system-test/cnf/maxscale.cnf.template.galera
index cddd792c5..cff4440cb 100755
--- a/maxscale-system-test/cnf/maxscale.cnf.template.galera
+++ b/maxscale-system-test/cnf/maxscale.cnf.template.galera
@@ -1,6 +1,5 @@
 [maxscale]
 threads=###threads###
-log_warning=1
 
 [Galera Monitor]
 type=monitor
@@ -9,7 +8,7 @@ servers=server1,server2,server3,server4
 user=maxskysql
 passwd=skysql
 monitor_interval=1000
-root_node_as_master=false
+#root_node_as_master=false
 
 [RW Split Router]
 type=service
diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.galera.bug681 b/maxscale-system-test/cnf/maxscale.cnf.template.galera.bug681
index 938111b73..8aa84b597 100755
--- a/maxscale-system-test/cnf/maxscale.cnf.template.galera.bug681
+++ b/maxscale-system-test/cnf/maxscale.cnf.template.galera.bug681
@@ -10,7 +10,7 @@ servers=server1,server2,server3
 #passwd=maxpwd
 user=maxskysql
 passwd=skysql
-root_node_as_master=false
+#root_node_as_master=false
 
 [RW Split Router]
 type=service
diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.galera.weight b/maxscale-system-test/cnf/maxscale.cnf.template.galera.weight
index 6e782421d..711280809 100755
--- a/maxscale-system-test/cnf/maxscale.cnf.template.galera.weight
+++ b/maxscale-system-test/cnf/maxscale.cnf.template.galera.weight
@@ -9,7 +9,7 @@ servers=server1,server2,server3,server4
 user=maxskysql
 passwd=skysql
 use_priority=true
-root_node_as_master=false
+#root_node_as_master=false
 
 [RW Split Router]
 type=service
@@ -44,6 +44,16 @@ protocol=MySQLClient
 port=4008
 #socket=/tmp/readconn.sock
 
+[CLI]
+type=service
+router=cli
+
+[CLI Listener]
+type=listener
+service=CLI
+protocol=maxscaled
+socket=default
+
 [server1]
 type=server
 address=###galera_server_IP_1###
diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.galera_mxs564 b/maxscale-system-test/cnf/maxscale.cnf.template.galera_mxs564
index 292d6b7fe..7e76297a7 100644
--- a/maxscale-system-test/cnf/maxscale.cnf.template.galera_mxs564
+++ b/maxscale-system-test/cnf/maxscale.cnf.template.galera_mxs564
@@ -8,7 +8,7 @@ module=galeramon
 servers=server1,server2,server3,server4
 user=maxskysql
 passwd=skysql
-root_node_as_master=false
+#root_node_as_master=false
 
 [RW Split Router]
 type=service
diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.galera_priority b/maxscale-system-test/cnf/maxscale.cnf.template.galera_priority
index 88d5bfe31..d6185ac5a 100644
--- a/maxscale-system-test/cnf/maxscale.cnf.template.galera_priority
+++ b/maxscale-system-test/cnf/maxscale.cnf.template.galera_priority
@@ -12,7 +12,7 @@ user=maxskysql
 passwd=skysql
 use_priority=true
 monitor_interval=1000
-root_node_as_master=false
+#root_node_as_master=false
 
 [RW Split Router]
 type=service
diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.load_galera b/maxscale-system-test/cnf/maxscale.cnf.template.load_galera
index c68d8cdea..728470d45 100755
--- a/maxscale-system-test/cnf/maxscale.cnf.template.load_galera
+++ b/maxscale-system-test/cnf/maxscale.cnf.template.load_galera
@@ -8,7 +8,7 @@ module=galeramon
 servers=server1,server2,server3,server4
 user=maxskysql
 passwd=skysql
-root_node_as_master=false
+#root_node_as_master=false
 
 [RW Split Router]
 type=service
diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.load_galera_pers1 b/maxscale-system-test/cnf/maxscale.cnf.template.load_galera_pers1
index 0087b964a..b77eb01c5 100755
--- a/maxscale-system-test/cnf/maxscale.cnf.template.load_galera_pers1
+++ b/maxscale-system-test/cnf/maxscale.cnf.template.load_galera_pers1
@@ -8,7 +8,7 @@ module=galeramon
 servers=server1,server2,server3,server4
 user=maxskysql
 passwd=skysql
-root_node_as_master=false
+#root_node_as_master=false
 
 [RW Split Router]
 type=service
diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.load_galera_pers10 b/maxscale-system-test/cnf/maxscale.cnf.template.load_galera_pers10
index 553ed8cb6..bae8ae3e9 100755
--- a/maxscale-system-test/cnf/maxscale.cnf.template.load_galera_pers10
+++ b/maxscale-system-test/cnf/maxscale.cnf.template.load_galera_pers10
@@ -8,7 +8,7 @@ module=galeramon
 servers=server1,server2,server3,server4
 user=maxskysql
 passwd=skysql
-root_node_as_master=false
+#root_node_as_master=false
 
 [RW Split Router]
 type=service
diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.script b/maxscale-system-test/cnf/maxscale.cnf.template.script
index 026748347..aec3533de 100755
--- a/maxscale-system-test/cnf/maxscale.cnf.template.script
+++ b/maxscale-system-test/cnf/maxscale.cnf.template.script
@@ -20,7 +20,7 @@ servers=gserver1,gserver2,gserver3,gserver4
 script=/###access_homedir###/script/script.sh  --event=$EVENT --initiator=$INITIATOR --nodelist=$NODELIST
 events=master_down,master_up, slave_up,   server_down  ,server_up,lost_master,lost_slave,new_master,new_slave,server_down,server_up,synced_down,synced_up
 disable_master_role_setting=true
-root_node_as_master=false
+#root_node_as_master=false
 user=maxskysql
 passwd=skysql
 monitor_interval=1000
diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.ssl_load_galera b/maxscale-system-test/cnf/maxscale.cnf.template.ssl_load_galera
index 477816318..aaef97c64 100755
--- a/maxscale-system-test/cnf/maxscale.cnf.template.ssl_load_galera
+++ b/maxscale-system-test/cnf/maxscale.cnf.template.ssl_load_galera
@@ -8,7 +8,7 @@ module=galeramon
 servers=server1,server2,server3,server4
 user=maxskysql
 passwd=skysql
-root_node_as_master=false
+#root_node_as_master=false
 
 [RW Split Router]
 type=service
diff --git a/maxscale-system-test/config_test.cpp b/maxscale-system-test/config_test.cpp
index fca2f88f9..687193923 100644
--- a/maxscale-system-test/config_test.cpp
+++ b/maxscale-system-test/config_test.cpp
@@ -15,8 +15,8 @@ const char *bad_configs[] =
     "bug479",
     "bug493",
     "bad_ssl",
-    "mxs710_bad_socket",
-    "mxs711_two_ports",
+    //"mxs710_bad_socket",
+    //"mxs711_two_ports",
     "mxs720_line_with_no_equal",
     "mxs720_wierd_line",
     "mxs799",
diff --git a/maxscale-system-test/ses_bigmem.cpp b/maxscale-system-test/ses_bigmem.cpp
index 85fd69316..560a42196 100644
--- a/maxscale-system-test/ses_bigmem.cpp
+++ b/maxscale-system-test/ses_bigmem.cpp
@@ -30,7 +30,7 @@ int main(int argc, char *argv[])
             Test->try_query(Test->routers[j], (char*) "select 1;");
             Test->try_query(Test->routers[j], (char*) "set autocommit=1;");
             Test->try_query(Test->routers[j], (char*) "select 2;");
-            if ((i / 100) * 100 == i)
+            if ((i / 1000) * 1000 == i)
             {
                 Test->tprintf("i=%d\n", i);
             }