diff --git a/testresults.xml b/testresults.xml
index c4eddd3..fe701d3 100644
--- a/testresults.xml
+++ b/testresults.xml
@@ -1169,10 +1169,10 @@
 **** top   0.0 macro def testdir=/home/dmatetelki/p/varnish-cache-plus/bin/varnishtest/./tests
 **** top   0.0 macro def tmpdir=/tmp/vtc.14817.4cbfd8c0
 *    top   0.0 TEST ./tests/c00094.vtc starting
-**   top   0.0 === varnishtest "Test Backend Polling with a backend listening a...
+**   top   0.0 === varnishtest \"Test Backend Polling with a backend listening a...
 *    top   0.0 TEST Test Backend Polling with a backend listening at a UDS
 **   top   0.0 === barrier b1 cond 2
-**   top   0.0 === server s1 -listen "${tmpdir}/s1.sock" {
+**   top   0.0 === server s1 -listen \"${tmpdir}/s1.sock\" {
 **   s1    0.0 Starting server
 **** s1    0.0 macro def s1_addr=0.0.0.0
 **** s1    0.0 macro def s1_port=0
@@ -1221,7 +1221,7 @@
 **** v1    0.2 CLI TX|
 **** v1    0.2 CLI TX|
 **** v1    0.2 CLI TX|\tbackend foo {
-**** v1    0.2 CLI TX|\t\t.path = "/tmp/vtc.14817.4cbfd8c0/s1.sock";
+**** v1    0.2 CLI TX|\t\t.path = \"/tmp/vtc.14817.4cbfd8c0/s1.sock\";
 **** v1    0.2 CLI TX|\t\t.probe = {
 **** v1    0.2 CLI TX|\t\t\t.timeout = 1 s;
 **** v1    0.2 CLI TX|\t\t\t.interval = 0.1 s;
@@ -1258,9 +1258,9 @@
 **** s1    0.5 http[ 3] |Host: 0.0.0.0
 **** s1    0.5 http[ 4] |Connection: close
 **** s1    0.5 bodylen = 0
-**   s1    0.5 === expect req.url == "/"
-**** s1    0.5 EXPECT req.url (/) == "/" match
-**   s1    0.5 === txresp -hdr "Bar: foo" -body "foobar"
+**   s1    0.5 === expect req.url == \"/\"
+**** s1    0.5 EXPECT req.url (/) == \"/\" match
+**   s1    0.5 === txresp -hdr \"Bar: foo\" -body \"foobar\"
 **** s1    0.5 txresp|HTTP/1.1 200 OK\r
 **** s1    0.5 txresp|Bar: foo\r
 **** s1    0.5 txresp|Content-Length: 6\r
@@ -1274,11 +1274,11 @@
 ***  v1    0.6 CLI RX  200
 **** v1    0.6 CLI RX|127.0.0.1 46857
 **** v1    0.6 CLI TX|debug.xid 999
-**** v1    0.6 vsl|          0 CLI             - Rd vcl.load "vcl1" vcl_vcl1.1546519298.832932949/vgc.so 1auto
+**** v1    0.6 vsl|          0 CLI             - Rd vcl.load \"vcl1\" vcl_vcl1.1546519298.832932949/vgc.so 1auto
 **** v1    0.6 vsl|          0 Backend_health  - (null) Went sick -------H 2 3 8 0.000000 0.000000 
 **** v1    0.6 vsl|          0 Backend_health  - vcl1.foo Still sick -------H 2 3 8 0.000000 0.000000 
-**** v1    0.6 vsl|          0 CLI             - Wr 200 55 Loaded "vcl_vcl1.1546519298.832932949/vgc.so" as "vcl1"
-**** v1    0.6 vsl|          0 CLI             - Rd vcl.use "vcl1"
+**** v1    0.6 vsl|          0 CLI             - Wr 200 55 Loaded \"vcl_vcl1.1546519298.832932949/vgc.so\" as \"vcl1\"
+**** v1    0.6 vsl|          0 CLI             - Rd vcl.use \"vcl1\"
 **** v1    0.6 vsl|          0 CLI             - Wr 200 0 
 **** v1    0.6 vsl|          0 CLI             - Rd start
 **** v1    0.6 vsl|          0 CLI             - Wr 200 0 
@@ -1300,9 +1300,9 @@
 **** s1    0.6 http[ 3] |Host: 0.0.0.0
 **** s1    0.6 http[ 4] |Connection: close
 **** s1    0.6 bodylen = 0
-**   s1    0.6 === expect req.url == "/"
-**** s1    0.6 EXPECT req.url (/) == "/" match
-**   s1    0.6 === txresp -hdr "Bar: foo" -body "foobar"
+**   s1    0.6 === expect req.url == \"/\"
+**** s1    0.6 EXPECT req.url (/) == \"/\" match
+**   s1    0.6 === txresp -hdr \"Bar: foo\" -body \"foobar\"
 **** s1    0.6 txresp|HTTP/1.1 200 OK\r
 **** s1    0.6 txresp|Bar: foo\r
 **** s1    0.6 txresp|Content-Length: 6\r
@@ -1341,9 +1341,9 @@
 **** s1    0.7 http[ 3] |Host: 0.0.0.0
 **** s1    0.7 http[ 4] |Connection: close
 **** s1    0.7 bodylen = 0
-**   s1    0.7 === expect req.url == "/"
-**** s1    0.7 EXPECT req.url (/) == "/" match
-**   s1    0.7 === txresp -hdr "Bar: foo" -body "foobar"
+**   s1    0.7 === expect req.url == \"/\"
+**** s1    0.7 EXPECT req.url (/) == \"/\" match
+**   s1    0.7 === txresp -hdr \"Bar: foo\" -body \"foobar\"
 **** s1    0.7 txresp|HTTP/1.1 200 OK\r
 **** s1    0.7 txresp|Bar: foo\r
 **** s1    0.7 txresp|Content-Length: 6\r
@@ -1366,9 +1366,9 @@
 **** s1    0.8 http[ 3] |Host: 0.0.0.0
 **** s1    0.8 http[ 4] |Connection: close
 **** s1    0.8 bodylen = 0
-**   s1    0.8 === expect req.url == "/"
-**** s1    0.8 EXPECT req.url (/) == "/" match
-**   s1    0.8 === txresp -hdr "Bar: foo" -body "foobar"
+**   s1    0.8 === expect req.url == \"/\"
+**** s1    0.8 EXPECT req.url (/) == \"/\" match
+**   s1    0.8 === txresp -hdr \"Bar: foo\" -body \"foobar\"
 **** s1    0.8 txresp|HTTP/1.1 200 OK\r
 **** s1    0.8 txresp|Bar: foo\r
 **** s1    0.8 txresp|Content-Length: 6\r
@@ -1391,9 +1391,9 @@
 **** s1    0.9 http[ 3] |Host: 0.0.0.0
 **** s1    0.9 http[ 4] |Connection: close
 **** s1    0.9 bodylen = 0
-**   s1    0.9 === expect req.url == "/"
-**** s1    0.9 EXPECT req.url (/) == "/" match
-**   s1    0.9 === txresp -hdr "Bar: foo" -body "foobar"
+**   s1    0.9 === expect req.url == \"/\"
+**** s1    0.9 EXPECT req.url (/) == \"/\" match
+**   s1    0.9 === txresp -hdr \"Bar: foo\" -body \"foobar\"
 **** s1    0.9 txresp|HTTP/1.1 200 OK\r
 **** s1    0.9 txresp|Bar: foo\r
 **** s1    0.9 txresp|Content-Length: 6\r
@@ -1416,9 +1416,9 @@
 **** s1    1.0 http[ 3] |Host: 0.0.0.0
 **** s1    1.0 http[ 4] |Connection: close
 **** s1    1.0 bodylen = 0
-**   s1    1.0 === expect req.url == "/"
-**** s1    1.0 EXPECT req.url (/) == "/" match
-**   s1    1.0 === txresp -hdr "Bar: foo" -body "foobar"
+**   s1    1.0 === expect req.url == \"/\"
+**** s1    1.0 EXPECT req.url (/) == \"/\" match
+**   s1    1.0 === txresp -hdr \"Bar: foo\" -body \"foobar\"
 **** s1    1.0 txresp|HTTP/1.1 200 OK\r
 **** s1    1.0 txresp|Bar: foo\r
 **** s1    1.0 txresp|Content-Length: 6\r
@@ -1441,9 +1441,9 @@
 **** s1    1.1 http[ 3] |Host: 0.0.0.0
 **** s1    1.1 http[ 4] |Connection: close
 **** s1    1.1 bodylen = 0
-**   s1    1.1 === expect req.url == "/"
-**** s1    1.1 EXPECT req.url (/) == "/" match
-**   s1    1.1 === txresp -hdr "Bar: foo" -body "foobar"
+**   s1    1.1 === expect req.url == \"/\"
+**** s1    1.1 EXPECT req.url (/) == \"/\" match
+**   s1    1.1 === txresp -hdr \"Bar: foo\" -body \"foobar\"
 **** s1    1.1 txresp|HTTP/1.1 200 OK\r
 **** s1    1.1 txresp|Bar: foo\r
 **** s1    1.1 txresp|Content-Length: 6\r
@@ -1466,9 +1466,9 @@
 **** s1    1.2 http[ 3] |Host: 0.0.0.0
 **** s1    1.2 http[ 4] |Connection: close
 **** s1    1.2 bodylen = 0
-**   s1    1.2 === expect req.url == "/"
-**** s1    1.2 EXPECT req.url (/) == "/" match
-**   s1    1.2 === txresp -hdr "Bar: foo" -body "foobar"
+**   s1    1.2 === expect req.url == \"/\"
+**** s1    1.2 EXPECT req.url (/) == \"/\" match
+**   s1    1.2 === txresp -hdr \"Bar: foo\" -body \"foobar\"
 **** s1    1.2 txresp|HTTP/1.1 200 OK\r
 **** s1    1.2 txresp|Bar: foo\r
 **** s1    1.2 txresp|Content-Length: 6\r
@@ -1492,9 +1492,9 @@
 **** s1    1.3 http[ 3] |Host: 0.0.0.0
 **** s1    1.3 http[ 4] |Connection: close
 **** s1    1.3 bodylen = 0
-**   s1    1.3 === expect req.url == "/"
-**** s1    1.3 EXPECT req.url (/) == "/" match
-**   s1    1.3 === txresp -status 404 -hdr "Bar: foo" -body "foobar"
+**   s1    1.3 === expect req.url == \"/\"
+**** s1    1.3 EXPECT req.url (/) == \"/\" match
+**   s1    1.3 === txresp -status 404 -hdr \"Bar: foo\" -body \"foobar\"
 **** s1    1.3 txresp|HTTP/1.1 404 OK\r
 **** s1    1.3 txresp|Bar: foo\r
 **** s1    1.3 txresp|Content-Length: 6\r
@@ -1517,9 +1517,9 @@
 **** s1    1.4 http[ 3] |Host: 0.0.0.0
 **** s1    1.4 http[ 4] |Connection: close
 **** s1    1.4 bodylen = 0
-**   s1    1.4 === expect req.url == "/"
-**** s1    1.4 EXPECT req.url (/) == "/" match
-**   s1    1.4 === txresp -status 404 -hdr "Bar: foo" -body "foobar"
+**   s1    1.4 === expect req.url == \"/\"
+**** s1    1.4 EXPECT req.url (/) == \"/\" match
+**   s1    1.4 === txresp -status 404 -hdr \"Bar: foo\" -body \"foobar\"
 **** s1    1.4 txresp|HTTP/1.1 404 OK\r
 **** s1    1.4 txresp|Bar: foo\r
 **** s1    1.4 txresp|Content-Length: 6\r
@@ -1542,9 +1542,9 @@
 **** s1    1.5 http[ 3] |Host: 0.0.0.0
 **** s1    1.5 http[ 4] |Connection: close
 **** s1    1.5 bodylen = 0
-**   s1    1.5 === expect req.url == "/"
-**** s1    1.5 EXPECT req.url (/) == "/" match
-**   s1    1.5 === txresp -status 404 -hdr "Bar: foo" -body "foobar"
+**   s1    1.5 === expect req.url == \"/\"
+**** s1    1.5 EXPECT req.url (/) == \"/\" match
+**   s1    1.5 === txresp -status 404 -hdr \"Bar: foo\" -body \"foobar\"
 **** s1    1.5 txresp|HTTP/1.1 404 OK\r
 **** s1    1.5 txresp|Bar: foo\r
 **** s1    1.5 txresp|Content-Length: 6\r
@@ -1568,9 +1568,9 @@
 **** s1    1.6 http[ 3] |Host: 0.0.0.0
 **** s1    1.6 http[ 4] |Connection: close
 **** s1    1.6 bodylen = 0
-**   s1    1.6 === expect req.url == "/"
-**** s1    1.6 EXPECT req.url (/) == "/" match
-**   s1    1.6 === txresp -proto "FROBOZ" -status 200 -hdr "Bar: foo" -body "fo...
+**   s1    1.6 === expect req.url == \"/\"
+**** s1    1.6 EXPECT req.url (/) == \"/\" match
+**   s1    1.6 === txresp -proto \"FROBOZ\" -status 200 -hdr \"Bar: foo\" -body \"fo...
 **** s1    1.6 txresp|FROBOZ 200 OK\r
 **** s1    1.6 txresp|Bar: foo\r
 **** s1    1.6 txresp|Content-Length: 6\r
@@ -1593,9 +1593,9 @@
 **** s1    1.7 http[ 3] |Host: 0.0.0.0
 **** s1    1.7 http[ 4] |Connection: close
 **** s1    1.7 bodylen = 0
-**   s1    1.7 === expect req.url == "/"
-**** s1    1.7 EXPECT req.url (/) == "/" match
-**   s1    1.7 === txresp -proto "FROBOZ" -status 200 -hdr "Bar: foo" -body "fo...
+**   s1    1.7 === expect req.url == \"/\"
+**** s1    1.7 EXPECT req.url (/) == \"/\" match
+**   s1    1.7 === txresp -proto \"FROBOZ\" -status 200 -hdr \"Bar: foo\" -body \"fo...
 **** s1    1.7 txresp|FROBOZ 200 OK\r
 **** s1    1.7 txresp|Bar: foo\r
 **** s1    1.7 txresp|Content-Length: 6\r
@@ -1619,9 +1619,9 @@
 **** s1    1.8 http[ 3] |Host: 0.0.0.0
 **** s1    1.8 http[ 4] |Connection: close
 **** s1    1.8 bodylen = 0
-**   s1    1.8 === expect req.url == "/"
-**** s1    1.8 EXPECT req.url (/) == "/" match
-**   s1    1.8 === send "HTTP/1.1 200 \r\n"
+**   s1    1.8 === expect req.url == \"/\"
+**** s1    1.8 EXPECT req.url (/) == \"/\" match
+**   s1    1.8 === send \"HTTP/1.1 200 \r\n\"
 **** s1    1.8 send|HTTP/1.1 200 \r
 **   s1    1.8 === accept
 **** s1    1.8 Accepting
@@ -1640,9 +1640,9 @@
 **** s1    1.9 http[ 3] |Host: 0.0.0.0
 **** s1    1.9 http[ 4] |Connection: close
 **** s1    1.9 bodylen = 0
-**   s1    1.9 === expect req.url == "/"
-**** s1    1.9 EXPECT req.url (/) == "/" match
-**   s1    1.9 === send "HTTP/1.1 200 \r\n"
+**   s1    1.9 === expect req.url == \"/\"
+**** s1    1.9 EXPECT req.url (/) == \"/\" match
+**   s1    1.9 === send \"HTTP/1.1 200 \r\n\"
 **** s1    1.9 send|HTTP/1.1 200 \r
 **   s1    1.9 === accept
 **** s1    1.9 Accepting
@@ -1652,7 +1652,7 @@
 **** s1    2.0 Barrier(b1) wake 2
 ***  s1    2.0 shutting fd 5
 **   s1    2.0 Ending
-**   top   2.0 === varnish v1 -cliexpect "^CLI RX|  -+U+ Good UNIX" "backend.li...
+**   top   2.0 === varnish v1 -cliexpect \"^CLI RX|  -+U+ Good UNIX\" \"backend.li...
 **** v1    2.0 CLI TX|backend.list -p denes
 ***  v1    2.0 CLI RX  200
 **** v1    2.0 CLI RX|Backend name                   Admin      Probe                Last updated
@@ -1679,10 +1679,10 @@
 *    top   3.1 TEST ./tests/c00094.vtc FAILED
 #    top  TEST ./tests/c00094.vtc FAILED (3.079) exit=2
 FAIL tests/c00094.vtc (exit status: 2)
-				"></failure>
+				\"></failure>
 			<failure
-				type=":global-test-result: FAIL"
-				message="
+				type=\":global-test-result: FAIL\"
+				message=\"
 **** top   0.0 extmacro def pwd=/home/dmatetelki/p/varnish-cache-plus/bin/varnishtest
 **** top   0.0 extmacro def topsrc=/home/dmatetelki/p/varnish-cache-plus
 **** top   0.0 extmacro def localhost=127.0.0.1
@@ -1692,10 +1692,10 @@ FAIL tests/c00094.vtc (exit status: 2)
 **** top   0.0 macro def testdir=/home/dmatetelki/p/varnish-cache-plus/bin/varnishtest/./tests
 **** top   0.0 macro def tmpdir=/tmp/vtc.14817.4cbfd8c0
 *    top   0.0 TEST ./tests/c00094.vtc starting
-**   top   0.0 === varnishtest "Test Backend Polling with a backend listening a...
+**   top   0.0 === varnishtest \"Test Backend Polling with a backend listening a...
 *    top   0.0 TEST Test Backend Polling with a backend listening at a UDS
 **   top   0.0 === barrier b1 cond 2
-**   top   0.0 === server s1 -listen "${tmpdir}/s1.sock" {
+**   top   0.0 === server s1 -listen \"${tmpdir}/s1.sock\" {
 **   s1    0.0 Starting server
 **** s1    0.0 macro def s1_addr=0.0.0.0
 **** s1    0.0 macro def s1_port=0
@@ -1744,7 +1744,7 @@ FAIL tests/c00094.vtc (exit status: 2)
 **** v1    0.2 CLI TX|
 **** v1    0.2 CLI TX|
 **** v1    0.2 CLI TX|\tbackend foo {
-**** v1    0.2 CLI TX|\t\t.path = "/tmp/vtc.14817.4cbfd8c0/s1.sock";
+**** v1    0.2 CLI TX|\t\t.path = \"/tmp/vtc.14817.4cbfd8c0/s1.sock\";
 **** v1    0.2 CLI TX|\t\t.probe = {
 **** v1    0.2 CLI TX|\t\t\t.timeout = 1 s;
 **** v1    0.2 CLI TX|\t\t\t.interval = 0.1 s;
@@ -1781,9 +1781,9 @@ FAIL tests/c00094.vtc (exit status: 2)
 **** s1    0.5 http[ 3] |Host: 0.0.0.0
 **** s1    0.5 http[ 4] |Connection: close
 **** s1    0.5 bodylen = 0
-**   s1    0.5 === expect req.url == "/"
-**** s1    0.5 EXPECT req.url (/) == "/" match
-**   s1    0.5 === txresp -hdr "Bar: foo" -body "foobar"
+**   s1    0.5 === expect req.url == \"/\"
+**** s1    0.5 EXPECT req.url (/) == \"/\" match
+**   s1    0.5 === txresp -hdr \"Bar: foo\" -body \"foobar\"
 **** s1    0.5 txresp|HTTP/1.1 200 OK\r
 **** s1    0.5 txresp|Bar: foo\r
 **** s1    0.5 txresp|Content-Length: 6\r
@@ -1797,11 +1797,11 @@ FAIL tests/c00094.vtc (exit status: 2)
 ***  v1    0.6 CLI RX  200
 **** v1    0.6 CLI RX|127.0.0.1 46857
 **** v1    0.6 CLI TX|debug.xid 999
-**** v1    0.6 vsl|          0 CLI             - Rd vcl.load "vcl1" vcl_vcl1.1546519298.832932949/vgc.so 1auto
+**** v1    0.6 vsl|          0 CLI             - Rd vcl.load \"vcl1\" vcl_vcl1.1546519298.832932949/vgc.so 1auto
 **** v1    0.6 vsl|          0 Backend_health  - (null) Went sick -------H 2 3 8 0.000000 0.000000 
 **** v1    0.6 vsl|          0 Backend_health  - vcl1.foo Still sick -------H 2 3 8 0.000000 0.000000 
-**** v1    0.6 vsl|          0 CLI             - Wr 200 55 Loaded "vcl_vcl1.1546519298.832932949/vgc.so" as "vcl1"
-**** v1    0.6 vsl|          0 CLI             - Rd vcl.use "vcl1"
+**** v1    0.6 vsl|          0 CLI             - Wr 200 55 Loaded \"vcl_vcl1.1546519298.832932949/vgc.so\" as \"vcl1\"
+**** v1    0.6 vsl|          0 CLI             - Rd vcl.use \"vcl1\"
 **** v1    0.6 vsl|          0 CLI             - Wr 200 0 
 **** v1    0.6 vsl|          0 CLI             - Rd start
 **** v1    0.6 vsl|          0 CLI             - Wr 200 0 
@@ -1823,9 +1823,9 @@ FAIL tests/c00094.vtc (exit status: 2)
 **** s1    0.6 http[ 3] |Host: 0.0.0.0
 **** s1    0.6 http[ 4] |Connection: close
 **** s1    0.6 bodylen = 0
-**   s1    0.6 === expect req.url == "/"
-**** s1    0.6 EXPECT req.url (/) == "/" match
-**   s1    0.6 === txresp -hdr "Bar: foo" -body "foobar"
+**   s1    0.6 === expect req.url == \"/\"
+**** s1    0.6 EXPECT req.url (/) == \"/\" match
+**   s1    0.6 === txresp -hdr \"Bar: foo\" -body \"foobar\"
 **** s1    0.6 txresp|HTTP/1.1 200 OK\r
 **** s1    0.6 txresp|Bar: foo\r
 **** s1    0.6 txresp|Content-Length: 6\r
@@ -1864,9 +1864,9 @@ FAIL tests/c00094.vtc (exit status: 2)
 **** s1    0.7 http[ 3] |Host: 0.0.0.0
 **** s1    0.7 http[ 4] |Connection: close
 **** s1    0.7 bodylen = 0
-**   s1    0.7 === expect req.url == "/"
-**** s1    0.7 EXPECT req.url (/) == "/" match
-**   s1    0.7 === txresp -hdr "Bar: foo" -body "foobar"
+**   s1    0.7 === expect req.url == \"/\"
+**** s1    0.7 EXPECT req.url (/) == \"/\" match
+**   s1    0.7 === txresp -hdr \"Bar: foo\" -body \"foobar\"
 **** s1    0.7 txresp|HTTP/1.1 200 OK\r
 **** s1    0.7 txresp|Bar: foo\r
 **** s1    0.7 txresp|Content-Length: 6\r
@@ -1889,9 +1889,9 @@ FAIL tests/c00094.vtc (exit status: 2)
 **** s1    0.8 http[ 3] |Host: 0.0.0.0
 **** s1    0.8 http[ 4] |Connection: close
 **** s1    0.8 bodylen = 0
-**   s1    0.8 === expect req.url == "/"
-**** s1    0.8 EXPECT req.url (/) == "/" match
-**   s1    0.8 === txresp -hdr "Bar: foo" -body "foobar"
+**   s1    0.8 === expect req.url == \"/\"
+**** s1    0.8 EXPECT req.url (/) == \"/\" match
+**   s1    0.8 === txresp -hdr \"Bar: foo\" -body \"foobar\"
 **** s1    0.8 txresp|HTTP/1.1 200 OK\r
 **** s1    0.8 txresp|Bar: foo\r
 **** s1    0.8 txresp|Content-Length: 6\r
@@ -1914,9 +1914,9 @@ FAIL tests/c00094.vtc (exit status: 2)
 **** s1    0.9 http[ 3] |Host: 0.0.0.0
 **** s1    0.9 http[ 4] |Connection: close
 **** s1    0.9 bodylen = 0
-**   s1    0.9 === expect req.url == "/"
-**** s1    0.9 EXPECT req.url (/) == "/" match
-**   s1    0.9 === txresp -hdr "Bar: foo" -body "foobar"
+**   s1    0.9 === expect req.url == \"/\"
+**** s1    0.9 EXPECT req.url (/) == \"/\" match
+**   s1    0.9 === txresp -hdr \"Bar: foo\" -body \"foobar\"
 **** s1    0.9 txresp|HTTP/1.1 200 OK\r
 **** s1    0.9 txresp|Bar: foo\r
 **** s1    0.9 txresp|Content-Length: 6\r
@@ -1939,9 +1939,9 @@ FAIL tests/c00094.vtc (exit status: 2)
 **** s1    1.0 http[ 3] |Host: 0.0.0.0
 **** s1    1.0 http[ 4] |Connection: close
 **** s1    1.0 bodylen = 0
-**   s1    1.0 === expect req.url == "/"
-**** s1    1.0 EXPECT req.url (/) == "/" match
-**   s1    1.0 === txresp -hdr "Bar: foo" -body "foobar"
+**   s1    1.0 === expect req.url == \"/\"
+**** s1    1.0 EXPECT req.url (/) == \"/\" match
+**   s1    1.0 === txresp -hdr \"Bar: foo\" -body \"foobar\"
 **** s1    1.0 txresp|HTTP/1.1 200 OK\r
 **** s1    1.0 txresp|Bar: foo\r
 **** s1    1.0 txresp|Content-Length: 6\r
@@ -1964,9 +1964,9 @@ FAIL tests/c00094.vtc (exit status: 2)
 **** s1    1.1 http[ 3] |Host: 0.0.0.0
 **** s1    1.1 http[ 4] |Connection: close
 **** s1    1.1 bodylen = 0
-**   s1    1.1 === expect req.url == "/"
-**** s1    1.1 EXPECT req.url (/) == "/" match
-**   s1    1.1 === txresp -hdr "Bar: foo" -body "foobar"
+**   s1    1.1 === expect req.url == \"/\"
+**** s1    1.1 EXPECT req.url (/) == \"/\" match
+**   s1    1.1 === txresp -hdr \"Bar: foo\" -body \"foobar\"
 **** s1    1.1 txresp|HTTP/1.1 200 OK\r
 **** s1    1.1 txresp|Bar: foo\r
 **** s1    1.1 txresp|Content-Length: 6\r
@@ -1989,9 +1989,9 @@ FAIL tests/c00094.vtc (exit status: 2)
 **** s1    1.2 http[ 3] |Host: 0.0.0.0
 **** s1    1.2 http[ 4] |Connection: close
 **** s1    1.2 bodylen = 0
-**   s1    1.2 === expect req.url == "/"
-**** s1    1.2 EXPECT req.url (/) == "/" match
-**   s1    1.2 === txresp -hdr "Bar: foo" -body "foobar"
+**   s1    1.2 === expect req.url == \"/\"
+**** s1    1.2 EXPECT req.url (/) == \"/\" match
+**   s1    1.2 === txresp -hdr \"Bar: foo\" -body \"foobar\"
 **** s1    1.2 txresp|HTTP/1.1 200 OK\r
 **** s1    1.2 txresp|Bar: foo\r
 **** s1    1.2 txresp|Content-Length: 6\r
@@ -2015,9 +2015,9 @@ FAIL tests/c00094.vtc (exit status: 2)
 **** s1    1.3 http[ 3] |Host: 0.0.0.0
 **** s1    1.3 http[ 4] |Connection: close
 **** s1    1.3 bodylen = 0
-**   s1    1.3 === expect req.url == "/"
-**** s1    1.3 EXPECT req.url (/) == "/" match
-**   s1    1.3 === txresp -status 404 -hdr "Bar: foo" -body "foobar"
+**   s1    1.3 === expect req.url == \"/\"
+**** s1    1.3 EXPECT req.url (/) == \"/\" match
+**   s1    1.3 === txresp -status 404 -hdr \"Bar: foo\" -body \"foobar\"
 **** s1    1.3 txresp|HTTP/1.1 404 OK\r
 **** s1    1.3 txresp|Bar: foo\r
 **** s1    1.3 txresp|Content-Length: 6\r
@@ -2040,9 +2040,9 @@ FAIL tests/c00094.vtc (exit status: 2)
 **** s1    1.4 http[ 3] |Host: 0.0.0.0
 **** s1    1.4 http[ 4] |Connection: close
 **** s1    1.4 bodylen = 0
-**   s1    1.4 === expect req.url == "/"
-**** s1    1.4 EXPECT req.url (/) == "/" match
-**   s1    1.4 === txresp -status 404 -hdr "Bar: foo" -body "foobar"
+**   s1    1.4 === expect req.url == \"/\"
+**** s1    1.4 EXPECT req.url (/) == \"/\" match
+**   s1    1.4 === txresp -status 404 -hdr \"Bar: foo\" -body \"foobar\"
 **** s1    1.4 txresp|HTTP/1.1 404 OK\r
 **** s1    1.4 txresp|Bar: foo\r
 **** s1    1.4 txresp|Content-Length: 6\r
@@ -2065,9 +2065,9 @@ FAIL tests/c00094.vtc (exit status: 2)
 **** s1    1.5 http[ 3] |Host: 0.0.0.0
 **** s1    1.5 http[ 4] |Connection: close
 **** s1    1.5 bodylen = 0
-**   s1    1.5 === expect req.url == "/"
-**** s1    1.5 EXPECT req.url (/) == "/" match
-**   s1    1.5 === txresp -status 404 -hdr "Bar: foo" -body "foobar"
+**   s1    1.5 === expect req.url == \"/\"
+**** s1    1.5 EXPECT req.url (/) == \"/\" match
+**   s1    1.5 === txresp -status 404 -hdr \"Bar: foo\" -body \"foobar\"
 **** s1    1.5 txresp|HTTP/1.1 404 OK\r
 **** s1    1.5 txresp|Bar: foo\r
 **** s1    1.5 txresp|Content-Length: 6\r
@@ -2091,9 +2091,9 @@ FAIL tests/c00094.vtc (exit status: 2)
 **** s1    1.6 http[ 3] |Host: 0.0.0.0
 **** s1    1.6 http[ 4] |Connection: close
 **** s1    1.6 bodylen = 0
-**   s1    1.6 === expect req.url == "/"
-**** s1    1.6 EXPECT req.url (/) == "/" match
-**   s1    1.6 === txresp -proto "FROBOZ" -status 200 -hdr "Bar: foo" -body "fo...
+**   s1    1.6 === expect req.url == \"/\"
+**** s1    1.6 EXPECT req.url (/) == \"/\" match
+**   s1    1.6 === txresp -proto \"FROBOZ\" -status 200 -hdr \"Bar: foo\" -body \"fo...
 **** s1    1.6 txresp|FROBOZ 200 OK\r
 **** s1    1.6 txresp|Bar: foo\r
 **** s1    1.6 txresp|Content-Length: 6\r
@@ -2116,9 +2116,9 @@ FAIL tests/c00094.vtc (exit status: 2)
 **** s1    1.7 http[ 3] |Host: 0.0.0.0
 **** s1    1.7 http[ 4] |Connection: close
 **** s1    1.7 bodylen = 0
-**   s1    1.7 === expect req.url == "/"
-**** s1    1.7 EXPECT req.url (/) == "/" match
-**   s1    1.7 === txresp -proto "FROBOZ" -status 200 -hdr "Bar: foo" -body "fo...
+**   s1    1.7 === expect req.url == \"/\"
+**** s1    1.7 EXPECT req.url (/) == \"/\" match
+**   s1    1.7 === txresp -proto \"FROBOZ\" -status 200 -hdr \"Bar: foo\" -body \"fo...
 **** s1    1.7 txresp|FROBOZ 200 OK\r
 **** s1    1.7 txresp|Bar: foo\r
 **** s1    1.7 txresp|Content-Length: 6\r
@@ -2142,9 +2142,9 @@ FAIL tests/c00094.vtc (exit status: 2)
 **** s1    1.8 http[ 3] |Host: 0.0.0.0
 **** s1    1.8 http[ 4] |Connection: close
 **** s1    1.8 bodylen = 0
-**   s1    1.8 === expect req.url == "/"
-**** s1    1.8 EXPECT req.url (/) == "/" match
-**   s1    1.8 === send "HTTP/1.1 200 \r\n"
+**   s1    1.8 === expect req.url == \"/\"
+**** s1    1.8 EXPECT req.url (/) == \"/\" match
+**   s1    1.8 === send \"HTTP/1.1 200 \r\n\"
 **** s1    1.8 send|HTTP/1.1 200 \r
 **   s1    1.8 === accept
 **** s1    1.8 Accepting
@@ -2163,9 +2163,9 @@ FAIL tests/c00094.vtc (exit status: 2)
 **** s1    1.9 http[ 3] |Host: 0.0.0.0
 **** s1    1.9 http[ 4] |Connection: close
 **** s1    1.9 bodylen = 0
-**   s1    1.9 === expect req.url == "/"
-**** s1    1.9 EXPECT req.url (/) == "/" match
-**   s1    1.9 === send "HTTP/1.1 200 \r\n"
+**   s1    1.9 === expect req.url == \"/\"
+**** s1    1.9 EXPECT req.url (/) == \"/\" match
+**   s1    1.9 === send \"HTTP/1.1 200 \r\n\"
 **** s1    1.9 send|HTTP/1.1 200 \r
 **   s1    1.9 === accept
 **** s1    1.9 Accepting
@@ -2175,7 +2175,7 @@ FAIL tests/c00094.vtc (exit status: 2)
 **** s1    2.0 Barrier(b1) wake 2
 ***  s1    2.0 shutting fd 5
 **   s1    2.0 Ending
-**   top   2.0 === varnish v1 -cliexpect "^CLI RX|  -+U+ Good UNIX" "backend.li...
+**   top   2.0 === varnish v1 -cliexpect \"^CLI RX|  -+U+ Good UNIX\" \"backend.li...
 **** v1    2.0 CLI TX|backend.list -p denes
 ***  v1    2.0 CLI RX  200
 **** v1    2.0 CLI RX|Backend name                   Admin      Probe                Last updated
@@ -2202,10 +2202,10 @@ FAIL tests/c00094.vtc (exit status: 2)
 *    top   3.1 TEST ./tests/c00094.vtc FAILED
 #    top  TEST ./tests/c00094.vtc FAILED (3.079) exit=2
 FAIL tests/c00094.vtc (exit status: 2)
-				"></failure>
+				\"></failure>
 			<failure
-				type=":recheck: yes"
-				message="
+				type=\":recheck: yes\"
+				message=\"
 **** top   0.0 extmacro def pwd=/home/dmatetelki/p/varnish-cache-plus/bin/varnishtest
 **** top   0.0 extmacro def topsrc=/home/dmatetelki/p/varnish-cache-plus
 **** top   0.0 extmacro def localhost=127.0.0.1
@@ -2215,10 +2215,10 @@ FAIL tests/c00094.vtc (exit status: 2)
 **** top   0.0 macro def testdir=/home/dmatetelki/p/varnish-cache-plus/bin/varnishtest/./tests
 **** top   0.0 macro def tmpdir=/tmp/vtc.14817.4cbfd8c0
 *    top   0.0 TEST ./tests/c00094.vtc starting
-**   top   0.0 === varnishtest "Test Backend Polling with a backend listening a...
+**   top   0.0 === varnishtest \"Test Backend Polling with a backend listening a...
 *    top   0.0 TEST Test Backend Polling with a backend listening at a UDS
 **   top   0.0 === barrier b1 cond 2
-**   top   0.0 === server s1 -listen "${tmpdir}/s1.sock" {
+**   top   0.0 === server s1 -listen \"${tmpdir}/s1.sock\" {
 **   s1    0.0 Starting server
 **** s1    0.0 macro def s1_addr=0.0.0.0
 **** s1    0.0 macro def s1_port=0
@@ -2267,7 +2267,7 @@ FAIL tests/c00094.vtc (exit status: 2)
 **** v1    0.2 CLI TX|
 **** v1    0.2 CLI TX|
 **** v1    0.2 CLI TX|\tbackend foo {
-**** v1    0.2 CLI TX|\t\t.path = "/tmp/vtc.14817.4cbfd8c0/s1.sock";
+**** v1    0.2 CLI TX|\t\t.path = \"/tmp/vtc.14817.4cbfd8c0/s1.sock\";
 **** v1    0.2 CLI TX|\t\t.probe = {
 **** v1    0.2 CLI TX|\t\t\t.timeout = 1 s;
 **** v1    0.2 CLI TX|\t\t\t.interval = 0.1 s;
@@ -2304,9 +2304,9 @@ FAIL tests/c00094.vtc (exit status: 2)
 **** s1    0.5 http[ 3] |Host: 0.0.0.0
 **** s1    0.5 http[ 4] |Connection: close
 **** s1    0.5 bodylen = 0
-**   s1    0.5 === expect req.url == "/"
-**** s1    0.5 EXPECT req.url (/) == "/" match
-**   s1    0.5 === txresp -hdr "Bar: foo" -body "foobar"
+**   s1    0.5 === expect req.url == \"/\"
+**** s1    0.5 EXPECT req.url (/) == \"/\" match
+**   s1    0.5 === txresp -hdr \"Bar: foo\" -body \"foobar\"
 **** s1    0.5 txresp|HTTP/1.1 200 OK\r
 **** s1    0.5 txresp|Bar: foo\r
 **** s1    0.5 txresp|Content-Length: 6\r
@@ -2320,11 +2320,11 @@ FAIL tests/c00094.vtc (exit status: 2)
 ***  v1    0.6 CLI RX  200
 **** v1    0.6 CLI RX|127.0.0.1 46857
 **** v1    0.6 CLI TX|debug.xid 999
-**** v1    0.6 vsl|          0 CLI             - Rd vcl.load "vcl1" vcl_vcl1.1546519298.832932949/vgc.so 1auto
+**** v1    0.6 vsl|          0 CLI             - Rd vcl.load \"vcl1\" vcl_vcl1.1546519298.832932949/vgc.so 1auto
 **** v1    0.6 vsl|          0 Backend_health  - (null) Went sick -------H 2 3 8 0.000000 0.000000 
 **** v1    0.6 vsl|          0 Backend_health  - vcl1.foo Still sick -------H 2 3 8 0.000000 0.000000 
-**** v1    0.6 vsl|          0 CLI             - Wr 200 55 Loaded "vcl_vcl1.1546519298.832932949/vgc.so" as "vcl1"
-**** v1    0.6 vsl|          0 CLI             - Rd vcl.use "vcl1"
+**** v1    0.6 vsl|          0 CLI             - Wr 200 55 Loaded \"vcl_vcl1.1546519298.832932949/vgc.so\" as \"vcl1\"
+**** v1    0.6 vsl|          0 CLI             - Rd vcl.use \"vcl1\"
 **** v1    0.6 vsl|          0 CLI             - Wr 200 0 
 **** v1    0.6 vsl|          0 CLI             - Rd start
 **** v1    0.6 vsl|          0 CLI             - Wr 200 0 
@@ -2346,9 +2346,9 @@ FAIL tests/c00094.vtc (exit status: 2)
 **** s1    0.6 http[ 3] |Host: 0.0.0.0
 **** s1    0.6 http[ 4] |Connection: close
 **** s1    0.6 bodylen = 0
-**   s1    0.6 === expect req.url == "/"
-**** s1    0.6 EXPECT req.url (/) == "/" match
-**   s1    0.6 === txresp -hdr "Bar: foo" -body "foobar"
+**   s1    0.6 === expect req.url == \"/\"
+**** s1    0.6 EXPECT req.url (/) == \"/\" match
+**   s1    0.6 === txresp -hdr \"Bar: foo\" -body \"foobar\"
 **** s1    0.6 txresp|HTTP/1.1 200 OK\r
 **** s1    0.6 txresp|Bar: foo\r
 **** s1    0.6 txresp|Content-Length: 6\r
@@ -2387,9 +2387,9 @@ FAIL tests/c00094.vtc (exit status: 2)
 **** s1    0.7 http[ 3] |Host: 0.0.0.0
 **** s1    0.7 http[ 4] |Connection: close
 **** s1    0.7 bodylen = 0
-**   s1    0.7 === expect req.url == "/"
-**** s1    0.7 EXPECT req.url (/) == "/" match
-**   s1    0.7 === txresp -hdr "Bar: foo" -body "foobar"
+**   s1    0.7 === expect req.url == \"/\"
+**** s1    0.7 EXPECT req.url (/) == \"/\" match
+**   s1    0.7 === txresp -hdr \"Bar: foo\" -body \"foobar\"
 **** s1    0.7 txresp|HTTP/1.1 200 OK\r
 **** s1    0.7 txresp|Bar: foo\r
 **** s1    0.7 txresp|Content-Length: 6\r
@@ -2412,9 +2412,9 @@ FAIL tests/c00094.vtc (exit status: 2)
 **** s1    0.8 http[ 3] |Host: 0.0.0.0
 **** s1    0.8 http[ 4] |Connection: close
 **** s1    0.8 bodylen = 0
-**   s1    0.8 === expect req.url == "/"
-**** s1    0.8 EXPECT req.url (/) == "/" match
-**   s1    0.8 === txresp -hdr "Bar: foo" -body "foobar"
+**   s1    0.8 === expect req.url == \"/\"
+**** s1    0.8 EXPECT req.url (/) == \"/\" match
+**   s1    0.8 === txresp -hdr \"Bar: foo\" -body \"foobar\"
 **** s1    0.8 txresp|HTTP/1.1 200 OK\r
 **** s1    0.8 txresp|Bar: foo\r
 **** s1    0.8 txresp|Content-Length: 6\r
@@ -2437,9 +2437,9 @@ FAIL tests/c00094.vtc (exit status: 2)
 **** s1    0.9 http[ 3] |Host: 0.0.0.0
 **** s1    0.9 http[ 4] |Connection: close
 **** s1    0.9 bodylen = 0
-**   s1    0.9 === expect req.url == "/"
-**** s1    0.9 EXPECT req.url (/) == "/" match
-**   s1    0.9 === txresp -hdr "Bar: foo" -body "foobar"
+**   s1    0.9 === expect req.url == \"/\"
+**** s1    0.9 EXPECT req.url (/) == \"/\" match
+**   s1    0.9 === txresp -hdr \"Bar: foo\" -body \"foobar\"
 **** s1    0.9 txresp|HTTP/1.1 200 OK\r
 **** s1    0.9 txresp|Bar: foo\r
 **** s1    0.9 txresp|Content-Length: 6\r
@@ -2462,9 +2462,9 @@ FAIL tests/c00094.vtc (exit status: 2)
 **** s1    1.0 http[ 3] |Host: 0.0.0.0
 **** s1    1.0 http[ 4] |Connection: close
 **** s1    1.0 bodylen = 0
-**   s1    1.0 === expect req.url == "/"
-**** s1    1.0 EXPECT req.url (/) == "/" match
-**   s1    1.0 === txresp -hdr "Bar: foo" -body "foobar"
+**   s1    1.0 === expect req.url == \"/\"
+**** s1    1.0 EXPECT req.url (/) == \"/\" match
+**   s1    1.0 === txresp -hdr \"Bar: foo\" -body \"foobar\"
 **** s1    1.0 txresp|HTTP/1.1 200 OK\r
 **** s1    1.0 txresp|Bar: foo\r
 **** s1    1.0 txresp|Content-Length: 6\r
@@ -2487,9 +2487,9 @@ FAIL tests/c00094.vtc (exit status: 2)
 **** s1    1.1 http[ 3] |Host: 0.0.0.0
 **** s1    1.1 http[ 4] |Connection: close
 **** s1    1.1 bodylen = 0
-**   s1    1.1 === expect req.url == "/"
-**** s1    1.1 EXPECT req.url (/) == "/" match
-**   s1    1.1 === txresp -hdr "Bar: foo" -body "foobar"
+**   s1    1.1 === expect req.url == \"/\"
+**** s1    1.1 EXPECT req.url (/) == \"/\" match
+**   s1    1.1 === txresp -hdr \"Bar: foo\" -body \"foobar\"
 **** s1    1.1 txresp|HTTP/1.1 200 OK\r
 **** s1    1.1 txresp|Bar: foo\r
 **** s1    1.1 txresp|Content-Length: 6\r
@@ -2512,9 +2512,9 @@ FAIL tests/c00094.vtc (exit status: 2)
 **** s1    1.2 http[ 3] |Host: 0.0.0.0
 **** s1    1.2 http[ 4] |Connection: close
 **** s1    1.2 bodylen = 0
-**   s1    1.2 === expect req.url == "/"
-**** s1    1.2 EXPECT req.url (/) == "/" match
-**   s1    1.2 === txresp -hdr "Bar: foo" -body "foobar"
+**   s1    1.2 === expect req.url == \"/\"
+**** s1    1.2 EXPECT req.url (/) == \"/\" match
+**   s1    1.2 === txresp -hdr \"Bar: foo\" -body \"foobar\"
 **** s1    1.2 txresp|HTTP/1.1 200 OK\r
 **** s1    1.2 txresp|Bar: foo\r
 **** s1    1.2 txresp|Content-Length: 6\r
@@ -2538,9 +2538,9 @@ FAIL tests/c00094.vtc (exit status: 2)
 **** s1    1.3 http[ 3] |Host: 0.0.0.0
 **** s1    1.3 http[ 4] |Connection: close
 **** s1    1.3 bodylen = 0
-**   s1    1.3 === expect req.url == "/"
-**** s1    1.3 EXPECT req.url (/) == "/" match
-**   s1    1.3 === txresp -status 404 -hdr "Bar: foo" -body "foobar"
+**   s1    1.3 === expect req.url == \"/\"
+**** s1    1.3 EXPECT req.url (/) == \"/\" match
+**   s1    1.3 === txresp -status 404 -hdr \"Bar: foo\" -body \"foobar\"
 **** s1    1.3 txresp|HTTP/1.1 404 OK\r
 **** s1    1.3 txresp|Bar: foo\r
 **** s1    1.3 txresp|Content-Length: 6\r
@@ -2563,9 +2563,9 @@ FAIL tests/c00094.vtc (exit status: 2)
 **** s1    1.4 http[ 3] |Host: 0.0.0.0
 **** s1    1.4 http[ 4] |Connection: close
 **** s1    1.4 bodylen = 0
-**   s1    1.4 === expect req.url == "/"
-**** s1    1.4 EXPECT req.url (/) == "/" match
-**   s1    1.4 === txresp -status 404 -hdr "Bar: foo" -body "foobar"
+**   s1    1.4 === expect req.url == \"/\"
+**** s1    1.4 EXPECT req.url (/) == \"/\" match
+**   s1    1.4 === txresp -status 404 -hdr \"Bar: foo\" -body \"foobar\"
 **** s1    1.4 txresp|HTTP/1.1 404 OK\r
 **** s1    1.4 txresp|Bar: foo\r
 **** s1    1.4 txresp|Content-Length: 6\r
@@ -2588,9 +2588,9 @@ FAIL tests/c00094.vtc (exit status: 2)
 **** s1    1.5 http[ 3] |Host: 0.0.0.0
 **** s1    1.5 http[ 4] |Connection: close
 **** s1    1.5 bodylen = 0
-**   s1    1.5 === expect req.url == "/"
-**** s1    1.5 EXPECT req.url (/) == "/" match
-**   s1    1.5 === txresp -status 404 -hdr "Bar: foo" -body "foobar"
+**   s1    1.5 === expect req.url == \"/\"
+**** s1    1.5 EXPECT req.url (/) == \"/\" match
+**   s1    1.5 === txresp -status 404 -hdr \"Bar: foo\" -body \"foobar\"
 **** s1    1.5 txresp|HTTP/1.1 404 OK\r
 **** s1    1.5 txresp|Bar: foo\r
 **** s1    1.5 txresp|Content-Length: 6\r
@@ -2614,9 +2614,9 @@ FAIL tests/c00094.vtc (exit status: 2)
 **** s1    1.6 http[ 3] |Host: 0.0.0.0
 **** s1    1.6 http[ 4] |Connection: close
 **** s1    1.6 bodylen = 0
-**   s1    1.6 === expect req.url == "/"
-**** s1    1.6 EXPECT req.url (/) == "/" match
-**   s1    1.6 === txresp -proto "FROBOZ" -status 200 -hdr "Bar: foo" -body "fo...
+**   s1    1.6 === expect req.url == \"/\"
+**** s1    1.6 EXPECT req.url (/) == \"/\" match
+**   s1    1.6 === txresp -proto \"FROBOZ\" -status 200 -hdr \"Bar: foo\" -body \"fo...
 **** s1    1.6 txresp|FROBOZ 200 OK\r
 **** s1    1.6 txresp|Bar: foo\r
 **** s1    1.6 txresp|Content-Length: 6\r
@@ -2639,9 +2639,9 @@ FAIL tests/c00094.vtc (exit status: 2)
 **** s1    1.7 http[ 3] |Host: 0.0.0.0
 **** s1    1.7 http[ 4] |Connection: close
 **** s1    1.7 bodylen = 0
-**   s1    1.7 === expect req.url == "/"
-**** s1    1.7 EXPECT req.url (/) == "/" match
-**   s1    1.7 === txresp -proto "FROBOZ" -status 200 -hdr "Bar: foo" -body "fo...
+**   s1    1.7 === expect req.url == \"/\"
+**** s1    1.7 EXPECT req.url (/) == \"/\" match
+**   s1    1.7 === txresp -proto \"FROBOZ\" -status 200 -hdr \"Bar: foo\" -body \"fo...
 **** s1    1.7 txresp|FROBOZ 200 OK\r
 **** s1    1.7 txresp|Bar: foo\r
 **** s1    1.7 txresp|Content-Length: 6\r
@@ -2665,9 +2665,9 @@ FAIL tests/c00094.vtc (exit status: 2)
 **** s1    1.8 http[ 3] |Host: 0.0.0.0
 **** s1    1.8 http[ 4] |Connection: close
 **** s1    1.8 bodylen = 0
-**   s1    1.8 === expect req.url == "/"
-**** s1    1.8 EXPECT req.url (/) == "/" match
-**   s1    1.8 === send "HTTP/1.1 200 \r\n"
+**   s1    1.8 === expect req.url == \"/\"
+**** s1    1.8 EXPECT req.url (/) == \"/\" match
+**   s1    1.8 === send \"HTTP/1.1 200 \r\n\"
 **** s1    1.8 send|HTTP/1.1 200 \r
 **   s1    1.8 === accept
 **** s1    1.8 Accepting
@@ -2686,9 +2686,9 @@ FAIL tests/c00094.vtc (exit status: 2)
 **** s1    1.9 http[ 3] |Host: 0.0.0.0
 **** s1    1.9 http[ 4] |Connection: close
 **** s1    1.9 bodylen = 0
-**   s1    1.9 === expect req.url == "/"
-**** s1    1.9 EXPECT req.url (/) == "/" match
-**   s1    1.9 === send "HTTP/1.1 200 \r\n"
+**   s1    1.9 === expect req.url == \"/\"
+**** s1    1.9 EXPECT req.url (/) == \"/\" match
+**   s1    1.9 === send \"HTTP/1.1 200 \r\n\"
 **** s1    1.9 send|HTTP/1.1 200 \r
 **   s1    1.9 === accept
 **** s1    1.9 Accepting
@@ -2698,7 +2698,7 @@ FAIL tests/c00094.vtc (exit status: 2)
 **** s1    2.0 Barrier(b1) wake 2
 ***  s1    2.0 shutting fd 5
 **   s1    2.0 Ending
-**   top   2.0 === varnish v1 -cliexpect "^CLI RX|  -+U+ Good UNIX" "backend.li...
+**   top   2.0 === varnish v1 -cliexpect \"^CLI RX|  -+U+ Good UNIX\" \"backend.li...
 **** v1    2.0 CLI TX|backend.list -p denes
 ***  v1    2.0 CLI RX  200
 **** v1    2.0 CLI RX|Backend name                   Admin      Probe                Last updated
@@ -2725,10 +2725,10 @@ FAIL tests/c00094.vtc (exit status: 2)
 *    top   3.1 TEST ./tests/c00094.vtc FAILED
 #    top  TEST ./tests/c00094.vtc FAILED (3.079) exit=2
 FAIL tests/c00094.vtc (exit status: 2)
-				"></failure>
+				\"></failure>
 			<failure
-				type=":copy-in-global-log: yes"
-				message="
+				type=\":copy-in-global-log: yes\"
+				message=\"
 **** top   0.0 extmacro def pwd=/home/dmatetelki/p/varnish-cache-plus/bin/varnishtest
 **** top   0.0 extmacro def topsrc=/home/dmatetelki/p/varnish-cache-plus
 **** top   0.0 extmacro def localhost=127.0.0.1
@@ -2738,10 +2738,10 @@ FAIL tests/c00094.vtc (exit status: 2)
 **** top   0.0 macro def testdir=/home/dmatetelki/p/varnish-cache-plus/bin/varnishtest/./tests
 **** top   0.0 macro def tmpdir=/tmp/vtc.14817.4cbfd8c0
 *    top   0.0 TEST ./tests/c00094.vtc starting
-**   top   0.0 === varnishtest "Test Backend Polling with a backend listening a...
+**   top   0.0 === varnishtest \"Test Backend Polling with a backend listening a...
 *    top   0.0 TEST Test Backend Polling with a backend listening at a UDS
 **   top   0.0 === barrier b1 cond 2
-**   top   0.0 === server s1 -listen "${tmpdir}/s1.sock" {
+**   top   0.0 === server s1 -listen \"${tmpdir}/s1.sock\" {
 **   s1    0.0 Starting server
 **** s1    0.0 macro def s1_addr=0.0.0.0
 **** s1    0.0 macro def s1_port=0
@@ -2790,7 +2790,7 @@ FAIL tests/c00094.vtc (exit status: 2)
 **** v1    0.2 CLI TX|
 **** v1    0.2 CLI TX|
 **** v1    0.2 CLI TX|\tbackend foo {
-**** v1    0.2 CLI TX|\t\t.path = "/tmp/vtc.14817.4cbfd8c0/s1.sock";
+**** v1    0.2 CLI TX|\t\t.path = \"/tmp/vtc.14817.4cbfd8c0/s1.sock\";
 **** v1    0.2 CLI TX|\t\t.probe = {
 **** v1    0.2 CLI TX|\t\t\t.timeout = 1 s;
 **** v1    0.2 CLI TX|\t\t\t.interval = 0.1 s;
@@ -2827,9 +2827,9 @@ FAIL tests/c00094.vtc (exit status: 2)
 **** s1    0.5 http[ 3] |Host: 0.0.0.0
 **** s1    0.5 http[ 4] |Connection: close
 **** s1    0.5 bodylen = 0
-**   s1    0.5 === expect req.url == "/"
-**** s1    0.5 EXPECT req.url (/) == "/" match
-**   s1    0.5 === txresp -hdr "Bar: foo" -body "foobar"
+**   s1    0.5 === expect req.url == \"/\"
+**** s1    0.5 EXPECT req.url (/) == \"/\" match
+**   s1    0.5 === txresp -hdr \"Bar: foo\" -body \"foobar\"
 **** s1    0.5 txresp|HTTP/1.1 200 OK\r
 **** s1    0.5 txresp|Bar: foo\r
 **** s1    0.5 txresp|Content-Length: 6\r
@@ -2843,11 +2843,11 @@ FAIL tests/c00094.vtc (exit status: 2)
 ***  v1    0.6 CLI RX  200
 **** v1    0.6 CLI RX|127.0.0.1 46857
 **** v1    0.6 CLI TX|debug.xid 999
-**** v1    0.6 vsl|          0 CLI             - Rd vcl.load "vcl1" vcl_vcl1.1546519298.832932949/vgc.so 1auto
+**** v1    0.6 vsl|          0 CLI             - Rd vcl.load \"vcl1\" vcl_vcl1.1546519298.832932949/vgc.so 1auto
 **** v1    0.6 vsl|          0 Backend_health  - (null) Went sick -------H 2 3 8 0.000000 0.000000 
 **** v1    0.6 vsl|          0 Backend_health  - vcl1.foo Still sick -------H 2 3 8 0.000000 0.000000 
-**** v1    0.6 vsl|          0 CLI             - Wr 200 55 Loaded "vcl_vcl1.1546519298.832932949/vgc.so" as "vcl1"
-**** v1    0.6 vsl|          0 CLI             - Rd vcl.use "vcl1"
+**** v1    0.6 vsl|          0 CLI             - Wr 200 55 Loaded \"vcl_vcl1.1546519298.832932949/vgc.so\" as \"vcl1\"
+**** v1    0.6 vsl|          0 CLI             - Rd vcl.use \"vcl1\"
 **** v1    0.6 vsl|          0 CLI             - Wr 200 0 
 **** v1    0.6 vsl|          0 CLI             - Rd start
 **** v1    0.6 vsl|          0 CLI             - Wr 200 0 
@@ -2869,9 +2869,9 @@ FAIL tests/c00094.vtc (exit status: 2)
 **** s1    0.6 http[ 3] |Host: 0.0.0.0
 **** s1    0.6 http[ 4] |Connection: close
 **** s1    0.6 bodylen = 0
-**   s1    0.6 === expect req.url == "/"
-**** s1    0.6 EXPECT req.url (/) == "/" match
-**   s1    0.6 === txresp -hdr "Bar: foo" -body "foobar"
+**   s1    0.6 === expect req.url == \"/\"
+**** s1    0.6 EXPECT req.url (/) == \"/\" match
+**   s1    0.6 === txresp -hdr \"Bar: foo\" -body \"foobar\"
 **** s1    0.6 txresp|HTTP/1.1 200 OK\r
 **** s1    0.6 txresp|Bar: foo\r
 **** s1    0.6 txresp|Content-Length: 6\r
@@ -2910,9 +2910,9 @@ FAIL tests/c00094.vtc (exit status: 2)
 **** s1    0.7 http[ 3] |Host: 0.0.0.0
 **** s1    0.7 http[ 4] |Connection: close
 **** s1    0.7 bodylen = 0
-**   s1    0.7 === expect req.url == "/"
-**** s1    0.7 EXPECT req.url (/) == "/" match
-**   s1    0.7 === txresp -hdr "Bar: foo" -body "foobar"
+**   s1    0.7 === expect req.url == \"/\"
+**** s1    0.7 EXPECT req.url (/) == \"/\" match
+**   s1    0.7 === txresp -hdr \"Bar: foo\" -body \"foobar\"
 **** s1    0.7 txresp|HTTP/1.1 200 OK\r
 **** s1    0.7 txresp|Bar: foo\r
 **** s1    0.7 txresp|Content-Length: 6\r
@@ -2935,9 +2935,9 @@ FAIL tests/c00094.vtc (exit status: 2)
 **** s1    0.8 http[ 3] |Host: 0.0.0.0
 **** s1    0.8 http[ 4] |Connection: close
 **** s1    0.8 bodylen = 0
-**   s1    0.8 === expect req.url == "/"
-**** s1    0.8 EXPECT req.url (/) == "/" match
-**   s1    0.8 === txresp -hdr "Bar: foo" -body "foobar"
+**   s1    0.8 === expect req.url == \"/\"
+**** s1    0.8 EXPECT req.url (/) == \"/\" match
+**   s1    0.8 === txresp -hdr \"Bar: foo\" -body \"foobar\"
 **** s1    0.8 txresp|HTTP/1.1 200 OK\r
 **** s1    0.8 txresp|Bar: foo\r
 **** s1    0.8 txresp|Content-Length: 6\r
@@ -2960,9 +2960,9 @@ FAIL tests/c00094.vtc (exit status: 2)
 **** s1    0.9 http[ 3] |Host: 0.0.0.0
 **** s1    0.9 http[ 4] |Connection: close
 **** s1    0.9 bodylen = 0
-**   s1    0.9 === expect req.url == "/"
-**** s1    0.9 EXPECT req.url (/) == "/" match
-**   s1    0.9 === txresp -hdr "Bar: foo" -body "foobar"
+**   s1    0.9 === expect req.url == \"/\"
+**** s1    0.9 EXPECT req.url (/) == \"/\" match
+**   s1    0.9 === txresp -hdr \"Bar: foo\" -body \"foobar\"
 **** s1    0.9 txresp|HTTP/1.1 200 OK\r
 **** s1    0.9 txresp|Bar: foo\r
 **** s1    0.9 txresp|Content-Length: 6\r
@@ -2985,9 +2985,9 @@ FAIL tests/c00094.vtc (exit status: 2)
 **** s1    1.0 http[ 3] |Host: 0.0.0.0
 **** s1    1.0 http[ 4] |Connection: close
 **** s1    1.0 bodylen = 0
-**   s1    1.0 === expect req.url == "/"
-**** s1    1.0 EXPECT req.url (/) == "/" match
-**   s1    1.0 === txresp -hdr "Bar: foo" -body "foobar"
+**   s1    1.0 === expect req.url == \"/\"
+**** s1    1.0 EXPECT req.url (/) == \"/\" match
+**   s1    1.0 === txresp -hdr \"Bar: foo\" -body \"foobar\"
 **** s1    1.0 txresp|HTTP/1.1 200 OK\r
 **** s1    1.0 txresp|Bar: foo\r
 **** s1    1.0 txresp|Content-Length: 6\r
@@ -3010,9 +3010,9 @@ FAIL tests/c00094.vtc (exit status: 2)
 **** s1    1.1 http[ 3] |Host: 0.0.0.0
 **** s1    1.1 http[ 4] |Connection: close
 **** s1    1.1 bodylen = 0
-**   s1    1.1 === expect req.url == "/"
-**** s1    1.1 EXPECT req.url (/) == "/" match
-**   s1    1.1 === txresp -hdr "Bar: foo" -body "foobar"
+**   s1    1.1 === expect req.url == \"/\"
+**** s1    1.1 EXPECT req.url (/) == \"/\" match
+**   s1    1.1 === txresp -hdr \"Bar: foo\" -body \"foobar\"
 **** s1    1.1 txresp|HTTP/1.1 200 OK\r
 **** s1    1.1 txresp|Bar: foo\r
 **** s1    1.1 txresp|Content-Length: 6\r
@@ -3035,9 +3035,9 @@ FAIL tests/c00094.vtc (exit status: 2)
 **** s1    1.2 http[ 3] |Host: 0.0.0.0
 **** s1    1.2 http[ 4] |Connection: close
 **** s1    1.2 bodylen = 0
-**   s1    1.2 === expect req.url == "/"
-**** s1    1.2 EXPECT req.url (/) == "/" match
-**   s1    1.2 === txresp -hdr "Bar: foo" -body "foobar"
+**   s1    1.2 === expect req.url == \"/\"
+**** s1    1.2 EXPECT req.url (/) == \"/\" match
+**   s1    1.2 === txresp -hdr \"Bar: foo\" -body \"foobar\"
 **** s1    1.2 txresp|HTTP/1.1 200 OK\r
 **** s1    1.2 txresp|Bar: foo\r
 **** s1    1.2 txresp|Content-Length: 6\r
@@ -3061,9 +3061,9 @@ FAIL tests/c00094.vtc (exit status: 2)
 **** s1    1.3 http[ 3] |Host: 0.0.0.0
 **** s1    1.3 http[ 4] |Connection: close
 **** s1    1.3 bodylen = 0
-**   s1    1.3 === expect req.url == "/"
-**** s1    1.3 EXPECT req.url (/) == "/" match
-**   s1    1.3 === txresp -status 404 -hdr "Bar: foo" -body "foobar"
+**   s1    1.3 === expect req.url == \"/\"
+**** s1    1.3 EXPECT req.url (/) == \"/\" match
+**   s1    1.3 === txresp -status 404 -hdr \"Bar: foo\" -body \"foobar\"
 **** s1    1.3 txresp|HTTP/1.1 404 OK\r
 **** s1    1.3 txresp|Bar: foo\r
 **** s1    1.3 txresp|Content-Length: 6\r
@@ -3086,9 +3086,9 @@ FAIL tests/c00094.vtc (exit status: 2)
 **** s1    1.4 http[ 3] |Host: 0.0.0.0
 **** s1    1.4 http[ 4] |Connection: close
 **** s1    1.4 bodylen = 0
-**   s1    1.4 === expect req.url == "/"
-**** s1    1.4 EXPECT req.url (/) == "/" match
-**   s1    1.4 === txresp -status 404 -hdr "Bar: foo" -body "foobar"
+**   s1    1.4 === expect req.url == \"/\"
+**** s1    1.4 EXPECT req.url (/) == \"/\" match
+**   s1    1.4 === txresp -status 404 -hdr \"Bar: foo\" -body \"foobar\"
 **** s1    1.4 txresp|HTTP/1.1 404 OK\r
 **** s1    1.4 txresp|Bar: foo\r
 **** s1    1.4 txresp|Content-Length: 6\r
@@ -3111,9 +3111,9 @@ FAIL tests/c00094.vtc (exit status: 2)
 **** s1    1.5 http[ 3] |Host: 0.0.0.0
 **** s1    1.5 http[ 4] |Connection: close
 **** s1    1.5 bodylen = 0
-**   s1    1.5 === expect req.url == "/"
-**** s1    1.5 EXPECT req.url (/) == "/" match
-**   s1    1.5 === txresp -status 404 -hdr "Bar: foo" -body "foobar"
+**   s1    1.5 === expect req.url == \"/\"
+**** s1    1.5 EXPECT req.url (/) == \"/\" match
+**   s1    1.5 === txresp -status 404 -hdr \"Bar: foo\" -body \"foobar\"
 **** s1    1.5 txresp|HTTP/1.1 404 OK\r
 **** s1    1.5 txresp|Bar: foo\r
 **** s1    1.5 txresp|Content-Length: 6\r
@@ -3137,9 +3137,9 @@ FAIL tests/c00094.vtc (exit status: 2)
 **** s1    1.6 http[ 3] |Host: 0.0.0.0
 **** s1    1.6 http[ 4] |Connection: close
 **** s1    1.6 bodylen = 0
-**   s1    1.6 === expect req.url == "/"
-**** s1    1.6 EXPECT req.url (/) == "/" match
-**   s1    1.6 === txresp -proto "FROBOZ" -status 200 -hdr "Bar: foo" -body "fo...
+**   s1    1.6 === expect req.url == \"/\"
+**** s1    1.6 EXPECT req.url (/) == \"/\" match
+**   s1    1.6 === txresp -proto \"FROBOZ\" -status 200 -hdr \"Bar: foo\" -body \"fo...
 **** s1    1.6 txresp|FROBOZ 200 OK\r
 **** s1    1.6 txresp|Bar: foo\r
 **** s1    1.6 txresp|Content-Length: 6\r
@@ -3162,9 +3162,9 @@ FAIL tests/c00094.vtc (exit status: 2)
 **** s1    1.7 http[ 3] |Host: 0.0.0.0
 **** s1    1.7 http[ 4] |Connection: close
 **** s1    1.7 bodylen = 0
-**   s1    1.7 === expect req.url == "/"
-**** s1    1.7 EXPECT req.url (/) == "/" match
-**   s1    1.7 === txresp -proto "FROBOZ" -status 200 -hdr "Bar: foo" -body "fo...
+**   s1    1.7 === expect req.url == \"/\"
+**** s1    1.7 EXPECT req.url (/) == \"/\" match
+**   s1    1.7 === txresp -proto \"FROBOZ\" -status 200 -hdr \"Bar: foo\" -body \"fo...
 **** s1    1.7 txresp|FROBOZ 200 OK\r
 **** s1    1.7 txresp|Bar: foo\r
 **** s1    1.7 txresp|Content-Length: 6\r
@@ -3188,9 +3188,9 @@ FAIL tests/c00094.vtc (exit status: 2)
 **** s1    1.8 http[ 3] |Host: 0.0.0.0
 **** s1    1.8 http[ 4] |Connection: close
 **** s1    1.8 bodylen = 0
-**   s1    1.8 === expect req.url == "/"
-**** s1    1.8 EXPECT req.url (/) == "/" match
-**   s1    1.8 === send "HTTP/1.1 200 \r\n"
+**   s1    1.8 === expect req.url == \"/\"
+**** s1    1.8 EXPECT req.url (/) == \"/\" match
+**   s1    1.8 === send \"HTTP/1.1 200 \r\n\"
 **** s1    1.8 send|HTTP/1.1 200 \r
 **   s1    1.8 === accept
 **** s1    1.8 Accepting
@@ -3209,9 +3209,9 @@ FAIL tests/c00094.vtc (exit status: 2)
 **** s1    1.9 http[ 3] |Host: 0.0.0.0
 **** s1    1.9 http[ 4] |Connection: close
 **** s1    1.9 bodylen = 0
-**   s1    1.9 === expect req.url == "/"
-**** s1    1.9 EXPECT req.url (/) == "/" match
-**   s1    1.9 === send "HTTP/1.1 200 \r\n"
+**   s1    1.9 === expect req.url == \"/\"
+**** s1    1.9 EXPECT req.url (/) == \"/\" match
+**   s1    1.9 === send \"HTTP/1.1 200 \r\n\"
 **** s1    1.9 send|HTTP/1.1 200 \r
 **   s1    1.9 === accept
 **** s1    1.9 Accepting
@@ -3221,7 +3221,7 @@ FAIL tests/c00094.vtc (exit status: 2)
 **** s1    2.0 Barrier(b1) wake 2
 ***  s1    2.0 shutting fd 5
 **   s1    2.0 Ending
-**   top   2.0 === varnish v1 -cliexpect "^CLI RX|  -+U+ Good UNIX" "backend.li...
+**   top   2.0 === varnish v1 -cliexpect \"^CLI RX|  -+U+ Good UNIX\" \"backend.li...
 **** v1    2.0 CLI TX|backend.list -p denes
 ***  v1    2.0 CLI RX  200
 **** v1    2.0 CLI RX|Backend name                   Admin      Probe                Last updated