[master] 857cdae White-space cleanup of test-cases

[Poul-Henning Kamp]

commit 857cdaebc929ebbcf36c8805c94a2ea6a0268669
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Fri Nov 8 10:43:14 2013 +0000

    White-space cleanup of test-cases

diff --git a/bin/varnishtest/tests.disabled/r00693.vtc b/bin/varnishtest/tests.disabled/r00693.vtc
index ff99ca7..bf94f6b 100644
--- a/bin/varnishtest/tests.disabled/r00693.vtc
+++ b/bin/varnishtest/tests.disabled/r00693.vtc
@@ -20,7 +20,7 @@ server s1 {
 varnish v1 -arg "-p workspace_client=3072" -vcl+backend {
 
 	sub vcl_recv {
-		set req.http.foo = 
+		set req.http.foo =
 			req.http.bar +
 			"0123456789abcdef" + "0123456789abcdef" +
 			"0123456789abcdef" + "0123456789abcdef" +
@@ -47,18 +47,18 @@ varnish v1 -arg "-p workspace_client=3072" -vcl+backend {
 
 client c1 {
 	# This should soak up all bytes but the last in the workspace
-	txreq -hdr "foo: x" -hdr "bar: A" 
+	txreq -hdr "foo: x" -hdr "bar: A"
 	rxresp
 	expect resp.status == 201
 
 	# This should soak up all bytes in the workspace
-	txreq -hdr "foo: x" -hdr "bar: AB" 
+	txreq -hdr "foo: x" -hdr "bar: AB"
 	rxresp
 	expect resp.status == 202
 
 	# This overcommits the workspace, failing the "bar" set,
 	# Thus allowing the "baz" set to work.
-	txreq -hdr "foo: x" -hdr "bar: ABC" 
+	txreq -hdr "foo: x" -hdr "bar: ABC"
 	rxresp
 	expect resp.status == 203
 
diff --git a/bin/varnishtest/tests.disabled/r00980.vtc b/bin/varnishtest/tests.disabled/r00980.vtc
index f14113f..006de3e 100644
--- a/bin/varnishtest/tests.disabled/r00980.vtc
+++ b/bin/varnishtest/tests.disabled/r00980.vtc
@@ -22,7 +22,7 @@ client c1 {
 	gunzip
 	expect resp.bodylen == 43
 
-	txreq -url /foobar 
+	txreq -url /foobar
 	rxresp
 	expect resp.http.content-encoding == <undef>
 	expect resp.bodylen == 43
diff --git a/bin/varnishtest/tests.disabled/t00000.vtc b/bin/varnishtest/tests.disabled/t00000.vtc
index cc47769..7dd5818 100644
--- a/bin/varnishtest/tests.disabled/t00000.vtc
+++ b/bin/varnishtest/tests.disabled/t00000.vtc
@@ -1,7 +1,7 @@
 varnishtest "Ticket #873"
 
 server s1 {
-	rxreq 
+	rxreq
 	txresp -nolen -hdr "Transfer-encoding: chunked"
 	chunked "<1>------------------------<1>\n"
 	sema r1 sync 2
@@ -18,7 +18,7 @@ varnish v1 -vcl+backend {
 	sub vcl_backend_response {
 		set beresp.do_stream = true;
 	}
-} -start 
+} -start
 
 varnish v1 -cliok "param.set debug +req_state"
 
diff --git a/bin/varnishtest/tests.disabled/t00001.vtc b/bin/varnishtest/tests.disabled/t00001.vtc
index f6a3944..4250b1a 100644
--- a/bin/varnishtest/tests.disabled/t00001.vtc
+++ b/bin/varnishtest/tests.disabled/t00001.vtc
@@ -31,20 +31,20 @@ varnish v1 -vcl+backend {
 		}
 		set beresp.do_stream = true;
 	}
-} -start 
+} -start
 
 client c1 {
 	txreq  -url /bar
-	rxresp 
+	rxresp
 	expect resp.http.content-length == 6
 	expect resp.bodylen == 6
 	txreq  -url /bla
-	rxresp 
+	rxresp
 	expect resp.bodylen == 9
 	txreq  -url /foo
-	rxresp 
+	rxresp
 	expect resp.bodylen == 5
 	txreq  -url /barf
-	rxresp 
+	rxresp
 	expect resp.bodylen == 21
 } -run
diff --git a/bin/varnishtest/tests/a00000.vtc b/bin/varnishtest/tests/a00000.vtc
index d368014..ca02903 100644
--- a/bin/varnishtest/tests/a00000.vtc
+++ b/bin/varnishtest/tests/a00000.vtc
@@ -2,13 +2,13 @@ varnishtest "basic default HTTP transactions"
 
 server s1 {
 	rxreq
-	txresp 
+	txresp
 }
 
-server s1 -start 
+server s1 -start
 
 client c1 -connect ${s1_sock} {
-	txreq 
+	txreq
 	rxresp
 }
 
diff --git a/bin/varnishtest/tests/a00001.vtc b/bin/varnishtest/tests/a00001.vtc
index 0fc6de9..04106fe 100644
--- a/bin/varnishtest/tests/a00001.vtc
+++ b/bin/varnishtest/tests/a00001.vtc
@@ -5,13 +5,13 @@ server s1 {
 	expect req.method == GET
 	expect req.proto == HTTP/1.1
 	expect req.url == "/"
-	txresp 
+	txresp
 }
 
-server s1 -start 
+server s1 -start
 
 client c1 -connect ${s1_sock} {
-	txreq 
+	txreq
 	rxresp
 	expect resp.proto == HTTP/1.1
 	expect resp.status == 200
diff --git a/bin/varnishtest/tests/a00002.vtc b/bin/varnishtest/tests/a00002.vtc
index 4d0f3df..39b8334 100644
--- a/bin/varnishtest/tests/a00002.vtc
+++ b/bin/varnishtest/tests/a00002.vtc
@@ -8,7 +8,7 @@ server s1 {
 	txresp -proto HTTP/1.2 -status 201 -msg Foo
 }
 
-server s1 -start 
+server s1 -start
 
 client c1 -connect ${s1_sock} {
 	txreq -req PUT -proto HTTP/1.0 -url /foo
diff --git a/bin/varnishtest/tests/a00003.vtc b/bin/varnishtest/tests/a00003.vtc
index 4982730..f928a42 100644
--- a/bin/varnishtest/tests/a00003.vtc
+++ b/bin/varnishtest/tests/a00003.vtc
@@ -13,11 +13,11 @@ server s2 {
 	expect req.method == GET
 	expect req.proto == HTTP/1.1
 	expect req.url == "/"
-	txresp 
+	txresp
 }
 
-server s1 -start 
-server s2 -start 
+server s1 -start
+server s2 -start
 
 client c1 -connect ${s1_sock} {
 	txreq -req PUT -proto HTTP/1.0 -url /foo
@@ -28,7 +28,7 @@ client c1 -connect ${s1_sock} {
 }
 
 client c2 -connect ${s2_sock} {
-	txreq 
+	txreq
 	rxresp
 	expect resp.proto == HTTP/1.1
 	expect resp.status == 200
diff --git a/bin/varnishtest/tests/a00004.vtc b/bin/varnishtest/tests/a00004.vtc
index 7fbe476..85659ac 100644
--- a/bin/varnishtest/tests/a00004.vtc
+++ b/bin/varnishtest/tests/a00004.vtc
@@ -8,7 +8,7 @@ server s1 -repeat 2 {
 	txresp -proto HTTP/1.2 -status 201 -msg Foo
 }
 
-server s1 -start 
+server s1 -start
 
 client c1 -connect ${s1_sock} {
 	txreq -req PUT -proto HTTP/1.0 -url /foo
diff --git a/bin/varnishtest/tests/a00005.vtc b/bin/varnishtest/tests/a00005.vtc
index 38ae1cf..fcf4e58 100644
--- a/bin/varnishtest/tests/a00005.vtc
+++ b/bin/varnishtest/tests/a00005.vtc
@@ -13,11 +13,11 @@ server s2 {
 	expect req.method == GET
 	expect req.proto == HTTP/1.1
 	expect req.url == "/"
-	txresp 
+	txresp
 }
 
-server s1 -start 
-server s2 -start 
+server s1 -start
+server s2 -start
 
 client c1 -connect ${s1_sock} {
 	txreq -req PUT -proto HTTP/1.0 -url /foo
@@ -30,7 +30,7 @@ client c1 -connect ${s1_sock} {
 client c1 -run
 
 client c1 -connect ${s2_sock} {
-	txreq 
+	txreq
 	rxresp
 	expect resp.proto == HTTP/1.1
 	expect resp.status == 200
diff --git a/bin/varnishtest/tests/a00006.vtc b/bin/varnishtest/tests/a00006.vtc
index bcd272f..f8a928e 100644
--- a/bin/varnishtest/tests/a00006.vtc
+++ b/bin/varnishtest/tests/a00006.vtc
@@ -9,7 +9,7 @@ server s1 {
 		-body "987654321\n"
 }
 
-server s1 -start 
+server s1 -start
 
 client c1 -connect ${s1_sock} {
 	txreq -req PUT -proto HTTP/1.0 -url /foo \
diff --git a/bin/varnishtest/tests/a00007.vtc b/bin/varnishtest/tests/a00007.vtc
index 81d80af..5c7312d 100644
--- a/bin/varnishtest/tests/a00007.vtc
+++ b/bin/varnishtest/tests/a00007.vtc
@@ -9,7 +9,7 @@ server s1 {
 	txresp -body "987654321\n"
 }
 
-server s1 -start 
+server s1 -start
 
 client c1 -connect ${s1_sock} {
 	txreq -url "/1" -req "POST" -body "abcdefghi\n"
diff --git a/bin/varnishtest/tests/a00010.vtc b/bin/varnishtest/tests/a00010.vtc
index 1200a69..60b0234 100644
--- a/bin/varnishtest/tests/a00010.vtc
+++ b/bin/varnishtest/tests/a00010.vtc
@@ -4,16 +4,16 @@ server s1 {
         rxreq
 	expect req.url == "/"
 	txresp -body {a\0bc}
-} 
+}
 
-server s1 -start 
+server s1 -start
 
 client c1 -connect ${s1_sock} {
 
 	txreq
 	rxresp
 	expect resp.bodylen == 4
-} 
+}
 
 client c1 -run
 
diff --git a/bin/varnishtest/tests/b00000.vtc b/bin/varnishtest/tests/b00000.vtc
index 2e6d5ce..f514f2b 100644
--- a/bin/varnishtest/tests/b00000.vtc
+++ b/bin/varnishtest/tests/b00000.vtc
@@ -1,7 +1,7 @@
 varnishtest "Does anything get through at all ?"
 
 server s1 {
-	rxreq 
+	rxreq
 	txresp -body "012345\n"
 } -start
 
diff --git a/bin/varnishtest/tests/b00001.vtc b/bin/varnishtest/tests/b00001.vtc
index edec601..d48b9a0 100644
--- a/bin/varnishtest/tests/b00001.vtc
+++ b/bin/varnishtest/tests/b00001.vtc
@@ -1,7 +1,7 @@
 varnishtest "Check that a pipe transaction works"
 
 server s1 -repeat 1 {
-	rxreq 
+	rxreq
 	txresp -body "012345\n"
 } -start
 
diff --git a/bin/varnishtest/tests/b00002.vtc b/bin/varnishtest/tests/b00002.vtc
index 8bb7ad3..efa656a 100644
--- a/bin/varnishtest/tests/b00002.vtc
+++ b/bin/varnishtest/tests/b00002.vtc
@@ -1,7 +1,7 @@
 varnishtest "Check that a pass transaction works"
 
 server s1 {
-	rxreq 
+	rxreq
 	txresp -hdr "Connection: close" -body "012345\n"
 } -start
 
diff --git a/bin/varnishtest/tests/b00003.vtc b/bin/varnishtest/tests/b00003.vtc
index 55442b3..77b6972 100644
--- a/bin/varnishtest/tests/b00003.vtc
+++ b/bin/varnishtest/tests/b00003.vtc
@@ -1,11 +1,11 @@
 varnishtest "Check that a cache fetch + hit transaction works"
 
 server s1 {
-	rxreq 
+	rxreq
 	txresp -hdr "Connection: close" -body "012345\n"
 } -start
 
-varnish v1 -vcl+backend { } -start 
+varnish v1 -vcl+backend { } -start
 
 client c1 {
 	txreq -url "/"
diff --git a/bin/varnishtest/tests/b00004.vtc b/bin/varnishtest/tests/b00004.vtc
index 2a13a84..ec5cf76 100644
--- a/bin/varnishtest/tests/b00004.vtc
+++ b/bin/varnishtest/tests/b00004.vtc
@@ -4,7 +4,7 @@ server s1 {
 	rxreq
 } -start
 
-varnish v1 -vcl+backend { } 
+varnish v1 -vcl+backend { }
 
 varnish v1 -start
 varnish v1 -stop
diff --git a/bin/varnishtest/tests/b00005.vtc b/bin/varnishtest/tests/b00005.vtc
index 2824fc2..4f83cdc 100644
--- a/bin/varnishtest/tests/b00005.vtc
+++ b/bin/varnishtest/tests/b00005.vtc
@@ -1,11 +1,13 @@
 varnishtest "Check that -s works"
 
 server s1 {
-	rxreq 
+	rxreq
 	txresp -hdr "Connection: close" -body "012345\n"
 } -start
 
-varnish v1 -arg "-s file,${tmpdir}/varnishtest_backing,10M" -vcl+backend {}  -start
+varnish v1 \
+	-arg "-s file,${tmpdir}/varnishtest_backing,10M" \
+	-vcl+backend {} -start
 
 client c1 {
 	txreq -url "/"
diff --git a/bin/varnishtest/tests/b00006.vtc b/bin/varnishtest/tests/b00006.vtc
index aea0494..b7d1c8b 100644
--- a/bin/varnishtest/tests/b00006.vtc
+++ b/bin/varnishtest/tests/b00006.vtc
@@ -1,7 +1,7 @@
 varnishtest "Check that -s malloc works"
 
 server s1 {
-	rxreq 
+	rxreq
 	txresp -hdr "Connection: close" -body "012345\n"
 } -start
 
diff --git a/bin/varnishtest/tests/b00007.vtc b/bin/varnishtest/tests/b00007.vtc
index a07ae9e..a48fa3f 100644
--- a/bin/varnishtest/tests/b00007.vtc
+++ b/bin/varnishtest/tests/b00007.vtc
@@ -1,7 +1,7 @@
 varnishtest "Check chunked encoding from backend works"
 
 server s1 {
-	rxreq 
+	rxreq
 	expect req.url == "/bar"
 	send "HTTP/1.1 200 Ok\r\n"
 	send "Transfer-encoding: chunked\r\n"
@@ -10,7 +10,7 @@ server s1 {
 	send "00000000\r\n"
 	send "\r\n"
 
-	rxreq 
+	rxreq
 	expect req.url == "/foo"
 	send "HTTP/1.1 200 Ok\r\n"
 	send "Transfer-encoding: chunked\r\n"
diff --git a/bin/varnishtest/tests/b00008.vtc b/bin/varnishtest/tests/b00008.vtc
index 1ce9b64..dbadb1b 100644
--- a/bin/varnishtest/tests/b00008.vtc
+++ b/bin/varnishtest/tests/b00008.vtc
@@ -1,6 +1,6 @@
 varnishtest "Test CLI help and parameter functions"
 
-varnish v1 -arg "-b ${bad_ip}:9080" 
+varnish v1 -arg "-b ${bad_ip}:9080"
 
 varnish v1 -cliok "help"
 
diff --git a/bin/varnishtest/tests/b00009.vtc b/bin/varnishtest/tests/b00009.vtc
index 02a0b57..f30fd01 100644
--- a/bin/varnishtest/tests/b00009.vtc
+++ b/bin/varnishtest/tests/b00009.vtc
@@ -1,7 +1,7 @@
 varnishtest "Check poll acceptor"
 
 server s1 {
-	rxreq 
+	rxreq
 	txresp -hdr "Connection: close" -body "012345\n"
 } -start
 
diff --git a/bin/varnishtest/tests/b00010.vtc b/bin/varnishtest/tests/b00010.vtc
index 05b9e91..d3654dc 100644
--- a/bin/varnishtest/tests/b00010.vtc
+++ b/bin/varnishtest/tests/b00010.vtc
@@ -1,7 +1,7 @@
 varnishtest "Check simple list hasher"
 
 server s1 {
-	rxreq 
+	rxreq
 	txresp -hdr "Connection: close" -body "012345\n"
 } -start
 
diff --git a/bin/varnishtest/tests/b00011.vtc b/bin/varnishtest/tests/b00011.vtc
index 1e9ee74..bbd8cb3 100644
--- a/bin/varnishtest/tests/b00011.vtc
+++ b/bin/varnishtest/tests/b00011.vtc
@@ -1,9 +1,9 @@
 varnishtest "Check HTTP/1.0 EOF transmission"
 
 server s1 {
-	rxreq 
+	rxreq
 	send "HTTP/1.1 200 Ok\n"
-	send "Connection: close\n" 
+	send "Connection: close\n"
 	send "\n"
 	send "Body line 1\n"
 	send "Body line 2\n"
diff --git a/bin/varnishtest/tests/b00012.vtc b/bin/varnishtest/tests/b00012.vtc
index 0aa9cec..81113b5 100644
--- a/bin/varnishtest/tests/b00012.vtc
+++ b/bin/varnishtest/tests/b00012.vtc
@@ -1,13 +1,13 @@
 varnishtest "Check pipelining"
 
 server s1 {
-	rxreq 
+	rxreq
 	expect req.url == "/foo"
 	txresp -body "foo"
-	rxreq 
+	rxreq
 	expect req.url == "/bar"
 	txresp -body "foobar"
-} -start 
+} -start
 
 varnish v1 -vcl+backend {} -start
 
diff --git a/bin/varnishtest/tests/b00013.vtc b/bin/varnishtest/tests/b00013.vtc
index d0b957a..d48cd5a 100644
--- a/bin/varnishtest/tests/b00013.vtc
+++ b/bin/varnishtest/tests/b00013.vtc
@@ -1,13 +1,13 @@
 varnishtest "Check read-head / partial pipelining"
 
 server s1 {
-	rxreq 
+	rxreq
 	expect req.url == "/foo"
 	txresp -body "foo"
-	rxreq 
+	rxreq
 	expect req.url == "/bar"
 	txresp -body "foobar"
-} -start 
+} -start
 
 varnish v1 -arg "-p accept_filter=false" -vcl+backend {} -start
 
diff --git a/bin/varnishtest/tests/b00014.vtc b/bin/varnishtest/tests/b00014.vtc
index 8c5822e..a6f08f3 100644
--- a/bin/varnishtest/tests/b00014.vtc
+++ b/bin/varnishtest/tests/b00014.vtc
@@ -2,15 +2,15 @@ varnishtest "Check -f command line arg"
 
 
 server s1 {
-	rxreq 
+	rxreq
 	expect req.url == "/foo"
 	txresp -body "foo"
-	rxreq 
+	rxreq
 	expect req.url == "/bar"
 	txresp -body "bar"
 } -start
 
-shell "echo 'vcl 4.0; backend foo { .host = \"${s1_addr}\"; .port = \"${s1_port}\"; }' > ${tmpdir}/_b00014.vcl" 
+shell "echo 'vcl 4.0; backend foo { .host = \"${s1_addr}\"; .port = \"${s1_port}\"; }' > ${tmpdir}/_b00014.vcl"
 varnish v1 -arg "-f ${tmpdir}/_b00014.vcl" -start
 
 client c1 {
diff --git a/bin/varnishtest/tests/b00015.vtc b/bin/varnishtest/tests/b00015.vtc
index 3626284..029f782 100644
--- a/bin/varnishtest/tests/b00015.vtc
+++ b/bin/varnishtest/tests/b00015.vtc
@@ -2,7 +2,7 @@ varnishtest "Check synthetic error page caching"
 
 # First test that an internally generated error is not cached
 
-varnish v1 -vcl { 
+varnish v1 -vcl {
 	backend foo {
 		.host = "${bad_ip}"; .port = "9080";
 	}
@@ -26,7 +26,7 @@ client c1 {
 
 delay .1
 
-# Then check that a cacheable error from the backend is 
+# Then check that a cacheable error from the backend is
 
 varnish v1 -cliok "ban req.url ~ .*"
 
@@ -35,7 +35,7 @@ server s1 {
 	txresp -status 302
 } -start
 
-varnish v1 -vcl+backend { 
+varnish v1 -vcl+backend {
 	sub vcl_backend_response {
 		set beresp.http.ttl = beresp.ttl;
 		set beresp.http.uncacheable = beresp.uncacheable;
diff --git a/bin/varnishtest/tests/b00016.vtc b/bin/varnishtest/tests/b00016.vtc
index 56bbd33..17fef23 100644
--- a/bin/varnishtest/tests/b00016.vtc
+++ b/bin/varnishtest/tests/b00016.vtc
@@ -1,6 +1,6 @@
 varnishtest "Check naming of backends"
 
-varnish v1 -vcl { 
+varnish v1 -vcl {
 	backend foo {
 		.host = "${bad_ip}"; .port = "9080";
 	}
@@ -20,7 +20,7 @@ client c1 {
 	expect resp.http.X-Backend-Name == "foo"
 } -run
 
-varnish v1 -vcl { 
+varnish v1 -vcl {
 	import directors from "${topbuild}/lib/libvmod_directors/.libs/libvmod_directors.so" ;
 
 	backend b1 {
@@ -47,7 +47,7 @@ client c1 {
 	expect resp.http.X-Backend-Name == "bar"
 } -run
 
-varnish v1 -vcl { 
+varnish v1 -vcl {
 	import directors from "${topbuild}/lib/libvmod_directors/.libs/libvmod_directors.so" ;
 	backend b1 {
 		.host = "${bad_ip}"; .port = "9080";
diff --git a/bin/varnishtest/tests/b00017.vtc b/bin/varnishtest/tests/b00017.vtc
index 053fffd..633e6e1 100644
--- a/bin/varnishtest/tests/b00017.vtc
+++ b/bin/varnishtest/tests/b00017.vtc
@@ -1,6 +1,6 @@
 varnishtest "Check that we close one error"
 
-varnish v1 -vcl { 
+varnish v1 -vcl {
 	backend foo {
 		.host = "${bad_ip}"; .port = "9080";
 	}
diff --git a/bin/varnishtest/tests/b00018.vtc b/bin/varnishtest/tests/b00018.vtc
index 2ad8cd2..3989b57 100644
--- a/bin/varnishtest/tests/b00018.vtc
+++ b/bin/varnishtest/tests/b00018.vtc
@@ -1,11 +1,11 @@
 varnishtest "Check that synth response in vcl_backend_response works"
 
 server s1 {
-	rxreq 
+	rxreq
 	txresp -body "012345\n"
 } -start
 
-varnish v1 -vcl+backend { 
+varnish v1 -vcl+backend {
 	sub vcl_backend_response {
 	    set beresp.http.Foo = "bar";
 	    set beresp.status = 523;
diff --git a/bin/varnishtest/tests/b00019.vtc b/bin/varnishtest/tests/b00019.vtc
index 5566723..6b33702 100644
--- a/bin/varnishtest/tests/b00019.vtc
+++ b/bin/varnishtest/tests/b00019.vtc
@@ -28,13 +28,13 @@ varnish v1 -vcl+backend {
 	sub vcl_error {
 		if (req.restarts == 2) {
 			set obj.status = 200;
-			set obj.response = "restart=2"; 
+			set obj.response = "restart=2";
 		} elsif (req.restarts > 2) {
 			set obj.status = 501;
-			set obj.response = "restart>2"; 
+			set obj.response = "restart>2";
 		} elsif (req.restarts < 2) {
 			set obj.status = 500;
-			set obj.response = "restart<2"; 
+			set obj.response = "restart<2";
 		}
 	}
 } -start
diff --git a/bin/varnishtest/tests/b00024.vtc b/bin/varnishtest/tests/b00024.vtc
index 30f0466..1a55153 100644
--- a/bin/varnishtest/tests/b00024.vtc
+++ b/bin/varnishtest/tests/b00024.vtc
@@ -10,7 +10,7 @@ server s1 {
 
 varnish v1 -vcl+backend {
 	sub vcl_backend_fetch {
-		set bereq.first_byte_timeout = 1s;	
+		set bereq.first_byte_timeout = 1s;
 	}
 } -start
 
diff --git a/bin/varnishtest/tests/b00026.vtc b/bin/varnishtest/tests/b00026.vtc
index 14293cc..b094b0a 100644
--- a/bin/varnishtest/tests/b00026.vtc
+++ b/bin/varnishtest/tests/b00026.vtc
@@ -5,7 +5,7 @@ feature SO_RCVTIMEO_WORKS
 server s1 {
 	rxreq
 	expect req.url == "from_backend"
-	delay 1; 
+	delay 1;
 	txresp
 } -start
 server s2 {
diff --git a/bin/varnishtest/tests/b00033.vtc b/bin/varnishtest/tests/b00033.vtc
index 4077047..90c1431 100644
--- a/bin/varnishtest/tests/b00033.vtc
+++ b/bin/varnishtest/tests/b00033.vtc
@@ -31,7 +31,7 @@ client c1 {
 } -run
 
 varnish v1 -cliok "ban req.url ~ ."
-	
+
 client c1 {
 	txreq -url /1
 	rxresp
diff --git a/bin/varnishtest/tests/c00001.vtc b/bin/varnishtest/tests/c00001.vtc
index 7497ec3..e301e4d 100644
--- a/bin/varnishtest/tests/c00001.vtc
+++ b/bin/varnishtest/tests/c00001.vtc
@@ -1,14 +1,14 @@
 varnishtest "Test VCL regsub()"
 
 server s1 {
-	rxreq 
+	rxreq
 	txresp \
 		-hdr "Foobar: _barf_" \
 		-hdr "Connection: close" \
 		-body "012345\n"
 } -start
 
-varnish v1 -vcl+backend { 
+varnish v1 -vcl+backend {
 	sub vcl_backend_response {
 		set beresp.http.Snafu1 = regsub(beresp.http.Foobar, "ar", "\0\0");
 		set beresp.http.Snafu2 =
@@ -24,7 +24,7 @@ varnish v1 -vcl+backend {
 		set beresp.http.Snafu7 =
 		    regsub(beresp.http.Foobar, "ar", bereq.http.nosuchheader);
 	}
-} -start 
+} -start
 
 client c1 {
 	txreq -url "/"
diff --git a/bin/varnishtest/tests/c00002.vtc b/bin/varnishtest/tests/c00002.vtc
index 5351fec..22cf464 100644
--- a/bin/varnishtest/tests/c00002.vtc
+++ b/bin/varnishtest/tests/c00002.vtc
@@ -1,11 +1,14 @@
 varnishtest "Check that all thread pools all get started and get minimum threads"
 
 server s1 {
-	rxreq 
+	rxreq
 	txresp -hdr "Connection: close" -body "012345\n"
 } -start
 
-varnish v1 -arg "-p thread_pool_min=10 -p thread_pool_max=10 -p thread_pools=2"
+varnish v1 \
+	-arg "-p thread_pool_min=10" \
+	-arg "-p thread_pool_max=10" \
+	-arg "-p thread_pools=2"
 
 varnish v1 -vcl+backend {} -start
 
diff --git a/bin/varnishtest/tests/c00003.vtc b/bin/varnishtest/tests/c00003.vtc
index e0c5afa..0327873 100644
--- a/bin/varnishtest/tests/c00003.vtc
+++ b/bin/varnishtest/tests/c00003.vtc
@@ -1,7 +1,7 @@
 varnishtest "Check that we start if at least one listen address works"
 
 server s1 {
-	rxreq 
+	rxreq
 	txresp -hdr "Connection: close" -body "012345\n"
 } -start
 
diff --git a/bin/varnishtest/tests/c00004.vtc b/bin/varnishtest/tests/c00004.vtc
index 3074eb8..56af641 100644
--- a/bin/varnishtest/tests/c00004.vtc
+++ b/bin/varnishtest/tests/c00004.vtc
@@ -35,7 +35,7 @@ client c1 {
 	expect resp.http.X-Varnish == "1005"
 	expect resp.http.snafu == "3"
 
-	txreq 
+	txreq
 	rxresp
 	expect resp.status == 200
 	expect resp.http.X-Varnish == "1007"
diff --git a/bin/varnishtest/tests/c00006.vtc b/bin/varnishtest/tests/c00006.vtc
index 83c3ea2..7486271 100644
--- a/bin/varnishtest/tests/c00006.vtc
+++ b/bin/varnishtest/tests/c00006.vtc
@@ -16,7 +16,7 @@ client c1 {
 	rxresp
 	expect resp.status == 200
 	expect resp.bodylen == 5
-} 
+}
 
 client c1 -run
 
diff --git a/bin/varnishtest/tests/c00007.vtc b/bin/varnishtest/tests/c00007.vtc
index d9cd46f..4edff4f 100644
--- a/bin/varnishtest/tests/c00007.vtc
+++ b/bin/varnishtest/tests/c00007.vtc
@@ -1,3 +1,5 @@
 varnishtest "Test banning a hash"
 
-varnish v1 -arg "-b 127.0.0.1:80 -a 127.0.0.1:0" -start -clierr 101 "ban.hash foo"
+varnish v1 \
+	-arg "-b 127.0.0.1:80 -a 127.0.0.1:0" \
+	-start -clierr 101 "ban.hash foo"
diff --git a/bin/varnishtest/tests/c00008.vtc b/bin/varnishtest/tests/c00008.vtc
index e41e0b2..64762f6 100644
--- a/bin/varnishtest/tests/c00008.vtc
+++ b/bin/varnishtest/tests/c00008.vtc
@@ -34,7 +34,7 @@ client c1 {
 	rxresp -no_obj
 	expect resp.status == 304
 	expect resp.http.etag == "foo"
-} 
+}
 
 client c1 -run
 
diff --git a/bin/varnishtest/tests/c00009.vtc b/bin/varnishtest/tests/c00009.vtc
index 7e881ab..3d43334 100644
--- a/bin/varnishtest/tests/c00009.vtc
+++ b/bin/varnishtest/tests/c00009.vtc
@@ -3,7 +3,7 @@ varnishtest "Test restarts"
 server s1 {
 	rxreq
 	expect req.url == "/foo"
-	txresp -status 404 
+	txresp -status 404
 } -start
 
 server s2 {
@@ -12,7 +12,7 @@ server s2 {
 	txresp -body "foobar"
 } -start
 
-varnish v1 -vcl+backend { 
+varnish v1 -vcl+backend {
 	sub vcl_recv {
 		if (req.restarts == 0) {
 			set req.backend = s1;
@@ -40,6 +40,6 @@ client c1 {
 	rxresp
 	expect resp.status == 200
 	expect resp.bodylen == 6
-} 
+}
 
 client c1 -run
diff --git a/bin/varnishtest/tests/c00010.vtc b/bin/varnishtest/tests/c00010.vtc
index 238dada..18e364b 100644
--- a/bin/varnishtest/tests/c00010.vtc
+++ b/bin/varnishtest/tests/c00010.vtc
@@ -9,7 +9,7 @@ server s1 {
 	txresp -body foobar1
 } -start
 
-varnish v1 -vcl+backend { 
+varnish v1 -vcl+backend {
 	sub vcl_hit {
 		return(pass);
 	}
@@ -26,6 +26,6 @@ client c1 {
 	expect resp.status == 200
 	expect resp.bodylen == 7
 	expect resp.http.x-varnish == "1003 1004"
-} 
+}
 
 client c1 -run
diff --git a/bin/varnishtest/tests/c00011.vtc b/bin/varnishtest/tests/c00011.vtc
index fc0af3d..be9aeb2 100644
--- a/bin/varnishtest/tests/c00011.vtc
+++ b/bin/varnishtest/tests/c00011.vtc
@@ -9,7 +9,7 @@ server s1 {
 	txresp -body foobar1
 } -start
 
-varnish v1 -vcl+backend { 
+varnish v1 -vcl+backend {
 	sub vcl_backend_response {
 		set beresp.uncacheable = true;
 	}
@@ -26,6 +26,6 @@ client c1 {
 	expect resp.status == 200
 	expect resp.bodylen == 7
 	expect resp.http.x-varnish == "1003"
-} 
+}
 
 client c1 -run
diff --git a/bin/varnishtest/tests/c00012.vtc b/bin/varnishtest/tests/c00012.vtc
index 570fc93..fda9f4d 100644
--- a/bin/varnishtest/tests/c00012.vtc
+++ b/bin/varnishtest/tests/c00012.vtc
@@ -9,7 +9,7 @@ server s1 {
 	txresp -body foobar1
 } -start
 
-varnish v1 -vcl+backend { 
+varnish v1 -vcl+backend {
 	sub vcl_miss {
 		return(pass);
 	}
@@ -26,6 +26,6 @@ client c1 {
 	expect resp.status == 200
 	expect resp.bodylen == 7
 	expect resp.http.x-varnish == "1003"
-} 
+}
 
 client c1 -run
diff --git a/bin/varnishtest/tests/c00014.vtc b/bin/varnishtest/tests/c00014.vtc
index 61654e1..a8b2d03 100644
--- a/bin/varnishtest/tests/c00014.vtc
+++ b/bin/varnishtest/tests/c00014.vtc
@@ -13,7 +13,7 @@ server s1 {
 	txresp -body "foobar"
 } -start
 
-varnish v1 -vcl+backend { 
+varnish v1 -vcl+backend {
 	sub vcl_backend_response {
 		set beresp.uncacheable = true;
 	}
diff --git a/bin/varnishtest/tests/c00015.vtc b/bin/varnishtest/tests/c00015.vtc
index cbf5cca..5b09c8d 100644
--- a/bin/varnishtest/tests/c00015.vtc
+++ b/bin/varnishtest/tests/c00015.vtc
@@ -9,14 +9,14 @@ server s1 {
 	txresp -body "foobar1"
 } -start
 
-varnish v1 -vcl+backend { 
+varnish v1 -vcl+backend {
 } -start
 
 varnish v1 -vcl+backend {
 	sub vcl_recv {
 		return (pass);
 	}
-} 
+}
 
 varnish v1 -cli "vcl.list"
 varnish v1 -cli "vcl.use vcl1"
diff --git a/bin/varnishtest/tests/c00016.vtc b/bin/varnishtest/tests/c00016.vtc
index 99e9c53..83c9527 100644
--- a/bin/varnishtest/tests/c00016.vtc
+++ b/bin/varnishtest/tests/c00016.vtc
@@ -4,12 +4,12 @@ server s1 {
 	rxreq
 	expect req.url == "/foo"
 	expect req.http.Foo == "bar"
-	txresp -hdr "Bar: foo" -body "foobar" 
+	txresp -hdr "Bar: foo" -body "foobar"
 
 	rxreq
 	expect req.url == "/bar"
 	expect req.http.Foo == <undef>
-	txresp -hdr "Bar: fnry,glyf, FOO ,brok" -hdr "Connection: bar" -body "foobar" 
+	txresp -hdr "Bar: fnry,glyf, FOO ,brok" -hdr "Connection: bar" -body "foobar"
 } -start
 
 varnish v1 -vcl+backend { } -start
diff --git a/bin/varnishtest/tests/c00017.vtc b/bin/varnishtest/tests/c00017.vtc
index 7e6f11f..2ad090e 100644
--- a/bin/varnishtest/tests/c00017.vtc
+++ b/bin/varnishtest/tests/c00017.vtc
@@ -1,31 +1,31 @@
 varnishtest "Test Backend Polling"
 
 server s1 {
-	# Probes 
+	# Probes
 	loop 8 {
 		rxreq
 		expect req.url == "/"
-		txresp -hdr "Bar: foo" -body "foobar" 
+		txresp -hdr "Bar: foo" -body "foobar"
 		accept
 	}
 
 	loop 3 {
 		rxreq
 		expect req.url == "/"
-		txresp -status 404 -hdr "Bar: foo" -body "foobar" 
+		txresp -status 404 -hdr "Bar: foo" -body "foobar"
 		accept
 	}
 	loop 2 {
 		rxreq
 		expect req.url == "/"
-		txresp -proto "FROBOZ" -status 200 -hdr "Bar: foo" -body "foobar" 
+		txresp -proto "FROBOZ" -status 200 -hdr "Bar: foo" -body "foobar"
 		accept
 	}
 
 	sema r1 sync 2
 } -start
 
-varnish v1 -vcl { 
+varnish v1 -vcl {
 
 	backend foo {
 		.host = "${s1_addr}";
@@ -35,7 +35,7 @@ varnish v1 -vcl {
 			.interval = 0.1 s;
 		}
 	}
-	
+
 } -start
 
 sema r1 sync 2
diff --git a/bin/varnishtest/tests/c00020.vtc b/bin/varnishtest/tests/c00020.vtc
index 3713951..509d6ee 100644
--- a/bin/varnishtest/tests/c00020.vtc
+++ b/bin/varnishtest/tests/c00020.vtc
@@ -1,12 +1,12 @@
 varnishtest "Test -h critbit a bit"
 
 server s1 {
-        rxreq 
+        rxreq
 	expect req.url == "/"
         txresp -hdr "Connection: close" -body "012345\n"
 } -start
 
-varnish v1 -arg "-hcritbit" -vcl+backend { } -start 
+varnish v1 -arg "-hcritbit" -vcl+backend { } -start
 
 client c1 {
         txreq -url "/"
@@ -23,10 +23,10 @@ client c2 {
 } -run
 
 server s1 {
-        rxreq 
+        rxreq
 	expect req.url == "/foo"
         txresp -body "012345\n"
-        rxreq 
+        rxreq
 	expect req.url == "/bar"
         txresp -body "012345\n"
 } -start
diff --git a/bin/varnishtest/tests/c00021.vtc b/bin/varnishtest/tests/c00021.vtc
index c8bcbe5..c4a5ef5 100644
--- a/bin/varnishtest/tests/c00021.vtc
+++ b/bin/varnishtest/tests/c00021.vtc
@@ -102,7 +102,7 @@ varnish v1 -cliok "ban req.http.foo == barcheck"
 varnish v1 -cliok "ban.list"
 
 client c1 {
-	txreq -url "/foo" -hdr "foo: barcheck" 
+	txreq -url "/foo" -hdr "foo: barcheck"
 	rxresp
 	expect resp.status == 200
 	expect resp.http.foo == bar8
diff --git a/bin/varnishtest/tests/c00022.vtc b/bin/varnishtest/tests/c00022.vtc
index 328ef92..841d2cf 100644
--- a/bin/varnishtest/tests/c00022.vtc
+++ b/bin/varnishtest/tests/c00022.vtc
@@ -18,7 +18,7 @@ server s1 {
 	txresp -hdr "foo: bar8" -body "1111111\n"
 } -start
 
-varnish v1 -vcl+backend { 
+varnish v1 -vcl+backend {
 	sub vcl_recv {
 		if (req.method == "PURGE") {
 			ban ("req.url == " + req.url);
@@ -65,7 +65,7 @@ client c1 {
 } -run
 varnish v1 -cliok "ban.list"
 
-# New obj 
+# New obj
 client c1 {
 	txreq -url "/foo"
 	rxresp
@@ -135,7 +135,7 @@ client c1 {
 varnish v1 -cliok "ban.list"
 
 client c1 {
-	txreq -url "/foo" -hdr "foo: barcheck" 
+	txreq -url "/foo" -hdr "foo: barcheck"
 	rxresp
 	expect resp.status == 200
 	expect resp.http.foo == bar8
diff --git a/bin/varnishtest/tests/c00023.vtc b/bin/varnishtest/tests/c00023.vtc
index 0e6aff1..11e8c72 100644
--- a/bin/varnishtest/tests/c00023.vtc
+++ b/bin/varnishtest/tests/c00023.vtc
@@ -1,36 +1,36 @@
 varnishtest "Test -h critbit for digest edges"
 
 server s1 {
-        rxreq 
+        rxreq
 	expect req.url == "/1"
         txresp -body "\n"
-        rxreq 
+        rxreq
 	expect req.url == "/2"
         txresp -body "x\n"
-        rxreq 
+        rxreq
 	expect req.url == "/3"
         txresp -body "xx\n"
-        rxreq 
+        rxreq
 	expect req.url == "/4"
         txresp -body "xxx\n"
-        rxreq 
+        rxreq
 	expect req.url == "/5"
         txresp -body "xxxx\n"
-        rxreq 
+        rxreq
 	expect req.url == "/6"
         txresp -body "xxxxx\n"
-        rxreq 
+        rxreq
 	expect req.url == "/7"
         txresp -body "xxxxxx\n"
-        rxreq 
+        rxreq
 	expect req.url == "/8"
         txresp -body "xxxxxxx\n"
-        rxreq 
+        rxreq
 	expect req.url == "/9"
         txresp -body "xxxxxxxx\n"
 } -start
 
-varnish v1 -arg "-hcritbit" -vcl+backend { } -start 
+varnish v1 -arg "-hcritbit" -vcl+backend { } -start
 varnish v1 -cliok "param.set debug +hashedge"
 
 client c1 {
diff --git a/bin/varnishtest/tests/c00024.vtc b/bin/varnishtest/tests/c00024.vtc
index 31ebc8b..2a1e542 100644
--- a/bin/varnishtest/tests/c00024.vtc
+++ b/bin/varnishtest/tests/c00024.vtc
@@ -1,24 +1,24 @@
 varnishtest "Test restart in vcl_error"
 
 server s1 {
-        rxreq 
-        txresp 
+        rxreq
+        txresp
 } -start
 
-varnish v1 -vcl+backend { 
+varnish v1 -vcl+backend {
 	sub vcl_recv {
 		if (req.restarts == 0) {
 			return (error(701, "FOO"));
 		}
 	}
-	sub vcl_error { 
-		if (req.restarts < 1) { 
-			return (restart); 
-		} else { 
-			set obj.status = 201; 
+	sub vcl_error {
+		if (req.restarts < 1) {
+			return (restart);
+		} else {
+			set obj.status = 201;
 		}
 	 }
- } -start 
+ } -start
 
 client c1 {
         txreq -url "/"
diff --git a/bin/varnishtest/tests/c00025.vtc b/bin/varnishtest/tests/c00025.vtc
index 4432918..d1a55f3 100644
--- a/bin/varnishtest/tests/c00025.vtc
+++ b/bin/varnishtest/tests/c00025.vtc
@@ -24,7 +24,7 @@ client c1 {
 	    -hdr "If-None-Match: 123456789"
 	rxresp -no_obj
 	expect resp.status == 304
-} 
+}
 
 client c1 -run
 
diff --git a/bin/varnishtest/tests/c00026.vtc b/bin/varnishtest/tests/c00026.vtc
index 9f8c168..7d5c32c 100644
--- a/bin/varnishtest/tests/c00026.vtc
+++ b/bin/varnishtest/tests/c00026.vtc
@@ -44,7 +44,7 @@ client c1 {
 	rxresp -no_obj
 	expect resp.status == 304
 
-} 
+}
 
 client c1 -run
 
diff --git a/bin/varnishtest/tests/c00027.vtc b/bin/varnishtest/tests/c00027.vtc
index 88b4217..d9c7e8e 100644
--- a/bin/varnishtest/tests/c00027.vtc
+++ b/bin/varnishtest/tests/c00027.vtc
@@ -19,8 +19,8 @@ server s1 {
 } -start
 
 varnish v1 -arg "-s malloc,1M" -vcl+backend {
-	sub vcl_backend_response { 
-		set beresp.ttl = 10m; 
+	sub vcl_backend_response {
+		set beresp.ttl = 10m;
 	}
 } -start
 
diff --git a/bin/varnishtest/tests/c00028.vtc b/bin/varnishtest/tests/c00028.vtc
index 7e2224f..4f8a0ff 100644
--- a/bin/varnishtest/tests/c00028.vtc
+++ b/bin/varnishtest/tests/c00028.vtc
@@ -1,17 +1,17 @@
 varnishtest "Test that we can't recurse restarts forever"
 
-varnish v1 -vcl { 
-	backend bad { 
+varnish v1 -vcl {
+	backend bad {
 		.host = "${bad_ip}"; .port = "9090";
 	}
 
 	sub vcl_recv {
 	    set req.backend = bad;
 	}
-	sub vcl_error { 
+	sub vcl_error {
 	    return (restart);
 	}
- } -start 
+ } -start
 
 client c1 {
         txreq -url "/"
diff --git a/bin/varnishtest/tests/c00031.vtc b/bin/varnishtest/tests/c00031.vtc
index 1dd8213..de30c6d 100644
--- a/bin/varnishtest/tests/c00031.vtc
+++ b/bin/varnishtest/tests/c00031.vtc
@@ -1,7 +1,7 @@
 varnishtest "Worker thread stack size setting"
 
 server s1 {
-	rxreq 
+	rxreq
 	txresp
 } -start
 
diff --git a/bin/varnishtest/tests/c00036.vtc b/bin/varnishtest/tests/c00036.vtc
index 9f2544c..4e26467 100644
--- a/bin/varnishtest/tests/c00036.vtc
+++ b/bin/varnishtest/tests/c00036.vtc
@@ -1,10 +1,10 @@
 varnishtest "Backend close retry"
 
 server s1 -repeat 1 {
-	rxreq 
+	rxreq
 	txresp -bodylen 5
 
-	rxreq 
+	rxreq
 	accept
 
 	rxreq
@@ -19,12 +19,12 @@ varnish v1 -vcl+backend {
 } -start
 
 client c1 {
-	txreq 
+	txreq
 	rxresp
 	expect resp.status == 200
 	expect resp.bodylen == 5
 
-	txreq 
+	txreq
 	rxresp
 	expect resp.status == 200
 	expect resp.bodylen == 6
diff --git a/bin/varnishtest/tests/c00037.vtc b/bin/varnishtest/tests/c00037.vtc
index e26be5b..48ea499 100644
--- a/bin/varnishtest/tests/c00037.vtc
+++ b/bin/varnishtest/tests/c00037.vtc
@@ -1,19 +1,19 @@
 varnishtest "Test req.hash_always_miss in vcl_recv"
 
 server s1 {
-        rxreq 
+        rxreq
         txresp -hdr "Inc: 1"
-        rxreq 
+        rxreq
         txresp -hdr "Inc: 2"
 } -start
 
-varnish v1 -vcl+backend { 
+varnish v1 -vcl+backend {
 	sub vcl_recv {
 		if (req.http.x-missit == "1") {
 			set req.hash_always_miss = true;
 		}
 	}
- } -start 
+ } -start
 
 client c1 {
 	txreq -url "/"
diff --git a/bin/varnishtest/tests/c00038.vtc b/bin/varnishtest/tests/c00038.vtc
index ee396db..0764e85 100644
--- a/bin/varnishtest/tests/c00038.vtc
+++ b/bin/varnishtest/tests/c00038.vtc
@@ -1,7 +1,7 @@
 varnishtest "Test req.hash_ignore_busy in vcl_recv"
 
 server s1 {
-	rxreq 
+	rxreq
 	sema r1 sync 2
 	delay 1
 	txresp -hdr "Server: 1"
@@ -12,7 +12,7 @@ server s2 {
 	txresp -hdr "Server: 2"
 } -start
 
-varnish v1 -vcl+backend { 
+varnish v1 -vcl+backend {
 	sub vcl_recv {
 		if (req.http.x-ignorebusy == "1") {
 			set req.hash_ignore_busy = true;
@@ -24,7 +24,7 @@ varnish v1 -vcl+backend {
 			set req.backend = s2;
 		}
 	}
-} -start 
+} -start
 
 client c1 {
 	txreq -url "/" -hdr "x-client: 1"
diff --git a/bin/varnishtest/tests/c00039.vtc b/bin/varnishtest/tests/c00039.vtc
index a9d35d8..6afb2eb 100644
--- a/bin/varnishtest/tests/c00039.vtc
+++ b/bin/varnishtest/tests/c00039.vtc
@@ -42,7 +42,7 @@ client c1 {
 		-hdr "1...5: ..0....5\n ..0....5....0....5....0" \
 		-hdr "1...5: ..0....5\n ..0....5....0....5....0" \
 		-hdr "1...5: ..0....5\n ..0....5....0....5....0" \
-		-hdr "1...5: ..0....5\n ..0...." 
+		-hdr "1...5: ..0....5\n ..0...."
 	rxresp
 	expect resp.status == 200
 
@@ -52,6 +52,6 @@ client c1 {
 		-hdr "1...5: ..0....5\n ..0....5....0....5....0" \
 		-hdr "1...5: ..0....5\n ..0....5....0....5....0" \
 		-hdr "1...5: ..0....5\n ..0....5....0....5....0" \
-		-hdr "1...5: ..0....5\n ..0....5" 
+		-hdr "1...5: ..0....5\n ..0....5"
 	expect_close
 } -run
diff --git a/bin/varnishtest/tests/c00040.vtc b/bin/varnishtest/tests/c00040.vtc
index b6af9e2..f1efc96 100644
--- a/bin/varnishtest/tests/c00040.vtc
+++ b/bin/varnishtest/tests/c00040.vtc
@@ -22,7 +22,7 @@ server s1 {
 	txresp \
 		-hdr "1...5: ..0....5....0\n ..5....0....5....0." \
 		-bodylen 4
-	
+
 	accept
 	rxreq
 	expect req.url == "/5"
@@ -55,7 +55,7 @@ varnish v1 -cliok "param.set http_resp_size 256"
 varnish v1 -cliok "param.set http_resp_hdr_len 40"
 
 client c1 {
-	txreq -url "/1" 
+	txreq -url "/1"
 	rxresp
 	expect resp.status == 200
 	txreq -url "/2"
diff --git a/bin/varnishtest/tests/c00041.vtc b/bin/varnishtest/tests/c00041.vtc
index c51cf53..24a7871 100644
--- a/bin/varnishtest/tests/c00041.vtc
+++ b/bin/varnishtest/tests/c00041.vtc
@@ -95,4 +95,4 @@ client c1 {
 varnish v1 -errvcl {'purge': not a valid action in method 'vcl_recv'.} {
 	backend s1 { .host = "${s1_addr}"; }
 	sub vcl_recv { if (req.http.purge == "yes") { purge; } }
-} 
+}
diff --git a/bin/varnishtest/tests/c00042.vtc b/bin/varnishtest/tests/c00042.vtc
index 7de613d..390f574 100644
--- a/bin/varnishtest/tests/c00042.vtc
+++ b/bin/varnishtest/tests/c00042.vtc
@@ -19,12 +19,12 @@ varnish v1 -vcl+backend {
 } -start
 
 client c1 {
-	txreq -url "/1" 
+	txreq -url "/1"
 	rxresp
 	expect resp.status == 200
 	expect resp.bodylen == 1
 
-	txreq -url "/1" 
+	txreq -url "/1"
 	rxresp
 	expect resp.status == 200
 	expect resp.bodylen == 1
@@ -34,7 +34,7 @@ client c1 {
 	expect resp.status == 200
 	expect resp.bodylen == 2
 
-	txreq -url "/1" 
+	txreq -url "/1"
 	rxresp
 	expect resp.status == 200
 	expect resp.bodylen == 2
diff --git a/bin/varnishtest/tests/c00044.vtc b/bin/varnishtest/tests/c00044.vtc
index f325ae8..8d4078b 100644
--- a/bin/varnishtest/tests/c00044.vtc
+++ b/bin/varnishtest/tests/c00044.vtc
@@ -34,11 +34,11 @@ client c1 {
 
 varnish v1 -expect SMA.Transient.g_bytes == 0
 varnish v1 -expect SMA.s0.g_bytes == 0
-varnish v1 -expect SMA.s0.g_space > 1000000 
+varnish v1 -expect SMA.s0.g_space > 1000000
 varnish v1 -expect SMA.s1.g_bytes > 1000000
 varnish v1 -expect SMA.s1.g_space < 170
 varnish v1 -expect SMA.s2.g_bytes == 0
-varnish v1 -expect SMA.s2.g_space > 1000000 
+varnish v1 -expect SMA.s2.g_space > 1000000
 
 client c1 {
 	txreq -url /bar
@@ -49,7 +49,7 @@ client c1 {
 
 varnish v1 -expect SMA.Transient.g_bytes == 0
 varnish v1 -expect SMA.s0.g_bytes == 0
-varnish v1 -expect SMA.s0.g_space > 1000000 
+varnish v1 -expect SMA.s0.g_space > 1000000
 varnish v1 -expect SMA.s1.g_bytes > 1000000
 varnish v1 -expect SMA.s1.g_space < 170
 varnish v1 -expect SMA.s2.g_bytes > 1000000
diff --git a/bin/varnishtest/tests/c00045.vtc b/bin/varnishtest/tests/c00045.vtc
index bfb71c7..9168158 100644
--- a/bin/varnishtest/tests/c00045.vtc
+++ b/bin/varnishtest/tests/c00045.vtc
@@ -30,7 +30,7 @@ varnish v1 -expect SMA.s0.g_space < 170
 varnish v1 -expect SMA.s1.g_bytes == 0
 varnish v1 -expect SMA.s1.g_space > 1000000
 varnish v1 -expect SMA.s2.g_bytes == 0
-varnish v1 -expect SMA.s2.g_space > 1000000 
+varnish v1 -expect SMA.s2.g_space > 1000000
 
 client c1 {
 	txreq -url /bar
@@ -46,7 +46,7 @@ varnish v1 -expect SMA.s0.g_space < 1171
 varnish v1 -expect SMA.s1.g_bytes == 0
 varnish v1 -expect SMA.s1.g_space > 1000000
 varnish v1 -expect SMA.s2.g_bytes == 0
-varnish v1 -expect SMA.s2.g_space > 1000000 
+varnish v1 -expect SMA.s2.g_space > 1000000
 
 client c1 {
 	txreq -url /foo
@@ -62,4 +62,4 @@ varnish v1 -expect SMA.s0.g_space < 1172
 varnish v1 -expect SMA.s1.g_bytes == 0
 varnish v1 -expect SMA.s1.g_space > 1000000
 varnish v1 -expect SMA.s2.g_bytes == 0
-varnish v1 -expect SMA.s2.g_space > 1000000 
+varnish v1 -expect SMA.s2.g_space > 1000000
diff --git a/bin/varnishtest/tests/c00046.vtc b/bin/varnishtest/tests/c00046.vtc
index ad2b701..8982a92 100644
--- a/bin/varnishtest/tests/c00046.vtc
+++ b/bin/varnishtest/tests/c00046.vtc
@@ -29,7 +29,7 @@ varnish v1 -expect SMA.s0.g_space < 100000
 varnish v1 -expect SMA.s1.g_bytes == 0
 varnish v1 -expect SMA.s1.g_space > 1000000
 varnish v1 -expect SMA.s2.g_bytes == 0
-varnish v1 -expect SMA.s2.g_space > 1000000 
+varnish v1 -expect SMA.s2.g_space > 1000000
 
 client c1 {
 	txreq -url /bar
@@ -45,7 +45,7 @@ varnish v1 -expect SMA.s0.g_space < 100000
 varnish v1 -expect SMA.s1.g_bytes == 0
 varnish v1 -expect SMA.s1.g_space > 1000000
 varnish v1 -expect SMA.s2.g_bytes == 0
-varnish v1 -expect SMA.s2.g_space > 1000000 
+varnish v1 -expect SMA.s2.g_space > 1000000
 
 client c1 {
 	txreq -url /foo
@@ -61,4 +61,4 @@ varnish v1 -expect SMA.s0.g_space < 100000
 varnish v1 -expect SMA.s1.g_bytes == 0
 varnish v1 -expect SMA.s1.g_space > 1000000
 varnish v1 -expect SMA.s2.g_bytes == 0
-varnish v1 -expect SMA.s2.g_space > 1000000 
+varnish v1 -expect SMA.s2.g_space > 1000000
diff --git a/bin/varnishtest/tests/c00047.vtc b/bin/varnishtest/tests/c00047.vtc
index e2ec54e..e25d912 100644
--- a/bin/varnishtest/tests/c00047.vtc
+++ b/bin/varnishtest/tests/c00047.vtc
@@ -1,13 +1,13 @@
 varnishtest "Test VCL regsuball()"
 
 server s1 {
-	rxreq 
+	rxreq
 	txresp \
 		-hdr "foo: barbar" \
 		-hdr "bar: bbbar"
 } -start
 
-varnish v1 -vcl+backend { 
+varnish v1 -vcl+backend {
 	sub vcl_backend_response {
 		set beresp.http.baz1 = regsuball(beresp.http.foo, "barb", "zz");
 		set beresp.http.baz2 = regsuball(beresp.http.foo, "ar", "zz");
@@ -17,7 +17,7 @@ varnish v1 -vcl+backend {
 		set beresp.http.baz6 = regsuball(beresp.http.foo, "^b*", "z");
 		set beresp.http.baz7 = regsuball(beresp.http.foo, "ping", "pong");
 	}
-} -start 
+} -start
 
 client c1 {
 	txreq -url "/"
diff --git a/bin/varnishtest/tests/c00051.vtc b/bin/varnishtest/tests/c00051.vtc
index 78fdc81..91184d1 100644
--- a/bin/varnishtest/tests/c00051.vtc
+++ b/bin/varnishtest/tests/c00051.vtc
@@ -1,6 +1,6 @@
 varnishtest "test parameter protection"
 
-varnish v1 -arg "-r cli_timeout" 
+varnish v1 -arg "-r cli_timeout"
 
 varnish v1 -cliok "param.show cli_timeout"
 varnish v1 -clierr 107 "param.set cli_timeout 1m"
diff --git a/bin/varnishtest/tests/c00052.vtc b/bin/varnishtest/tests/c00052.vtc
index 2ab6c1a..6ff5815 100644
--- a/bin/varnishtest/tests/c00052.vtc
+++ b/bin/varnishtest/tests/c00052.vtc
@@ -5,13 +5,13 @@ server s1 {
 	txresp
 } -start
 
-varnish v1 
+varnish v1
 
 varnish v1 -cliok "param.set vcc_allow_inline_c true"
 
 varnish v1 -vcl+backend {
 	C{ getpid(); }C
-} 
+}
 
 varnish v1 -cliok "param.set vcc_allow_inline_c false"
 
diff --git a/bin/varnishtest/tests/c00053.vtc b/bin/varnishtest/tests/c00053.vtc
index a5c2264..76c9bd2 100644
--- a/bin/varnishtest/tests/c00053.vtc
+++ b/bin/varnishtest/tests/c00053.vtc
@@ -1,7 +1,7 @@
 varnishtest "Test inclide vs. unsafe_path"
 
 server s1 {
-	rxreq 
+	rxreq
 	txresp -hdr "foo: bAr" -hdr "bar: fOo" -bodylen 4
 } -start
 
diff --git a/bin/varnishtest/tests/c00058.vtc b/bin/varnishtest/tests/c00058.vtc
index 9811b79..440bbf3 100644
--- a/bin/varnishtest/tests/c00058.vtc
+++ b/bin/varnishtest/tests/c00058.vtc
@@ -8,7 +8,7 @@ server s1 {
 	sema r2 sync 2
 } -start
 
-varnish v1 -vcl+backend { 
+varnish v1 -vcl+backend {
 	sub vcl_backend_response {
 		set beresp.ttl = 0.5s;
 		set beresp.grace = 10s;
diff --git a/bin/varnishtest/tests/e00000.vtc b/bin/varnishtest/tests/e00000.vtc
index 157dea5..e17338f 100644
--- a/bin/varnishtest/tests/e00000.vtc
+++ b/bin/varnishtest/tests/e00000.vtc
@@ -2,7 +2,7 @@ varnishtest "ESI test with no ESI content"
 
 
 server s1 {
-	rxreq 
+	rxreq
 	txresp -body {
 		-This is a test: Hello world
 	}
@@ -15,7 +15,7 @@ varnish v1 -vcl+backend {
 } -start
 
 client c1 {
-	txreq 
+	txreq
 	rxresp
 	expect resp.status == 200
 	expect resp.bodylen == 33
diff --git a/bin/varnishtest/tests/e00001.vtc b/bin/varnishtest/tests/e00001.vtc
index 42a0c24..660637d 100644
--- a/bin/varnishtest/tests/e00001.vtc
+++ b/bin/varnishtest/tests/e00001.vtc
@@ -2,7 +2,7 @@ varnishtest "ESI:remove"
 
 
 server s1 {
-	rxreq 
+	rxreq
 	txresp -body {
 		<esi:remove>
 		This is a test: Unseen University
@@ -17,10 +17,10 @@ varnish v1 -vcl+backend {
 	sub vcl_backend_response {
 		set beresp.do_esi = true;
 	}
-} -start 
+} -start
 
 client c1 {
-	txreq 
+	txreq
 	rxresp
 	expect resp.status == 200
 	expect resp.bodylen == 40
diff --git a/bin/varnishtest/tests/e00002.vtc b/bin/varnishtest/tests/e00002.vtc
index ebebf62..244d4bc 100644
--- a/bin/varnishtest/tests/e00002.vtc
+++ b/bin/varnishtest/tests/e00002.vtc
@@ -2,7 +2,7 @@ varnishtest "ESI CDATA"
 
 
 server s1 {
-	rxreq 
+	rxreq
 	txresp -body {
 		<esi:remove>
 		<![CDATA[</esi:remove>]]>
@@ -19,7 +19,7 @@ varnish v1 -vcl+backend {
 } -start
 
 client c1 {
-	txreq 
+	txreq
 	rxresp
 	expect resp.status == 200
 	expect resp.bodylen == 35
diff --git a/bin/varnishtest/tests/e00003.vtc b/bin/varnishtest/tests/e00003.vtc
index a79ac57..bf61f4f 100644
--- a/bin/varnishtest/tests/e00003.vtc
+++ b/bin/varnishtest/tests/e00003.vtc
@@ -2,14 +2,14 @@ varnishtest "ESI include"
 
 
 server s1 {
-	rxreq 
+	rxreq
 	txresp -body {
 		<html>
 		Before include
 		<esi:include src="/body" sr="foo"/>
 		After include
 	}
-	rxreq 
+	rxreq
 	expect req.url == "/body1"
 	txresp -body {
 		Included file
@@ -28,12 +28,12 @@ varnish v1 -vcl+backend {
 } -start
 
 client c1 {
-	txreq 
+	txreq
 	rxresp
 	expect resp.bodylen == 65
 	expect resp.status == 200
 	# test that there is no difference on miss/hit
-	txreq 
+	txreq
 	rxresp
 	expect resp.bodylen == 65
 	expect resp.status == 200
diff --git a/bin/varnishtest/tests/e00004.vtc b/bin/varnishtest/tests/e00004.vtc
index e6ae26f..7326cb5 100644
--- a/bin/varnishtest/tests/e00004.vtc
+++ b/bin/varnishtest/tests/e00004.vtc
@@ -2,14 +2,14 @@ varnishtest "ESI commented include"
 
 
 server s1 {
-	rxreq 
+	rxreq
 	txresp -body {
 		<html>
 		Before include
 		<!--esi <esi:include src="/body"/> -->
 		After include
 	}
-	rxreq 
+	rxreq
 	expect req.url == "/body"
 	txresp -body {
 		Included file
@@ -23,7 +23,7 @@ varnish v1 -vcl+backend {
 } -start
 
 client c1 {
-	txreq 
+	txreq
 	rxresp
 	expect resp.status == 200
 	expect resp.bodylen == 67
diff --git a/bin/varnishtest/tests/e00005.vtc b/bin/varnishtest/tests/e00005.vtc
index 441362c..76a82ab 100644
--- a/bin/varnishtest/tests/e00005.vtc
+++ b/bin/varnishtest/tests/e00005.vtc
@@ -2,7 +2,7 @@ varnishtest "ESI relative include"
 
 
 server s1 {
-	rxreq 
+	rxreq
 	expect req.url == "/foo/bar"
 	txresp -body {
 		<html>
@@ -10,7 +10,7 @@ server s1 {
 		<!--esi <esi:include src="body"/> -->
 		After include
 	}
-	rxreq 
+	rxreq
 	expect req.url == "/foo/body"
 	txresp -body {
 		Included file
diff --git a/bin/varnishtest/tests/e00006.vtc b/bin/varnishtest/tests/e00006.vtc
index 1bd6cf3..79382fc 100644
--- a/bin/varnishtest/tests/e00006.vtc
+++ b/bin/varnishtest/tests/e00006.vtc
@@ -2,7 +2,7 @@ varnishtest "ESI include with http://"
 
 
 server s1 {
-	rxreq 
+	rxreq
 	expect req.url == "/foo/bar"
 	txresp -body {
 		<html>
diff --git a/bin/varnishtest/tests/e00007.vtc b/bin/varnishtest/tests/e00007.vtc
index 729ff84..0f5d86a 100644
--- a/bin/varnishtest/tests/e00007.vtc
+++ b/bin/varnishtest/tests/e00007.vtc
@@ -14,7 +14,7 @@ varnishtest "ESI spanning storage bits"
 # NB!    7 Debug        c "d%0a%09"
 
 server s1 {
-	rxreq 
+	rxreq
 	expect req.url == "/foo/bar"
 	send "HTTP/1.1 200 Ok\n"
 	send "Connection: close\n"
diff --git a/bin/varnishtest/tests/e00008.vtc b/bin/varnishtest/tests/e00008.vtc
index e99dac9..e72ec56 100644
--- a/bin/varnishtest/tests/e00008.vtc
+++ b/bin/varnishtest/tests/e00008.vtc
@@ -1,7 +1,7 @@
 varnishtest "ESI parsing errors"
 
 server s1 {
-	rxreq 
+	rxreq
 	txresp -body {
 		<html>					1
 		Before include				2
@@ -39,14 +39,14 @@ server s1 {
 		<esi:include  src="foofof />		33
 		<esi:include  foo=bar src=/body2 />	34
 	}
-	rxreq 
+	rxreq
 	expect req.url == "/body"
 	txresp -body {
 		Included file
 		<esi:remove>
 		<Aaa
 	}
-	rxreq 
+	rxreq
 	expect req.url == "/body2"
 	txresp -body {
 		Included file 2
@@ -59,14 +59,14 @@ varnish v1 -vcl+backend {
 	sub vcl_backend_response {
 		set beresp.do_esi = true;
 	}
-} -start 
+} -start
 
-varnish v1 -cliok "param.set debug +esi_chop" 
+varnish v1 -cliok "param.set debug +esi_chop"
 
 varnish v1 -cliok "param.set debug +syncvsl"
 
 client c1 {
-	txreq 
+	txreq
 	rxresp
 	expect resp.status == 200
 	expect resp.bodylen == 385
diff --git a/bin/varnishtest/tests/e00009.vtc b/bin/varnishtest/tests/e00009.vtc
index 938c200..03bc28c 100644
--- a/bin/varnishtest/tests/e00009.vtc
+++ b/bin/varnishtest/tests/e00009.vtc
@@ -1,14 +1,14 @@
 varnishtest "ESI binary detector"
 
 server s1 {
-	rxreq 
+	rxreq
 	txresp -body {
 		Before include
 		<esi:remove>
 			bar
 		</esi:remove>
 	}
-	rxreq 
+	rxreq
 	txresp -body {
 		Before include
 		<esi:remove>
@@ -24,13 +24,13 @@ varnish v1 -vcl+backend {
 } -start
 
 client c1 {
-	txreq 
+	txreq
 	rxresp
 	expect resp.status == 200
 	expect resp.bodylen == 57
 } -run
 
-varnish v1  -cli "param.set feature +esi_disable_xml_check" 
+varnish v1  -cli "param.set feature +esi_disable_xml_check"
 
 client c1 {
 	txreq -url bar
diff --git a/bin/varnishtest/tests/e00010.vtc b/bin/varnishtest/tests/e00010.vtc
index 0fccc41..feffe01 100644
--- a/bin/varnishtest/tests/e00010.vtc
+++ b/bin/varnishtest/tests/e00010.vtc
@@ -1,7 +1,7 @@
 varnishtest "Ignoring non esi elements"
 
 server s1 {
-	rxreq 
+	rxreq
 	txresp -body {
 		<f<esi?
 		<esi:remove>
@@ -18,7 +18,7 @@ varnish v1 -vcl+backend {
 } -start -cli "param.set feature +esi_ignore_other_elements"
 
 client c1 {
-	txreq 
+	txreq
 	rxresp
 	expect resp.status == 200
 	expect resp.bodylen == 21
diff --git a/bin/varnishtest/tests/e00011.vtc b/bin/varnishtest/tests/e00011.vtc
index 7dd2d14..0e655fc 100644
--- a/bin/varnishtest/tests/e00011.vtc
+++ b/bin/varnishtest/tests/e00011.vtc
@@ -1,7 +1,7 @@
 varnishtest "Make sure that PASS'ed ESI requests use GET for includes"
 
 server s1 {
-	rxreq 
+	rxreq
 	expect req.method == POST
 	expect req.url == /foobar
 	txresp -body {<HTML>
@@ -20,7 +20,7 @@ varnish v1 -vcl+backend {
 		set beresp.uncacheable = true;
 		set beresp.do_esi = true;
 	}
-} -start 
+} -start
 
 client c1 {
 	txreq -req POST -url /foobar -body {
diff --git a/bin/varnishtest/tests/e00012.vtc b/bin/varnishtest/tests/e00012.vtc
index 3cd8db6..afc23c6 100644
--- a/bin/varnishtest/tests/e00012.vtc
+++ b/bin/varnishtest/tests/e00012.vtc
@@ -1,7 +1,7 @@
 varnishtest "ESI includes for pre HTTP/1.1 cannot used chunked encoding"
 
 server s1 {
-        rxreq 
+        rxreq
         expect req.url == "/foo/bar"
         txresp -body {
                 <html>
@@ -9,7 +9,7 @@ server s1 {
                 <!--esi <esi:include src="body"/> -->
                 After include
         }
-        rxreq 
+        rxreq
         expect req.url == "/foo/body"
         txresp -body {
                 Included file
diff --git a/bin/varnishtest/tests/e00015.vtc b/bin/varnishtest/tests/e00015.vtc
index 7126f6c..3a41237 100644
--- a/bin/varnishtest/tests/e00015.vtc
+++ b/bin/varnishtest/tests/e00015.vtc
@@ -1,21 +1,21 @@
 varnishtest "ESI requests turned off"
 
 server s1 {
-	rxreq 
+	rxreq
 	txresp -body {
 		<html>
 		Before include
 		<esi:include src="/body"/>
 		After include
 	}
-	rxreq 
+	rxreq
 	txresp -body {
 		<html>
 		Before include
 		<esi:include src="/body"/>
 		After include
 	}
-	rxreq 
+	rxreq
 	expect req.url == "/body"
 	txresp -body {
 		Included file
@@ -24,8 +24,8 @@ server s1 {
 
 varnish v1 -vcl+backend {
 	sub vcl_recv {
-	    	if(req.url == "/") {
- 	    	   set req.esi = false;
+		if(req.url == "/") {
+			set req.esi = false;
 		}
 	}
 	sub vcl_backend_response {
diff --git a/bin/varnishtest/tests/e00016.vtc b/bin/varnishtest/tests/e00016.vtc
index 3871915..7f0a71b 100644
--- a/bin/varnishtest/tests/e00016.vtc
+++ b/bin/varnishtest/tests/e00016.vtc
@@ -1,7 +1,7 @@
 varnishtest "ESI request can't be turned off midstream"
 
 server s1 {
-	rxreq 
+	rxreq
 	txresp -body {
 		<html>
 		Before include
@@ -9,7 +9,7 @@ server s1 {
 		<esi:include src="/body3"/>
 		After include
 	}
-	rxreq 
+	rxreq
 	expect req.url == "/body"
 	txresp -body {
 	       <esi:include src="/body2"/>
@@ -31,10 +31,10 @@ varnish v1 -vcl+backend {
 		set beresp.do_esi = true;
 	}
 	sub vcl_deliver {
- 	    	set req.esi = true;	
-	    	if(req.url == "/body") {
-		   set req.esi = false;
-		} 
+		set req.esi = true;
+		if(req.url == "/body") {
+			set req.esi = false;
+		}
 	}
 } -start
 
diff --git a/bin/varnishtest/tests/e00017.vtc b/bin/varnishtest/tests/e00017.vtc
index 121662e..1ced505 100644
--- a/bin/varnishtest/tests/e00017.vtc
+++ b/bin/varnishtest/tests/e00017.vtc
@@ -2,7 +2,7 @@ varnishtest "Aggressive use of ESI include"
 
 
 server s1 {
-	rxreq 
+	rxreq
 	txresp -body {
 		<html>
 		Before include
@@ -28,45 +28,45 @@ server s1 {
 		<esi:include src="/some/very/long/url/with/dozen/of/information/for/esi/subquery/to/munch/and/also/to/try/to/make/object/workspace/explode/by/dumping/a/core/in/some/obscure/directory/on/my/file/system/19"/>
 		After include
 	}
-	rxreq 
+	rxreq
 	txresp -body { Included file 00 }
-	rxreq 
+	rxreq
 	txresp -body { Included file 01 }
-	rxreq 
+	rxreq
 	txresp -body { Included file 02 }
-	rxreq 
+	rxreq
 	txresp -body { Included file 03 }
-	rxreq 
+	rxreq
 	txresp -body { Included file 04 }
-	rxreq 
+	rxreq
 	txresp -body { Included file 05 }
-	rxreq 
+	rxreq
 	txresp -body { Included file 06 }
 	rxreq
 	txresp -body { Included file 07 }
-	rxreq 
+	rxreq
 	txresp -body { Included file 08 }
-	rxreq 
+	rxreq
 	txresp -body { Included file 09 }
-	rxreq 
+	rxreq
 	txresp -body { Included file 10 }
-	rxreq 
+	rxreq
 	txresp -body { Included file 11 }
-	rxreq 
+	rxreq
 	txresp -body { Included file 12 }
-	rxreq 
+	rxreq
 	txresp -body { Included file 13 }
-	rxreq 
+	rxreq
 	txresp -body { Included file 14 }
-	rxreq 
+	rxreq
 	txresp -body { Included file 15 }
-	rxreq 
+	rxreq
 	txresp -body { Included file 16 }
 	rxreq
 	txresp -body { Included file 17 }
-	rxreq 
+	rxreq
 	txresp -body { Included file 18 }
-	rxreq 
+	rxreq
 	txresp -body { Included file 19 }
 } -start
 
@@ -77,7 +77,7 @@ varnish v1 -vcl+backend {
 } -start
 
 client c1 {
-	txreq 
+	txreq
 	rxresp
 	expect resp.status == 200
 }
diff --git a/bin/varnishtest/tests/e00019.vtc b/bin/varnishtest/tests/e00019.vtc
index 374bb18..1aeaa06 100644
--- a/bin/varnishtest/tests/e00019.vtc
+++ b/bin/varnishtest/tests/e00019.vtc
@@ -1,7 +1,7 @@
 varnishtest "Push corners in new ESI parser"
 
 server s1 {
-	rxreq 
+	rxreq
 	txresp -nolen -hdr "Transfer-encoding: chunked"
 	chunked {<1></esi:comment foo><1>}
 	chunked {<2><esi:comment / ><esi:comment doo><2>}
@@ -34,7 +34,7 @@ varnish v1 -vcl+backend {
 			set beresp.do_esi = true;
 		}
 	}
-} -start 
+} -start
 
 varnish v1 -cliok "param.set debug +esi_chop"
 varnish v1 -cliok "param.set debug +syncvsl"
diff --git a/bin/varnishtest/tests/e00020.vtc b/bin/varnishtest/tests/e00020.vtc
index 121c80e..9913e33 100644
--- a/bin/varnishtest/tests/e00020.vtc
+++ b/bin/varnishtest/tests/e00020.vtc
@@ -2,7 +2,7 @@ varnishtest "ESI:remove"
 
 
 server s1 {
-	rxreq 
+	rxreq
 	txresp -gzipbody {
 		<esi:remove>
 		This is a test: Unseen University
@@ -18,12 +18,12 @@ varnish v1 -vcl+backend {
 		set beresp.do_esi = true;
 		set beresp.do_gunzip = true;
 	}
-} -start 
+} -start
 
 varnish v1 -cliok "param.set http_gzip_support true"
 
 client c1 {
-	txreq 
+	txreq
 	rxresp
 	expect resp.status == 200
 	expect resp.bodylen == 40
diff --git a/bin/varnishtest/tests/e00021.vtc b/bin/varnishtest/tests/e00021.vtc
index 9a0ead2..dc8f1cf 100644
--- a/bin/varnishtest/tests/e00021.vtc
+++ b/bin/varnishtest/tests/e00021.vtc
@@ -2,7 +2,7 @@ varnishtest "ESI ability to stitch gzip files together"
 
 
 server s1 {
-	rxreq 
+	rxreq
 	txresp -body {
 		<esi:remove>
 		This is a test: Unseen University
@@ -21,7 +21,7 @@ varnish v1 -vcl+backend {
 		set beresp.do_esi = true;
 		set beresp.do_gzip = true;
 	}
-} -start 
+} -start
 
 varnish v1 -cliok "param.set debug +esi_chop"
 varnish v1 -cliok "param.set http_gzip_support true"
diff --git a/bin/varnishtest/tests/e00022.vtc b/bin/varnishtest/tests/e00022.vtc
index bc5b259..ecc606b 100644
--- a/bin/varnishtest/tests/e00022.vtc
+++ b/bin/varnishtest/tests/e00022.vtc
@@ -2,7 +2,7 @@ varnishtest "ESI ability to stitch gzip files together"
 
 
 server s1 {
-	rxreq 
+	rxreq
 	expect req.http.accept-encoding == gzip
 	txresp -gzipbody {
 		<esi:remove>
@@ -21,7 +21,7 @@ varnish v1 -arg "-p thread_pool_stack=262144" -vcl+backend {
 	sub vcl_backend_response {
 		set beresp.do_esi = true;
 	}
-} -start 
+} -start
 
 varnish v1 -cliok "param.set debug +esi_chop"
 varnish v1 -cliok "param.set http_gzip_support true"
diff --git a/bin/varnishtest/tests/e00023.vtc b/bin/varnishtest/tests/e00023.vtc
index 893fdf9..7d4aeaa 100644
--- a/bin/varnishtest/tests/e00023.vtc
+++ b/bin/varnishtest/tests/e00023.vtc
@@ -1,7 +1,7 @@
 varnishtest "Include gzip'ed and ungzip'ed (ESI) objects in a gzip'ed ESI object"
 
 server s1 {
-	rxreq 
+	rxreq
 	expect req.http.accept-encoding == gzip
 	txresp -gzipbody {
 		<html>					1
@@ -39,11 +39,11 @@ varnish v1 -vcl+backend {
 	sub vcl_backend_response {
 		set beresp.do_esi = true;
 	}
-} -start 
+} -start
 
 varnish v1 -cliok "param.set http_gzip_support true"
-varnish v1 -cliok "param.set debug +esi_chop" 
-varnish v1 -cliok "param.set feature +esi_disable_xml_check" 
+varnish v1 -cliok "param.set debug +esi_chop"
+varnish v1 -cliok "param.set feature +esi_disable_xml_check"
 
 varnish v1 -cliok "param.set debug +syncvsl"
 
diff --git a/bin/varnishtest/tests/e00024.vtc b/bin/varnishtest/tests/e00024.vtc
index 2ae231e..1849360 100644
--- a/bin/varnishtest/tests/e00024.vtc
+++ b/bin/varnishtest/tests/e00024.vtc
@@ -1,7 +1,7 @@
 varnishtest "Test all 8 gzip stopbit residuals"
 
 server s1 {
-	rxreq 
+	rxreq
 	expect req.http.accept-encoding == gzip
 	txresp -gzipbody {
 		<html>					1
@@ -65,10 +65,10 @@ varnish v1 -vcl+backend {
 			set beresp.do_esi = true;
 		}
 	}
-} -start 
+} -start
 
 varnish v1 -cliok "param.set http_gzip_support true"
-varnish v1 -cliok "param.set debug +esi_chop" 
+varnish v1 -cliok "param.set debug +esi_chop"
 varnish v1 -cliok "param.set debug +syncvsl"
 
 client c1 {
@@ -79,7 +79,7 @@ client c1 {
 	expect resp.status == 200
 	expect resp.bodylen == 252
 
-	txreq 
+	txreq
 	rxresp
 	expect resp.http.content-encoding == <undef>
 	expect resp.status == 200
diff --git a/bin/varnishtest/tests/e00025.vtc b/bin/varnishtest/tests/e00025.vtc
index 5e8a12b..e208dc8 100644
--- a/bin/varnishtest/tests/e00025.vtc
+++ b/bin/varnishtest/tests/e00025.vtc
@@ -1,7 +1,7 @@
 varnishtest "Test that esi+gzip correctly bypasses Vary: accept-encoding"
 
 server s1 {
-	rxreq 
+	rxreq
 	expect req.http.accept-encoding == gzip
 	txresp -hdr "Vary: Accept-encoding" -gzipbody {FOO}
 } -start
@@ -16,7 +16,7 @@ client c1 {
 	gunzip
 	expect resp.bodylen == 3
 
-	txreq 
+	txreq
 	rxresp
 	expect resp.http.content-encoding == <undef>
 	expect resp.status == 200
diff --git a/bin/varnishtest/tests/e00026.vtc b/bin/varnishtest/tests/e00026.vtc
index 22e04fc..2e5c06f 100644
--- a/bin/varnishtest/tests/e00026.vtc
+++ b/bin/varnishtest/tests/e00026.vtc
@@ -5,22 +5,22 @@ server s1 {
 	expect req.url == "/foo"
 	txresp -gzipbody {<h1>/////<h2>}
 
-	rxreq 
+	rxreq
 	expect req.url == "/1"
 	expect req.http.accept-encoding == gzip
 	txresp -gzipbody {B<esi:include src="/foo"/>A}
 
-	rxreq 
+	rxreq
 	expect req.url == "/2"
 	expect req.http.accept-encoding == gzip
 	txresp -gzipbody {B<esi:include src="/foo"/>}
 
-	rxreq 
+	rxreq
 	expect req.url == "/3"
 	expect req.http.accept-encoding == gzip
 	txresp -gzipbody {<esi:include src="/foo"/>A}
 
-	rxreq 
+	rxreq
 	expect req.url == "/4"
 	expect req.http.accept-encoding == gzip
 	txresp -gzipbody {<esi:include src="/foo"/>}
@@ -33,7 +33,7 @@ varnish v1 -vcl+backend {
 			set beresp.do_esi = true;
 		}
 	}
-} -start 
+} -start
 
 varnish v1 -cliok "param.set feature +esi_disable_xml_check"
 
diff --git a/bin/varnishtest/tests/e00027.vtc b/bin/varnishtest/tests/e00027.vtc
index eac20d3..3e6388d 100644
--- a/bin/varnishtest/tests/e00027.vtc
+++ b/bin/varnishtest/tests/e00027.vtc
@@ -14,12 +14,12 @@ varnish v1 -vcl+backend {
 } -start
 
 client c1 {
-	txreq  -url "/1" 
-	rxresp 
+	txreq  -url "/1"
+	rxresp
 	expect resp.status == 200
 	expect resp.bodylen == 1
 
-	txreq -req "HEAD" -url "/1" 
+	txreq -req "HEAD" -url "/1"
 	rxresp -no_obj
 	expect resp.status == 200
 } -run
diff --git a/bin/varnishtest/tests/g00000.vtc b/bin/varnishtest/tests/g00000.vtc
index b3631b0..fa8a4bb 100644
--- a/bin/varnishtest/tests/g00000.vtc
+++ b/bin/varnishtest/tests/g00000.vtc
@@ -6,7 +6,7 @@ server s1 {
 } -start
 
 
-varnish v1 -vcl+backend { 
+varnish v1 -vcl+backend {
 	sub vcl_deliver {
 		set resp.http.gzip = req.can_gzip;
 	}
diff --git a/bin/varnishtest/tests/g00001.vtc b/bin/varnishtest/tests/g00001.vtc
index e10b743..ccdc39e 100644
--- a/bin/varnishtest/tests/g00001.vtc
+++ b/bin/varnishtest/tests/g00001.vtc
@@ -10,7 +10,7 @@ varnish v1 -cliok "param.set http_gzip_support true" -vcl+backend {
 } -start
 
 client c1 {
-	txreq 
+	txreq
 	rxresp
 	expect resp.bodylen == "3"
 	expect resp.http.content-encoding == <undef>
diff --git a/bin/varnishtest/tests/g00003.vtc b/bin/varnishtest/tests/g00003.vtc
index db4ed17..6fdae5c 100644
--- a/bin/varnishtest/tests/g00003.vtc
+++ b/bin/varnishtest/tests/g00003.vtc
@@ -44,7 +44,7 @@ client c1 {
 	gunzip
 	expect resp.bodylen == 43
 
-	txreq -url /foobar 
+	txreq -url /foobar
 	rxresp
 	expect resp.http.content-encoding == <undef>
 	expect resp.bodylen == 43
diff --git a/bin/varnishtest/tests/g00004.vtc b/bin/varnishtest/tests/g00004.vtc
index 703cacc..9453720 100644
--- a/bin/varnishtest/tests/g00004.vtc
+++ b/bin/varnishtest/tests/g00004.vtc
@@ -24,9 +24,9 @@ varnish v1 \
 
 		if (bereq.url == "/gunzip") {
 			set beresp.do_gunzip = true;
-		} 
+		}
 	}
-} 
+}
 
 varnish v1 -cliok "param.set debug +syncvsl"
 
diff --git a/bin/varnishtest/tests/g00005.vtc b/bin/varnishtest/tests/g00005.vtc
index 9917937..158a264 100644
--- a/bin/varnishtest/tests/g00005.vtc
+++ b/bin/varnishtest/tests/g00005.vtc
@@ -10,7 +10,7 @@ varnish v1 -cliok "param.set http_gzip_support true" -vcl+backend {
 } -start
 
 client c1 {
-	txreq 
+	txreq
 	rxresp
 	expect resp.bodylen == "10"
 	expect resp.http.content-encoding == <undef>
diff --git a/bin/varnishtest/tests/m00000.vtc b/bin/varnishtest/tests/m00000.vtc
index 9233628..c4f1286 100644
--- a/bin/varnishtest/tests/m00000.vtc
+++ b/bin/varnishtest/tests/m00000.vtc
@@ -1,7 +1,7 @@
 varnishtest "Test std & debug vmod"
 
 server s1 {
-	rxreq 
+	rxreq
 	txresp -hdr "foo: bAr" -hdr "bar: fOo" -bodylen 4
 } -start
 
diff --git a/bin/varnishtest/tests/m00001.vtc b/bin/varnishtest/tests/m00001.vtc
index 5d07b97..59b8e0b 100644
--- a/bin/varnishtest/tests/m00001.vtc
+++ b/bin/varnishtest/tests/m00001.vtc
@@ -1,7 +1,7 @@
 varnishtest "Test std vmod"
 
 server s1 {
-	rxreq 
+	rxreq
 	txresp -hdr "foo: bAr" -hdr "bar: fOo" -bodylen 4
 } -start
 
diff --git a/bin/varnishtest/tests/m00002.vtc b/bin/varnishtest/tests/m00002.vtc
index f95bee8..09b5c78 100644
--- a/bin/varnishtest/tests/m00002.vtc
+++ b/bin/varnishtest/tests/m00002.vtc
@@ -24,7 +24,7 @@ varnish v1 -vcl+backend {
 varnish v1 -cliok "debug.srandom 1"
 
 client c1 {
-	txreq 
+	txreq
 	rxresp
 	expect resp.http.rnd1 == 0.388
 	expect resp.http.rnd2 == 7.478
diff --git a/bin/varnishtest/tests/m00003.vtc b/bin/varnishtest/tests/m00003.vtc
index d1e36c2..9e93f6e 100644
--- a/bin/varnishtest/tests/m00003.vtc
+++ b/bin/varnishtest/tests/m00003.vtc
@@ -1,7 +1,7 @@
 varnishtest "Test vmod_dir param"
 
 server s1 {
-	rxreq 
+	rxreq
 	txresp -hdr "foo: bAr" -hdr "bar: fOo" -bodylen 4
 } -start
 
diff --git a/bin/varnishtest/tests/m00004.vtc b/bin/varnishtest/tests/m00004.vtc
index 232428b..6a23bde 100644
--- a/bin/varnishtest/tests/m00004.vtc
+++ b/bin/varnishtest/tests/m00004.vtc
@@ -65,7 +65,7 @@ varnish v1 -vcl+backend {
 			set resp.http.three = std.fileread("${tmpdir}/m00004_file_three");
 		}
 	}
-} 
+}
 
 varnish v1 -cli "vcl.list"
 varnish v1 -cli "vcl.use vcl2"
diff --git a/bin/varnishtest/tests/m00006.vtc b/bin/varnishtest/tests/m00006.vtc
index 740ba38..f9ce764 100644
--- a/bin/varnishtest/tests/m00006.vtc
+++ b/bin/varnishtest/tests/m00006.vtc
@@ -31,7 +31,7 @@ varnish v1 -vcl+backend {
 
 client c1 {
 	txreq  -url "/1" -hdr "Foo: 1" -hdr "Foo: 2"
-	rxresp 
+	rxresp
 	expect resp.http.bar == "a, b"
 	expect resp.status == 200
 	expect resp.bodylen == 1
diff --git a/bin/varnishtest/tests/m00007.vtc b/bin/varnishtest/tests/m00007.vtc
index 68ee347..2b1c43a 100644
--- a/bin/varnishtest/tests/m00007.vtc
+++ b/bin/varnishtest/tests/m00007.vtc
@@ -26,7 +26,7 @@ client c1 {
 	expect resp.http.smallerthanzero == false
 	expect resp.http.iszero == false
 	expect resp.http.converted == 1
-	
+
 	txreq -url "/1"  -hdr "foo: -1"
 	rxresp
 	expect resp.status == 200
diff --git a/bin/varnishtest/tests/m00008.vtc b/bin/varnishtest/tests/m00008.vtc
index c9d2bd8..c1bdd6b 100644
--- a/bin/varnishtest/tests/m00008.vtc
+++ b/bin/varnishtest/tests/m00008.vtc
@@ -1,7 +1,7 @@
 varnishtest "Test std vmod vs. unsafe_path"
 
 server s1 {
-	rxreq 
+	rxreq
 	txresp -hdr "foo: bAr" -hdr "bar: fOo" -bodylen 4
 } -start
 
diff --git a/bin/varnishtest/tests/p00000.vtc b/bin/varnishtest/tests/p00000.vtc
index 745abf5..461da5f 100644
--- a/bin/varnishtest/tests/p00000.vtc
+++ b/bin/varnishtest/tests/p00000.vtc
@@ -1,8 +1,8 @@
 varnishtest "Test Basic persistence"
 
 server s1 {
-	rxreq 
-	txresp 
+	rxreq
+	txresp
 } -start
 
 shell "rm -f ${tmpdir}/_.per"
@@ -10,7 +10,7 @@ shell "rm -f ${tmpdir}/_.per"
 varnish v1 \
 	-arg "-pfeature=+wait_silo" \
 	-storage "-spersistent,${tmpdir}/_.per,10m" \
-	-vcl+backend { } -start 
+	-vcl+backend { } -start
 
 varnish v1 -stop
 
diff --git a/bin/varnishtest/tests/p00001.vtc b/bin/varnishtest/tests/p00001.vtc
index e8c4aa5..626b47d 100644
--- a/bin/varnishtest/tests/p00001.vtc
+++ b/bin/varnishtest/tests/p00001.vtc
@@ -3,7 +3,7 @@ varnishtest "Change TTL on persistent object"
 shell "rm -f ${tmpdir}/_.per"
 
 server s1 {
-	rxreq 
+	rxreq
 	txresp -hdr "Foo: foo"
 } -start
 
@@ -11,7 +11,7 @@ varnish v1 \
 	-arg "-pfeature=+wait_silo" \
 	-arg "-pban_lurker_sleep=0" \
 	-storage "-spersistent,${tmpdir}/_.per,10m" \
-	-vcl+backend { } -start 
+	-vcl+backend { } -start
 
 varnish v1 -cliok "param.set default_grace 0"
 varnish v1 -cliok "param.set default_keep 0"
@@ -48,7 +48,7 @@ client c1 {
 varnish v1 -stop
 
 server s1 {
-	rxreq 
+	rxreq
 	txresp -hdr "Foo: bar"
 } -start
 
diff --git a/bin/varnishtest/tests/p00002.vtc b/bin/varnishtest/tests/p00002.vtc
index 53bf892..4475918 100644
--- a/bin/varnishtest/tests/p00002.vtc
+++ b/bin/varnishtest/tests/p00002.vtc
@@ -3,7 +3,7 @@ varnishtest "Ban a persistent object"
 shell "rm -f ${tmpdir}/_.per[12]"
 
 server s1 {
-	rxreq 
+	rxreq
 	txresp -hdr "Foo: foo"
 } -start
 
@@ -11,7 +11,7 @@ varnish v1 \
 	-arg "-pfeature=+wait_silo" \
 	-arg "-pban_lurker_sleep=0" \
 	-storage "-spersistent,${tmpdir}/_.per1,10m -spersistent,${tmpdir}/_.per2,10m" \
-	-vcl+backend { } -start 
+	-vcl+backend { } -start
 
 client c1 {
 	txreq -url "/"
@@ -26,7 +26,7 @@ varnish v1 -stop
 server s1 -wait
 
 server s1 {
-	rxreq 
+	rxreq
 	txresp -hdr "Foo: bar"
 } -start
 
diff --git a/bin/varnishtest/tests/p00003.vtc b/bin/varnishtest/tests/p00003.vtc
index 4af3b14..573c8fe 100644
--- a/bin/varnishtest/tests/p00003.vtc
+++ b/bin/varnishtest/tests/p00003.vtc
@@ -3,7 +3,7 @@ varnishtest "Ban a persistent object"
 shell "rm -f ${tmpdir}/_.per"
 
 server s1 {
-	rxreq 
+	rxreq
 	txresp -hdr "Foo: foo"
 } -start
 
@@ -11,7 +11,7 @@ varnish v1 \
 	-arg "-pfeature=+wait_silo" \
 	-storage "-spersistent,${tmpdir}/_.per,10m" \
 	-arg "-pban_lurker_sleep=0" \
-	-vcl+backend { } -start 
+	-vcl+backend { } -start
 
 varnish v1 -cliok ban.list
 
@@ -29,7 +29,7 @@ varnish v1 -stop
 server s1 -wait
 
 server s1 {
-	rxreq 
+	rxreq
 	txresp -hdr "Foo: bar"
 } -start
 
diff --git a/bin/varnishtest/tests/p00004.vtc b/bin/varnishtest/tests/p00004.vtc
index f1e4368..21ceaef 100644
--- a/bin/varnishtest/tests/p00004.vtc
+++ b/bin/varnishtest/tests/p00004.vtc
@@ -3,9 +3,9 @@ varnishtest "Check object references"
 shell "rm -f ${tmpdir}/_.per"
 
 server s1 {
-	rxreq 
+	rxreq
 	txresp -hdr "Foo: foo"
-	rxreq 
+	rxreq
 	txresp -hdr "Bar: bar"
 } -start
 
@@ -13,7 +13,7 @@ varnish v1 \
 	-arg "-pfeature=+wait_silo" \
 	-storage "-spersistent,${tmpdir}/_.per,10m" \
 	-arg "-pban_lurker_sleep=0" \
-	-vcl+backend { } -start 
+	-vcl+backend { } -start
 
 client c1 {
 	txreq -url "/foo"
@@ -36,7 +36,7 @@ client c1 {
 varnish v1 -expect n_object == 2
 
 varnish v1 -stop
-varnish v1 -start 
+varnish v1 -start
 varnish v1 -cliok "debug.xid 1999"
 
 varnish v1 -expect n_vampireobject == 2
diff --git a/bin/varnishtest/tests/p00005.vtc b/bin/varnishtest/tests/p00005.vtc
index a3d7051..f9a3682 100644
--- a/bin/varnishtest/tests/p00005.vtc
+++ b/bin/varnishtest/tests/p00005.vtc
@@ -3,18 +3,18 @@ varnishtest "Check expiry of non-instantiated object"
 shell "rm -f ${tmpdir}/_.per"
 
 server s1 {
-	rxreq 
+	rxreq
 	txresp -hdr "Foo: foo1"
 } -start
 
 varnish v1 \
 	-storage "-spersistent,${tmpdir}/_.per,10m" \
 	-arg "-pban_lurker_sleep=0" \
-	-vcl+backend { 
+	-vcl+backend {
 		sub vcl_backend_response {
 			set beresp.ttl = 3s;
 		}
-	} -start 
+	} -start
 
 varnish v1 -cliok "param.set debug +syncvsl"
 varnish v1 -cliok "param.set feature +wait_silo"
@@ -32,7 +32,7 @@ varnish v1 -expect n_object == 1
 varnish v1 -stop
 
 server s1 -wait {
-	rxreq 
+	rxreq
 	txresp -hdr "Foo: foo2"
 } -start
 
diff --git a/bin/varnishtest/tests/p00006.vtc b/bin/varnishtest/tests/p00006.vtc
index 0adb67b..09b88e0 100644
--- a/bin/varnishtest/tests/p00006.vtc
+++ b/bin/varnishtest/tests/p00006.vtc
@@ -3,9 +3,9 @@ varnishtest "Check that Vary headers are stored"
 shell "rm -f ${tmpdir}/_.per"
 
 server s1 {
-	rxreq 
+	rxreq
 	txresp -hdr "Foo: foo1" -hdr "Vary: foo, bar"
-	rxreq 
+	rxreq
 	txresp -hdr "Foo: foo2" -hdr "Vary: foo, bar"
 } -start
 
@@ -13,7 +13,7 @@ server s1 {
 varnish v1 \
 	-storage "-spersistent,${tmpdir}/_.per,10m" \
 	-arg "-pban_lurker_sleep=0" \
-	-vcl+backend { } -start 
+	-vcl+backend { } -start
 
 client c1 {
 	txreq -url "/foo" -hdr "foo: 1" -hdr "bar: 2"
diff --git a/bin/varnishtest/tests/p00008.vtc b/bin/varnishtest/tests/p00008.vtc
index d72c627..4ac6f8b 100644
--- a/bin/varnishtest/tests/p00008.vtc
+++ b/bin/varnishtest/tests/p00008.vtc
@@ -24,7 +24,7 @@ varnish v1 \
 				set beresp.storage = "per2";
 			}
 		}
-	} -start 
+	} -start
 client c1 {
 	txreq -url "/silo1"
 	rxresp
@@ -63,7 +63,7 @@ varnish v3 -stop
 # Only silo 2
 # Check that /silo2 is banned
 server s1 {
-	rxreq 
+	rxreq
 	expect req.url == "/silo2"
 	txresp -hdr "X-Foo: bar"
 } -start
diff --git a/bin/varnishtest/tests/p00009.vtc b/bin/varnishtest/tests/p00009.vtc
index 36196d7..a3dcf7b 100644
--- a/bin/varnishtest/tests/p00009.vtc
+++ b/bin/varnishtest/tests/p00009.vtc
@@ -38,7 +38,7 @@ varnish v1 -expect bans_dups == 1
 # Expect ban_magic plus our 1 dup to be marked gone
 varnish v1 -expect bans_gone == 2
 
-# Restart 
+# Restart
 varnish v1 -stop
 varnish v1 -start
 varnish v1 -cliok "ban.list"
diff --git a/bin/varnishtest/tests/r00102.vtc b/bin/varnishtest/tests/r00102.vtc
index 8c0b784..cf8a1bb 100644
--- a/bin/varnishtest/tests/r00102.vtc
+++ b/bin/varnishtest/tests/r00102.vtc
@@ -1,19 +1,19 @@
 varnishtest "Test POST->GET conversion"
 
 server s1 {
-	rxreq 
+	rxreq
 	txresp \
 		-hdr "Connection: close" \
 		-body "012345\n"
 } -start
 
-varnish v1 -vcl+backend { 
+varnish v1 -vcl+backend {
 	sub vcl_recv {
 		if (req.method == "POST") {
 			set req.method = "GET";
 		}
 	}
-} -start 
+} -start
 
 client c1 {
 	txreq -req POST -url "/" \
diff --git a/bin/varnishtest/tests/r00251.vtc b/bin/varnishtest/tests/r00251.vtc
index a337cce..0b3c741 100644
--- a/bin/varnishtest/tests/r00251.vtc
+++ b/bin/varnishtest/tests/r00251.vtc
@@ -1,21 +1,21 @@
 varnishtest "Regression test for #251: segfault on regsub on missing http header"
 
 server s1 {
-	rxreq 
+	rxreq
 	txresp \
 		-hdr "Foobar: _barf_" \
 		-hdr "Connection: close" \
 		-body "012345\n"
 } -start
 
-varnish v1 -vcl+backend { 
+varnish v1 -vcl+backend {
 	sub vcl_backend_response {
 		set beresp.http.Snafu1 =
 		    "zoom" +
 		    regsub(beresp.http.Foomble, "ar", "\0\0") +
 		    "box";
 	}
-} -start 
+} -start
 
 client c1 {
 	txreq -url "/"
diff --git a/bin/varnishtest/tests/r00255.vtc b/bin/varnishtest/tests/r00255.vtc
index 3a897d7..1aedcc1 100644
--- a/bin/varnishtest/tests/r00255.vtc
+++ b/bin/varnishtest/tests/r00255.vtc
@@ -1,7 +1,7 @@
 varnishtest "Regression test for #255: Segfault on header token separation"
 
 server s1 {
-	rxreq 
+	rxreq
 	txresp \
 	    -hdr "Date: Thu, 19 Jun 2008 21:14:49 GMT" \
 	    -hdr "Expires: Thu, 19 Jun 2008 21:14:49 GMT" \
@@ -10,7 +10,7 @@ server s1 {
 	    -body "012345\n"
 } -start
 
-varnish v1 -vcl+backend { sub vcl_recv {set req.backend = s1;} } -start 
+varnish v1 -vcl+backend { sub vcl_recv {set req.backend = s1;} } -start
 
 client c1 {
 	txreq -url "/"
diff --git a/bin/varnishtest/tests/r00262.vtc b/bin/varnishtest/tests/r00262.vtc
index 09ed730..b5a9efc 100644
--- a/bin/varnishtest/tests/r00262.vtc
+++ b/bin/varnishtest/tests/r00262.vtc
@@ -1,13 +1,13 @@
 varnishtest "Test that inter-request whitespace trimming works"
 
 server s1 {
-	rxreq 
+	rxreq
 	txresp \
 		-hdr "Connection: close" \
 		-body "012345\n"
 } -start
 
-varnish v1 -arg "-p timeout_linger=20" -vcl+backend { } -start 
+varnish v1 -arg "-p timeout_linger=20" -vcl+backend { } -start
 
 client c1 {
 	send "GET / HTTP/1.1\r\n\r\n\r\n"
diff --git a/bin/varnishtest/tests/r00263.vtc b/bin/varnishtest/tests/r00263.vtc
index 8ae4bd7..aad4784 100644
--- a/bin/varnishtest/tests/r00263.vtc
+++ b/bin/varnishtest/tests/r00263.vtc
@@ -19,6 +19,6 @@ varnish v1  -vcl {
 	sub vcl_recv {
 		set req.backend = cluster.backend();
 	}
-} -start 
+} -start
 
 varnish v1 -wait
diff --git a/bin/varnishtest/tests/r00292.vtc b/bin/varnishtest/tests/r00292.vtc
index 7739e85..f6bc807 100644
--- a/bin/varnishtest/tests/r00292.vtc
+++ b/bin/varnishtest/tests/r00292.vtc
@@ -15,7 +15,7 @@ server s1 {
 	txresp -body "foobar"
 } -start
 
-varnish v1 -vcl+backend { 
+varnish v1 -vcl+backend {
 
 	sub vcl_recv {
 		remove req.http.hdr1;
diff --git a/bin/varnishtest/tests/r00318.vtc b/bin/varnishtest/tests/r00318.vtc
index a30bdab..f677a1c 100644
--- a/bin/varnishtest/tests/r00318.vtc
+++ b/bin/varnishtest/tests/r00318.vtc
@@ -1,7 +1,7 @@
 varnishtest "ESI with no body in response"
 
 server s1 {
-	rxreq 
+	rxreq
 	txresp -status 302
 } -start
 
@@ -13,7 +13,7 @@ varnish v1 -vcl+backend {
 } -start
 
 client c1 {
-	txreq 
+	txreq
 	rxresp
 	expect resp.status == 302
 } -run
diff --git a/bin/varnishtest/tests/r00326.vtc b/bin/varnishtest/tests/r00326.vtc
index 09cd013..00ac603 100644
--- a/bin/varnishtest/tests/r00326.vtc
+++ b/bin/varnishtest/tests/r00326.vtc
@@ -1,9 +1,9 @@
 varnishtest "No zerolength verbatim before <esi:include...>"
 
 server s1 {
-	rxreq 
+	rxreq
 	txresp -body {<esi:include src="/foo"/><esi:include src="/foo"/>}
-	rxreq 
+	rxreq
 	txresp -body "FOO\n"
 } -start
 
@@ -14,7 +14,7 @@ varnish v1 -vcl+backend {
 } -start
 
 client c1 {
-	txreq 
+	txreq
 	rxresp
 	expect resp.status == 200
 	expect resp.bodylen == 8
diff --git a/bin/varnishtest/tests/r00345.vtc b/bin/varnishtest/tests/r00345.vtc
index b6c819a..8ce2d53 100644
--- a/bin/varnishtest/tests/r00345.vtc
+++ b/bin/varnishtest/tests/r00345.vtc
@@ -1,9 +1,9 @@
 varnishtest "#345, ESI waitinglist trouble"
 
 server s1 {
-	rxreq 
+	rxreq
 	txresp -body {<esi:include src="someurl">}
-	rxreq 
+	rxreq
 	sema r1 sync 2
 	delay 1
 	txresp -body {DATA}
diff --git a/bin/varnishtest/tests/r00365.vtc b/bin/varnishtest/tests/r00365.vtc
index dc1d590..43c76b3 100644
--- a/bin/varnishtest/tests/r00365.vtc
+++ b/bin/varnishtest/tests/r00365.vtc
@@ -9,7 +9,7 @@ server s1 {
 	txresp -status 200 -body "22"
 } -start
 
-varnish v1 -vcl+backend { 
+varnish v1 -vcl+backend {
 	sub vcl_hit {
 		set obj.ttl = 0s;
 		return (restart);
diff --git a/bin/varnishtest/tests/r00386.vtc b/bin/varnishtest/tests/r00386.vtc
index 3d43b5a..946d14c 100644
--- a/bin/varnishtest/tests/r00386.vtc
+++ b/bin/varnishtest/tests/r00386.vtc
@@ -4,7 +4,7 @@ server s1 {
 	rxreq
 	expect req.url == "/body"
 	txresp -hdr "Last-Modified: Tue, 25 Nov 2008 00:00:00 GMT" -body "BODY"
-	rxreq 
+	rxreq
 	expect req.url == "/"
 	txresp -body {<X><esi:include src="/body"/></X>}
 } -start
diff --git a/bin/varnishtest/tests/r00411.vtc b/bin/varnishtest/tests/r00411.vtc
index 98c478e..775cd68 100644
--- a/bin/varnishtest/tests/r00411.vtc
+++ b/bin/varnishtest/tests/r00411.vtc
@@ -10,7 +10,7 @@ server s1 {
 	txresp -status 200 -body "1"
 } -start
 
-varnish v1 -vcl+backend { 
+varnish v1 -vcl+backend {
 	sub vcl_hit {
 		if (obj.http.X-Magic-Redirect == "1") {
 			set req.url = obj.http.Location;
diff --git a/bin/varnishtest/tests/r00412.vtc b/bin/varnishtest/tests/r00412.vtc
index 4cb988b..628dc0f 100644
--- a/bin/varnishtest/tests/r00412.vtc
+++ b/bin/varnishtest/tests/r00412.vtc
@@ -3,7 +3,7 @@ varnishtest "Regression test for ticket 412"
 server s1 {
 	rxreq
 	expect req.url == "/"
-	txresp -status 303 -hdr "Location: /foo" 
+	txresp -status 303 -hdr "Location: /foo"
 	accept
 	rxreq
 	expect req.url == "/foo"
diff --git a/bin/varnishtest/tests/r00427.vtc b/bin/varnishtest/tests/r00427.vtc
index aa7d6ae..a75247b 100644
--- a/bin/varnishtest/tests/r00427.vtc
+++ b/bin/varnishtest/tests/r00427.vtc
@@ -6,7 +6,7 @@ server s1 {
 		<esi:include src="/foo">
 		<esi:include src="/bar">
 		<esi:include src="/barf">
-	} 
+	}
 
 	rxreq
 	expect req.url == "/foo"
diff --git a/bin/varnishtest/tests/r00445.vtc b/bin/varnishtest/tests/r00445.vtc
index 137ab15..1d6be3b 100644
--- a/bin/varnishtest/tests/r00445.vtc
+++ b/bin/varnishtest/tests/r00445.vtc
@@ -6,7 +6,7 @@ server s1 {
 	txresp -body {<foo><esi:include src="/bar"><bar>}
 	rxreq
 	expect req.url == "/bar"
-	txresp 
+	txresp
 } -start
 
 varnish v1 -vcl+backend {
diff --git a/bin/varnishtest/tests/r00466.vtc b/bin/varnishtest/tests/r00466.vtc
index e509de8..b672681 100644
--- a/bin/varnishtest/tests/r00466.vtc
+++ b/bin/varnishtest/tests/r00466.vtc
@@ -1,14 +1,14 @@
 varnishtest "Check Range forwarding to backend"
 
 server s1 {
-	rxreq 
+	rxreq
 	expect req.url == "/foo"
 	expect req.http.range == <undef>
 	txresp \
 		-hdr "Foobar: _barf_" \
 		-body "012345\n"
 
-	rxreq 
+	rxreq
 	expect req.url == "/bar"
 	expect req.http.range == "200-300"
 	txresp \
@@ -17,7 +17,7 @@ server s1 {
 		-body "012345\n"
 } -start
 
-varnish v1 -vcl+backend { 
+varnish v1 -vcl+backend {
 	sub vcl_recv {
 		if (req.url ~ "bar") {
 			return(pass);
diff --git a/bin/varnishtest/tests/r00476.vtc b/bin/varnishtest/tests/r00476.vtc
index 976d434..9804d2f 100644
--- a/bin/varnishtest/tests/r00476.vtc
+++ b/bin/varnishtest/tests/r00476.vtc
@@ -6,7 +6,7 @@ server s1 {
 	txresp -body {<a><esi:include src="/bar"><b>\0c}
 	rxreq
 	expect req.url == "/bar"
-	txresp 
+	txresp
 	rxreq
 	expect req.url == "/comment"
 	txresp -body {<a><!--esi foo --><b>\0c}
@@ -22,7 +22,7 @@ varnish v1 -vcl+backend {
 } -start
 
 client c1 {
-	txreq 
+	txreq
 	rxresp
 	expect resp.bodylen == 8
 	txreq -url /comment
diff --git a/bin/varnishtest/tests/r00495.vtc b/bin/varnishtest/tests/r00495.vtc
index 76ed867..694c4b2 100644
--- a/bin/varnishtest/tests/r00495.vtc
+++ b/bin/varnishtest/tests/r00495.vtc
@@ -30,13 +30,13 @@ client c1 {
 	txreq
 	rxresp
 	expect resp.status == 201
-	txreq 
+	txreq
 	rxresp
 	expect resp.status == 202
-	txreq 
+	txreq
 	rxresp
 	expect resp.status == 203
-	txreq 
+	txreq
 	rxresp
 	expect resp.status == 205
 } -run
diff --git a/bin/varnishtest/tests/r00498.vtc b/bin/varnishtest/tests/r00498.vtc
index efdb93a..c9f2520 100644
--- a/bin/varnishtest/tests/r00498.vtc
+++ b/bin/varnishtest/tests/r00498.vtc
@@ -12,7 +12,7 @@ varnish v1 -vcl+backend {
 varnish v1 -cliok "param.set http_resp_hdr_len 32768"
 
 client c1 {
-	txreq 
+	txreq
 	rxresp
 	expect resp.bodylen == 3
 } -run
diff --git a/bin/varnishtest/tests/r00524.vtc b/bin/varnishtest/tests/r00524.vtc
index 46445a8..5fbd1f5 100644
--- a/bin/varnishtest/tests/r00524.vtc
+++ b/bin/varnishtest/tests/r00524.vtc
@@ -4,9 +4,9 @@ server s1 {
 	rxreq
 	expect req.url == "/"
 	txresp -body {
-		<esi:remove> </esi:remove> 
+		<esi:remove> </esi:remove>
 		<esi:include src="/foo"/>
-		<esi:remove> </esi:remove> 
+		<esi:remove> </esi:remove>
 	}
 
 	rxreq
@@ -27,5 +27,5 @@ client c1 {
 	txreq -proto HTTP/1.0 -hdr "Connection: kEep-alive"
 	rxresp
 	expect resp.status == 200
-	expect resp.bodylen == 18
+	expect resp.bodylen == 16
 } -run
diff --git a/bin/varnishtest/tests/r00561.vtc b/bin/varnishtest/tests/r00561.vtc
index 0a273b0..1efc0a7 100644
--- a/bin/varnishtest/tests/r00561.vtc
+++ b/bin/varnishtest/tests/r00561.vtc
@@ -17,6 +17,6 @@ client c1 {
 } -run
 
 client c1 {
-	txreq 
+	txreq
 	rxresp
 } -run
diff --git a/bin/varnishtest/tests/r00590.vtc b/bin/varnishtest/tests/r00590.vtc
index 960ebd1..ce16ba5 100644
--- a/bin/varnishtest/tests/r00590.vtc
+++ b/bin/varnishtest/tests/r00590.vtc
@@ -4,50 +4,50 @@ server s1 {
 	rxreq
 	expect req.url == "/"
 	txresp -body {
-		<esi:remove> </esi:remove> 
-		<esi:remove> </esi:remove> 
-		<esi:remove> </esi:remove> 
-		<esi:remove> </esi:remove> 
-		<esi:remove> </esi:remove> 
-		<esi:remove> </esi:remove> 
-		<esi:remove> </esi:remove> 
-		<esi:remove> </esi:remove> 
-		<esi:remove> </esi:remove> 
-		<esi:remove> </esi:remove> 
-		<esi:remove> </esi:remove> 
-		<esi:remove> </esi:remove> 
-		<esi:remove> </esi:remove> 
-		<esi:remove> </esi:remove> 
-		<esi:remove> </esi:remove> 
-		<esi:remove> </esi:remove> 
-		<esi:remove> </esi:remove> 
-		<esi:remove> </esi:remove> 
-		<esi:remove> </esi:remove> 
-		<esi:remove> </esi:remove> 
-		<esi:remove> </esi:remove> 
-		<esi:remove> </esi:remove> 
-		<esi:remove> </esi:remove> 
-		<esi:remove> </esi:remove> 
-		<esi:remove> </esi:remove> 
-		<esi:remove> </esi:remove> 
-		<esi:remove> </esi:remove> 
-		<esi:remove> </esi:remove> 
-		<esi:remove> </esi:remove> 
-		<esi:remove> </esi:remove> 
-		<esi:remove> </esi:remove> 
-		<esi:remove> </esi:remove> 
-		<esi:remove> </esi:remove> 
-		<esi:remove> </esi:remove> 
-		<esi:remove> </esi:remove> 
-		<esi:remove> </esi:remove> 
-		<esi:remove> </esi:remove> 
-		<esi:remove> </esi:remove> 
-		<esi:remove> </esi:remove> 
-		<esi:remove> </esi:remove> 
-		<esi:remove> </esi:remove> 
-		<esi:remove> </esi:remove> 
-		<esi:remove> </esi:remove> 
-		<esi:remove> </esi:remove> 
+		<esi:remove> </esi:remove>
+		<esi:remove> </esi:remove>
+		<esi:remove> </esi:remove>
+		<esi:remove> </esi:remove>
+		<esi:remove> </esi:remove>
+		<esi:remove> </esi:remove>
+		<esi:remove> </esi:remove>
+		<esi:remove> </esi:remove>
+		<esi:remove> </esi:remove>
+		<esi:remove> </esi:remove>
+		<esi:remove> </esi:remove>
+		<esi:remove> </esi:remove>
+		<esi:remove> </esi:remove>
+		<esi:remove> </esi:remove>
+		<esi:remove> </esi:remove>
+		<esi:remove> </esi:remove>
+		<esi:remove> </esi:remove>
+		<esi:remove> </esi:remove>
+		<esi:remove> </esi:remove>
+		<esi:remove> </esi:remove>
+		<esi:remove> </esi:remove>
+		<esi:remove> </esi:remove>
+		<esi:remove> </esi:remove>
+		<esi:remove> </esi:remove>
+		<esi:remove> </esi:remove>
+		<esi:remove> </esi:remove>
+		<esi:remove> </esi:remove>
+		<esi:remove> </esi:remove>
+		<esi:remove> </esi:remove>
+		<esi:remove> </esi:remove>
+		<esi:remove> </esi:remove>
+		<esi:remove> </esi:remove>
+		<esi:remove> </esi:remove>
+		<esi:remove> </esi:remove>
+		<esi:remove> </esi:remove>
+		<esi:remove> </esi:remove>
+		<esi:remove> </esi:remove>
+		<esi:remove> </esi:remove>
+		<esi:remove> </esi:remove>
+		<esi:remove> </esi:remove>
+		<esi:remove> </esi:remove>
+		<esi:remove> </esi:remove>
+		<esi:remove> </esi:remove>
+		<esi:remove> </esi:remove>
 		<esi:include src="/fooooooooooooo"/>
 	}
 
@@ -69,5 +69,5 @@ client c1 {
 	txreq
 	rxresp
 	expect resp.status == 200
-	expect resp.bodylen == 184
+	expect resp.bodylen == 140
 } -run
diff --git a/bin/varnishtest/tests/r00641.vtc b/bin/varnishtest/tests/r00641.vtc
index 7fefc8e..a9ad147 100644
--- a/bin/varnishtest/tests/r00641.vtc
+++ b/bin/varnishtest/tests/r00641.vtc
@@ -4,9 +4,9 @@ server s1 {
 	rxreq
 	expect req.url == "/"
 	txresp -proto HTTP/1.0 -body {
-		<esi:remove> </esi:remove> 
+		<esi:remove> </esi:remove>
 		<_esi:include src="/foo"/>
-		<esi:remove> </esi:remove> 
+		<esi:remove> </esi:remove>
 	}
 
 } -start
@@ -25,5 +25,5 @@ client c1 {
 	rxresp
 	# XXX this is the problem:  expect resp.proto == HTTP/1.1
 	expect resp.status == 200
-	expect resp.bodylen == 39
+	expect resp.bodylen == 37
 } -run
diff --git a/bin/varnishtest/tests/r00679.vtc b/bin/varnishtest/tests/r00679.vtc
index ba5ca68..46af597 100644
--- a/bin/varnishtest/tests/r00679.vtc
+++ b/bin/varnishtest/tests/r00679.vtc
@@ -3,7 +3,7 @@ varnishtest "pass + HEAD"
 server s1 {
 	rxreq
 	expect req.method == "HEAD"
-	txresp 
+	txresp
 } -start
 
 varnish v1 -vcl+backend {} -start
diff --git a/bin/varnishtest/tests/r00686.vtc b/bin/varnishtest/tests/r00686.vtc
index 2163ce4..1813819 100644
--- a/bin/varnishtest/tests/r00686.vtc
+++ b/bin/varnishtest/tests/r00686.vtc
@@ -5,7 +5,7 @@ server s1 {
 	txresp -hdr "Cache-Control: foo" -hdr "Cache-control: bar" -bodylen 4
 } -start
 
-varnish v1 -vcl+backend { 
+varnish v1 -vcl+backend {
 	sub vcl_deliver {
 		set resp.http.Foo = req.http.cache-control;
 	}
diff --git a/bin/varnishtest/tests/r00730.vtc b/bin/varnishtest/tests/r00730.vtc
index 4e4fe24..bb416e8 100644
--- a/bin/varnishtest/tests/r00730.vtc
+++ b/bin/varnishtest/tests/r00730.vtc
@@ -27,7 +27,7 @@ varnish v1 -vcl+backend {
 	sub vcl_backend_response {
 		set beresp.do_stream = false;
 	}
-} 
+}
 
 client c1 {
 	txreq -req HEAD
diff --git a/bin/varnishtest/tests/r00742.vtc b/bin/varnishtest/tests/r00742.vtc
index 008f2f7..1a4dbb5 100644
--- a/bin/varnishtest/tests/r00742.vtc
+++ b/bin/varnishtest/tests/r00742.vtc
@@ -1,7 +1,7 @@
 varnishtest "% escapes in VCL source and vcl.show"
 
 server s1 {
-	rxreq	
+	rxreq
 	txresp
 } -start
 
diff --git a/bin/varnishtest/tests/r00776.vtc b/bin/varnishtest/tests/r00776.vtc
index 53cc37e..530168d 100644
--- a/bin/varnishtest/tests/r00776.vtc
+++ b/bin/varnishtest/tests/r00776.vtc
@@ -12,6 +12,6 @@ varnish v1 \
 	-arg "-s malloc,1m" -vcl+backend { } -start
 
 client c1 {
-	txreq 
+	txreq
 	rxresp
 } -run
diff --git a/bin/varnishtest/tests/r00781.vtc b/bin/varnishtest/tests/r00781.vtc
index 120c363..2c3562a 100644
--- a/bin/varnishtest/tests/r00781.vtc
+++ b/bin/varnishtest/tests/r00781.vtc
@@ -15,6 +15,6 @@ varnish v1 -vcl+backend {
 } -start
 
 client c1 {
-	txreq 
+	txreq
 	rxresp
 } -run
diff --git a/bin/varnishtest/tests/r00795.vtc b/bin/varnishtest/tests/r00795.vtc
index 0abfc29..e6aacd4 100644
--- a/bin/varnishtest/tests/r00795.vtc
+++ b/bin/varnishtest/tests/r00795.vtc
@@ -16,7 +16,7 @@ varnish v1 -vcl+backend { } -start
 
 # First load the objects into cache
 client c1 {
-	txreq 
+	txreq
 	rxresp
 	expect resp.status == 200
 	expect resp.bodylen == 3
diff --git a/bin/varnishtest/tests/r00801.vtc b/bin/varnishtest/tests/r00801.vtc
index 5800662..f538d7f 100644
--- a/bin/varnishtest/tests/r00801.vtc
+++ b/bin/varnishtest/tests/r00801.vtc
@@ -17,7 +17,7 @@ varnish v1 -vcl+backend {
 } -start
 
 client c1 {
-	txreq 
+	txreq
 	rxresp
 	expect resp.http.content-length == "10"
 } -run
diff --git a/bin/varnishtest/tests/r00803.vtc b/bin/varnishtest/tests/r00803.vtc
index 50b25fb..467f66f 100644
--- a/bin/varnishtest/tests/r00803.vtc
+++ b/bin/varnishtest/tests/r00803.vtc
@@ -14,7 +14,7 @@ varnish v1 -vcl+backend {
 } -start
 
 client c1 {
-	txreq 
+	txreq
 	rxresp -no_obj
 	expect resp.status == 304
 } -run
diff --git a/bin/varnishtest/tests/r00806.vtc b/bin/varnishtest/tests/r00806.vtc
index f5ee9e3..25567b5 100644
--- a/bin/varnishtest/tests/r00806.vtc
+++ b/bin/varnishtest/tests/r00806.vtc
@@ -19,7 +19,7 @@ varnish v1 -vcl+backend {
 } -start
 
 client c1 {
-	txreq 
+	txreq
 	rxresp -no_obj
 	expect resp.status == 304
 	expect resp.http.cl == 100
diff --git a/bin/varnishtest/tests/r00861.vtc b/bin/varnishtest/tests/r00861.vtc
index 45a624d..682f3b0 100644
--- a/bin/varnishtest/tests/r00861.vtc
+++ b/bin/varnishtest/tests/r00861.vtc
@@ -11,7 +11,7 @@ server s1 {
 	expect req.url == "/bar"
 	txresp -body <BAR>
 
-	rxreq 
+	rxreq
 	expect req.url == "/barf"
 	txresp -body {[{"program":true,"id":972389,"vendorId":"15451701","starttime":1297777500000,"endtime":1297783500000,"title":"Swimming Pool","oTitle":"true","genre":"0x10x0","timeshiftEnabled":true},{"program":true,"id":972391,"vendorId":"15451702","starttime":1297783500000,"endtime":1297785000000,"title":"Fashion -Trends","oTitle":null,"genre":"0x30x0","timeshiftEnabled":true},{"program":true,"id":972384,"vendorId":"15451703","starttime":1297785000000,"endtime":1297786500000,"title":"Fashion - mænd","oTitle":null,"genre":"0x30x0","timeshiftEnabled":true},{"program":true,"id":972388,"vendorId":"15451704","starttime":1297786500000,"endtime":1297789800000,"title":"The Day Before","oTitle":"true","genre":"0x30x0","timeshiftEnabled":true},{"program":true,"id":972393,"vendorId":"15451705","starttime":1297789800000,"endtime":1297793100000,"title":"Kessels øje","oTitle":null,"genre":"0x20x3","timeshiftEnabled":true}]}
 
diff --git a/bin/varnishtest/tests/r00873.vtc b/bin/varnishtest/tests/r00873.vtc
index 7612ad4..8eeb305 100644
--- a/bin/varnishtest/tests/r00873.vtc
+++ b/bin/varnishtest/tests/r00873.vtc
@@ -1,7 +1,7 @@
 varnishtest "Ticket #873"
 
 server s1 {
-	rxreq 
+	rxreq
 	txresp -nolen -hdr "Transfer-encoding: chunked"
 	chunked {<!-- jfsljfslkjfslkfjsljflskjflskjdj -->}
 	chunked {<![CDATA[fooooooooooooooooooobar]]>}
@@ -13,7 +13,7 @@ varnish v1 -vcl+backend {
 		set beresp.do_esi = true;
 		set beresp.do_gzip = true;
 	}
-} -start 
+} -start
 
 client c1 {
 	txreq  -hdr "Accept-Encoding: gzip"
diff --git a/bin/varnishtest/tests/r00878.vtc b/bin/varnishtest/tests/r00878.vtc
index 55106c9..a7ed048 100644
--- a/bin/varnishtest/tests/r00878.vtc
+++ b/bin/varnishtest/tests/r00878.vtc
@@ -1,7 +1,7 @@
 varnishtest "Loading vmods in subsequent VCLs"
 
 server s1 {
-	rxreq 
+	rxreq
 	txresp -bodylen 4
 } -start
 
diff --git a/bin/varnishtest/tests/r00887.vtc b/bin/varnishtest/tests/r00887.vtc
index fb9843c..627e2c5 100644
--- a/bin/varnishtest/tests/r00887.vtc
+++ b/bin/varnishtest/tests/r00887.vtc
@@ -1,20 +1,20 @@
 varnishtest "Ticket #887"
 
 server s1 {
-	rxreq 
+	rxreq
 	txresp -hdr "Cache-control: max-age=-1000" -body "FOO"
-	rxreq 
+	rxreq
 	txresp -body "FOOBAR"
 } -start
 
 varnish v1 -vcl+backend {
-} -start 
+} -start
 
 client c1 {
-	txreq  
+	txreq
 	rxresp
 	expect resp.bodylen == 3
-	txreq  
+	txreq
 	rxresp
 	expect resp.bodylen == 6
 } -run
diff --git a/bin/varnishtest/tests/r00894.vtc b/bin/varnishtest/tests/r00894.vtc
index 39b8fba..04a793d 100644
--- a/bin/varnishtest/tests/r00894.vtc
+++ b/bin/varnishtest/tests/r00894.vtc
@@ -1,7 +1,7 @@
 varnishtest "Ticket #894"
 
 server s1 {
-	rxreq 
+	rxreq
 	txresp -body {<XXX><esi:include src="a" src="b"/><YYY>}
 } -start
 
@@ -9,10 +9,10 @@ varnish v1 -vcl+backend {
 	sub vcl_backend_response {
 		set beresp.do_esi = true;
 	}
-} -start 
+} -start
 
 client c1 {
-	txreq  
+	txreq
 	rxresp
 	expect resp.bodylen == 10
 } -run
diff --git a/bin/varnishtest/tests/r00896.vtc b/bin/varnishtest/tests/r00896.vtc
index b559075..c713a59 100644
--- a/bin/varnishtest/tests/r00896.vtc
+++ b/bin/varnishtest/tests/r00896.vtc
@@ -1,7 +1,7 @@
 varnishtest "Ticket #896, strings over 256 bytes"
 
 server s1 {
-	rxreq 
+	rxreq
 	txresp
 } -start
 
@@ -11,10 +11,10 @@ varnish v1 -vcl+backend {
 		return (error(500,"not ok"));
 		}
 	}
-} -start 
+} -start
 
 client c1 {
-	txreq  
+	txreq
 	rxresp
 	expect resp.status == 200
 } -run
diff --git a/bin/varnishtest/tests/r00902.vtc b/bin/varnishtest/tests/r00902.vtc
index 8caf652..c125061 100644
--- a/bin/varnishtest/tests/r00902.vtc
+++ b/bin/varnishtest/tests/r00902.vtc
@@ -1,7 +1,7 @@
 varnishtest "Ticket #902 http_CollectHdr() failure on consequitive headers"
 
 server s1 {
-	rxreq 
+	rxreq
 	txresp \
 		-hdr "Server: Microsoft-IIS/5.0" \
 		-hdr "Cache-Control: A" \
@@ -13,13 +13,13 @@ server s1 {
 } -start
 
 varnish v1 -vcl+backend {
-} -start 
+} -start
 
 varnish v1 -cliok "param.set debug +req_state"
 
 client c1 {
 	txreq  -hdr "foo: /foo"
-	rxresp 
+	rxresp
 	expect resp.http.cache-control == "A, B, C, D"
 	expect resp.http.foo == "bar"
 } -run
diff --git a/bin/varnishtest/tests/r00907.vtc b/bin/varnishtest/tests/r00907.vtc
index 679dab2..8bb1139 100644
--- a/bin/varnishtest/tests/r00907.vtc
+++ b/bin/varnishtest/tests/r00907.vtc
@@ -1,7 +1,7 @@
 varnishtest "Ticket #907 200/304 handling with Etags + Last-Modified"
 
 server s1 {
-	rxreq 
+	rxreq
 	txresp \
 		-hdr "ETag: saengei1Ohshicich4iteesu" \
 		-hdr "Last-Modified: Tue, 20 Sep 2011 18:55:00 GMT"
@@ -11,7 +11,7 @@ varnish v1 -vcl+backend {
 	sub vcl_deliver {
 		set resp.http.x-timestamp = now;
 	}
-} -start 
+} -start
 
 client c1 {
 	txreq -hdr "If-None-Match: saengei1Ohshicich4iteesu"
diff --git a/bin/varnishtest/tests/r00911.vtc b/bin/varnishtest/tests/r00911.vtc
index 5663421..7f87421 100644
--- a/bin/varnishtest/tests/r00911.vtc
+++ b/bin/varnishtest/tests/r00911.vtc
@@ -6,7 +6,7 @@ server s1 {
 	txresp -body "foobar"
 } -start
 
-varnish v1 -arg "-p vcc_err_unref=false" -vcl+backend { 
+varnish v1 -arg "-p vcc_err_unref=false" -vcl+backend {
 	sub foobar {
 		set req.http.foobar = "foobar";
 	}
@@ -14,6 +14,6 @@ varnish v1 -arg "-p vcc_err_unref=false" -vcl+backend {
 
 client c1 {
 	txreq  -url /bar
-	rxresp 
+	rxresp
 	expect resp.bodylen == 6
 } -run
diff --git a/bin/varnishtest/tests/r00913.vtc b/bin/varnishtest/tests/r00913.vtc
index 3e8672d..4f08396 100644
--- a/bin/varnishtest/tests/r00913.vtc
+++ b/bin/varnishtest/tests/r00913.vtc
@@ -16,7 +16,7 @@ varnish v1 -vcl+backend {
 
 client c1 {
 	txreq  -url /bar
-	rxresp 
+	rxresp
 	expect resp.bodylen == 6
 	expect resp.http.foo == "XXX"
 } -run
diff --git a/bin/varnishtest/tests/r00915.vtc b/bin/varnishtest/tests/r00915.vtc
index bcb1510..e66cdc6 100644
--- a/bin/varnishtest/tests/r00915.vtc
+++ b/bin/varnishtest/tests/r00915.vtc
@@ -1,8 +1,8 @@
 varnishtest "error object allocation with persistent"
 
 server s1 {
-	rxreq 
-	txresp 
+	rxreq
+	txresp
 } -start
 
 shell "rm -f ${tmpdir}/_.per"
@@ -10,7 +10,7 @@ shell "rm -f ${tmpdir}/_.per"
 varnish v1 \
 	-arg "-pfeature=+wait_silo" \
 	-storage "-spersistent,${tmpdir}/_.per,10m" \
-	-vcl+backend { 
+	-vcl+backend {
 
 	sub vcl_backend_response {
 		set beresp.uncacheable = false;
@@ -18,7 +18,7 @@ varnish v1 \
 		set beresp.status = 751;
 		return (deliver);
 	}
-} -start 
+} -start
 
 client c1 {
 	txreq -url "/"
diff --git a/bin/varnishtest/tests/r00917.vtc b/bin/varnishtest/tests/r00917.vtc
index 689d952..588513f 100644
--- a/bin/varnishtest/tests/r00917.vtc
+++ b/bin/varnishtest/tests/r00917.vtc
@@ -10,7 +10,7 @@ varnish v1 -vcl+backend { } -start
 
 client c1 {
 	txreq  -url /bar
-	rxresp 
+	rxresp
 	expect resp.bodylen == 6
 } -run
 
diff --git a/bin/varnishtest/tests/r00921.vtc b/bin/varnishtest/tests/r00921.vtc
index d3e643d..e207c18 100644
--- a/bin/varnishtest/tests/r00921.vtc
+++ b/bin/varnishtest/tests/r00921.vtc
@@ -1,18 +1,18 @@
 varnishtest "VCC type issue in regsub arg 1"
 
 server s1 {
-	rxreq 
+	rxreq
 	expect req.http.foo == "127.0.0.1"
 	expect req.http.bar == "127.0.0.1"
-	txresp 
+	txresp
 } -start
 
-varnish v1 -vcl+backend { 
+varnish v1 -vcl+backend {
 	sub vcl_recv {
 		set req.http.bar = regsub(req.url, ".*", client.ip);
 		set req.http.foo = regsub(client.ip, ":.*", client.ip);
 	}
-} -start 
+} -start
 
 client c1 {
 	txreq -url "/"
diff --git a/bin/varnishtest/tests/r00942.vtc b/bin/varnishtest/tests/r00942.vtc
index e6c45b0..f4c808a 100644
--- a/bin/varnishtest/tests/r00942.vtc
+++ b/bin/varnishtest/tests/r00942.vtc
@@ -29,7 +29,7 @@ varnish v1 \
 		sub vcl_backend_response {
 			set beresp.do_stream = false;
 		}
-} 
+}
 
 varnish v1 -cliok "param.set debug +syncvsl"
 varnish v1 -start
diff --git a/bin/varnishtest/tests/r00962.vtc b/bin/varnishtest/tests/r00962.vtc
index 21f01a8..22ebbc1 100644
--- a/bin/varnishtest/tests/r00962.vtc
+++ b/bin/varnishtest/tests/r00962.vtc
@@ -4,8 +4,8 @@ varnishtest "Test address remapping"
 feature	not-OSX
 
 server s1 {
-	rxreq 
-	txresp 
+	rxreq
+	txresp
 } -start
 
 shell "rm -f ${tmpdir}/_.per?"
@@ -13,11 +13,11 @@ shell "rm -f ${tmpdir}/_.per?"
 varnish v1 \
 	-arg "-pfeature=+wait_silo" \
 	-storage "-spersistent,${tmpdir}/_.per1,10m -spersistent,${tmpdir}/_.per2,10m" \
-	-vcl+backend { 
+	-vcl+backend {
 	sub vcl_backend_response {
 		set beresp.storage = "s0";
 	}
-} -start 
+} -start
 
 varnish v1 -stop
 
@@ -36,7 +36,7 @@ varnish v1 -cliok "debug.persistent s0 sync"
 varnish v1 -stop
 
 server s1 {
-	rxreq 
+	rxreq
 	txresp -status 400 -msg "Persistent Object Not Found"
 } -start
 
@@ -44,7 +44,7 @@ server s1 {
 varnish v2 \
 	-arg "-pfeature=+wait_silo" \
 	-storage "-spersistent,${tmpdir}/_.per2,10m -spersistent,${tmpdir}/_.per1,10m" \
-	-vcl+backend { } -start 
+	-vcl+backend { } -start
 
 client c1 -connect ${v2_sock} {
 	txreq -url "/"
diff --git a/bin/varnishtest/tests/r01073.vtc b/bin/varnishtest/tests/r01073.vtc
index b9f0e87..58d8ae6 100644
--- a/bin/varnishtest/tests/r01073.vtc
+++ b/bin/varnishtest/tests/r01073.vtc
@@ -1,7 +1,7 @@
 varnishtest "Test that hash_always_miss also implies hash_ignore_busy. Ticket #1073."
 
 server s1 {
-	rxreq 
+	rxreq
 	sema r1 sync 2
 	sema r2 sync 2
 	delay 1
@@ -14,7 +14,7 @@ server s2 {
 	txresp -hdr "Server: 2"
 } -start
 
-varnish v1 -vcl+backend { 
+varnish v1 -vcl+backend {
 	sub vcl_recv {
 		if (req.http.x-hash-always-miss == "1") {
 			set req.hash_always_miss = true;
@@ -26,7 +26,7 @@ varnish v1 -vcl+backend {
 			set req.backend = s2;
 		}
 	}
-} -start 
+} -start
 
 client c1 {
 	txreq -url "/" -hdr "x-client: 1"
diff --git a/bin/varnishtest/tests/r01092.vtc b/bin/varnishtest/tests/r01092.vtc
index 7248e49..7512ea4 100644
--- a/bin/varnishtest/tests/r01092.vtc
+++ b/bin/varnishtest/tests/r01092.vtc
@@ -22,7 +22,7 @@ varnish v1 -vcl+backend {
 	sub vcl_backend_response {
 		set beresp.do_esi = true;
 	}
-} -start 
+} -start
 
 client c1 {
 	txreq
diff --git a/bin/varnishtest/tests/r01109.vtc b/bin/varnishtest/tests/r01109.vtc
index 46ef404..9fb4153 100644
--- a/bin/varnishtest/tests/r01109.vtc
+++ b/bin/varnishtest/tests/r01109.vtc
@@ -21,7 +21,11 @@ server s1 {
 	txresp -bodylen 4074
 } -start
 
-varnish v1 -arg "-pfetch_chunksize=4k" -arg "-pgzip_level=0" -arg "-pthread_pool_stack=131072" -vcl+backend {
+varnish v1 \
+	-arg "-pfetch_chunksize=4k" \
+	-arg "-pgzip_level=0" \
+	-arg "-pthread_pool_stack=131072" \
+	-vcl+backend {
 	sub vcl_backend_response {
 		if (bereq.url ~ "/test") {
 			set beresp.do_esi = true;
diff --git a/bin/varnishtest/tests/r01140.vtc b/bin/varnishtest/tests/r01140.vtc
index 98abc61..688181b 100644
--- a/bin/varnishtest/tests/r01140.vtc
+++ b/bin/varnishtest/tests/r01140.vtc
@@ -19,7 +19,7 @@ server s1 {
 } -start
 
 varnish v1 -arg "-p nuke_limit=0 -p shortlived=0" \
-	-storage "-smalloc,1m" -vcl+backend { 
+	-storage "-smalloc,1m" -vcl+backend {
 	sub vcl_backend_response {
 		set beresp.do_stream = false;
 	}
diff --git a/bin/varnishtest/tests/r01164.vtc b/bin/varnishtest/tests/r01164.vtc
index 43c0996..b9072e1 100644
--- a/bin/varnishtest/tests/r01164.vtc
+++ b/bin/varnishtest/tests/r01164.vtc
@@ -7,7 +7,7 @@ varnish v1 -vcl {
 
 	sub vcl_recv {
 		set req.backend = storage_foo;
-	}	    
+	}
 }
 
 varnish v1 -vcl {
@@ -17,7 +17,7 @@ varnish v1 -vcl {
 
 	sub vcl_recv {
 		set req.backend = storagefoo;
-	}	
+	}
 }
 
 
diff --git a/bin/varnishtest/tests/r01225.vtc b/bin/varnishtest/tests/r01225.vtc
index 5ae42b3..3338d75 100644
--- a/bin/varnishtest/tests/r01225.vtc
+++ b/bin/varnishtest/tests/r01225.vtc
@@ -3,7 +3,7 @@ varnishtest "Test bans_req counter on persistent reload - #1225"
 shell "rm -f ${tmpdir}/_.per"
 
 server s1 {
-	rxreq 
+	rxreq
 	expect req.url == "/"
 	txresp -hdr "Foo: foo"
 } -start
@@ -12,7 +12,7 @@ varnish v1 \
 	-arg "-pfeature=+wait_silo" \
 	-storage "-spersistent,${tmpdir}/_.per,10m" \
 	-arg "-pban_lurker_sleep=0.01" \
-	-vcl+backend { } -start 
+	-vcl+backend { } -start
 
 varnish v1 -cliok ban.list
 
@@ -35,7 +35,7 @@ varnish v1 -stop
 server s1 -wait
 
 server s1 {
-	rxreq 
+	rxreq
 	expect req.url == "/"
 	txresp -hdr "Foo: bar"
 } -start
diff --git a/bin/varnishtest/tests/r01283.vtc b/bin/varnishtest/tests/r01283.vtc
index fab7ee2..e193e58 100644
--- a/bin/varnishtest/tests/r01283.vtc
+++ b/bin/varnishtest/tests/r01283.vtc
@@ -5,7 +5,10 @@ server s1 {
 	txresp -bodylen 1048198
 } -start
 
-varnish v1 -arg "-p nuke_limit=0" -storage "-sTransient=malloc,1m" -vcl+backend {
+varnish v1 \
+	-arg "-p nuke_limit=0" \
+	-storage "-sTransient=malloc,1m" \
+	-vcl+backend {
 	sub vcl_recv {
 		if (req.http.x-do-error) {
 			return (error(500));
diff --git a/bin/varnishtest/tests/r01284.vtc b/bin/varnishtest/tests/r01284.vtc
index 92c1a51..5407685 100644
--- a/bin/varnishtest/tests/r01284.vtc
+++ b/bin/varnishtest/tests/r01284.vtc
@@ -9,7 +9,10 @@ server s1 {
 	txresp -hdr "Long: aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa" -hdr "Long2: aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"
 } -start
 
-varnish v1 -arg "-p nuke_limit=0" -storage "-sTransient=malloc,1m" -vcl+backend {
+varnish v1 \
+	-arg "-p nuke_limit=0" \
+	-storage "-sTransient=malloc,1m" \
+	-vcl+backend {
 	sub vcl_backend_response {
 		set beresp.do_stream = false;
 		set beresp.storage = "Transient";
diff --git a/bin/varnishtest/tests/r01356.vtc b/bin/varnishtest/tests/r01356.vtc
index f0c00b2..1aaa337 100644
--- a/bin/varnishtest/tests/r01356.vtc
+++ b/bin/varnishtest/tests/r01356.vtc
@@ -31,7 +31,7 @@ server s1 {
 } -start
 
 client c1 {
-	txreq 
+	txreq
 	rxresp
 	expect resp.status == 200
 } -run
diff --git a/bin/varnishtest/tests/r01367.vtc b/bin/varnishtest/tests/r01367.vtc
index cb2b1f8..3a57258 100644
--- a/bin/varnishtest/tests/r01367.vtc
+++ b/bin/varnishtest/tests/r01367.vtc
@@ -5,7 +5,7 @@ server s1 {
 	txresp
 } -start
 
-varnish v1 -vcl+backend { 
+varnish v1 -vcl+backend {
 	sub vcl_error {
 		return (restart);
 	}
diff --git a/bin/varnishtest/tests/s00002.vtc b/bin/varnishtest/tests/s00002.vtc
index f4cca57..10049c0 100644
--- a/bin/varnishtest/tests/s00002.vtc
+++ b/bin/varnishtest/tests/s00002.vtc
@@ -35,21 +35,21 @@ server s1 {
 } -start
 
 varnish v1 -vcl {
-	backend b { 
-		.host = "${s1_addr}"; 
-		.port = "${s1_port}"; 
-		.probe = { 
-			.url = "/"; 
-			.timeout = 30ms; 
-			.interval = 1s; 
-			.window = 2; 
-			.threshold = 1; 
+	backend b {
+		.host = "${s1_addr}";
+		.port = "${s1_port}";
+		.probe = {
+			.url = "/";
+			.timeout = 30ms;
+			.interval = 1s;
+			.window = 2;
+			.threshold = 1;
 			.initial = 0;
-			} 
+			}
 		}
-	sub vcl_backend_response { 
-		set beresp.ttl = 1s; 
-		set beresp.grace = 1m; 
+	sub vcl_backend_response {
+		set beresp.ttl = 1s;
+		set beresp.grace = 1m;
 	}
 } -start
 
diff --git a/bin/varnishtest/tests/v00000.vtc b/bin/varnishtest/tests/v00000.vtc
index b2676b6..fc22294 100644
--- a/bin/varnishtest/tests/v00000.vtc
+++ b/bin/varnishtest/tests/v00000.vtc
@@ -2,11 +2,11 @@ varnishtest "VCL/VRT: req.grace, obj.ttl and obj.grace"
 
 
 server s1 {
-	rxreq 
+	rxreq
 	txresp -hdr "Connection: close" -body "012345\n"
 }
 
-server s1 -start 
+server s1 -start
 
 varnish v1 -vcl+backend {
 	sub vcl_recv {
diff --git a/bin/varnishtest/tests/v00001.vtc b/bin/varnishtest/tests/v00001.vtc
index ebe802b..4f77f25 100644
--- a/bin/varnishtest/tests/v00001.vtc
+++ b/bin/varnishtest/tests/v00001.vtc
@@ -2,11 +2,11 @@ varnishtest "VCL/VRT: url/request/proto/response/status"
 
 
 server s1 {
-	rxreq 
+	rxreq
 	txresp -hdr "Connection: close" -body "012345\n"
 }
 
-server s1 -start 
+server s1 -start
 
 varnish v1 -vcl+backend {
 	sub vcl_recv {
diff --git a/bin/varnishtest/tests/v00005.vtc b/bin/varnishtest/tests/v00005.vtc
index 0b4b780..4e37653 100644
--- a/bin/varnishtest/tests/v00005.vtc
+++ b/bin/varnishtest/tests/v00005.vtc
@@ -25,7 +25,7 @@ varnish v1 -vcl {
 	backend b1 {
 		.host = "127.0.0.1";
 		.probe = {
-			.request = 
+			.request =
 			    "GET / HTTP/1.1"
 			    "Host: foo.bar" ;
 		}
@@ -38,7 +38,7 @@ varnish v1 -errvcl {Probe request redefinition at:} {
 		.host = "127.0.0.1";
 		.probe = {
 			.url = "/";
-			.request = 
+			.request =
 			    "GET / HTTP/1.1"
 			    "Host: foo.bar" ;
 		}
@@ -50,7 +50,7 @@ varnish v1 -errvcl {Probe request redefinition at:} {
 	backend b1 {
 		.host = "127.0.0.1";
 		.probe = {
-			.request = 
+			.request =
 			    "GET / HTTP/1.1"
 			    "Host: foo.bar" ;
 			.url = "/";
diff --git a/bin/varnishtest/tests/v00008.vtc b/bin/varnishtest/tests/v00008.vtc
index 9cd01eb..add54ef 100644
--- a/bin/varnishtest/tests/v00008.vtc
+++ b/bin/varnishtest/tests/v00008.vtc
@@ -34,7 +34,7 @@ varnish v1 -vcl {
 		.port = "${s2_port}";
 		.host_header = "FOObar";
 	}
-} 
+}
 
 client c1 {
 	txreq -url "/barf"
diff --git a/bin/varnishtest/tests/v00011.vtc b/bin/varnishtest/tests/v00011.vtc
index b815127..d9fad31 100644
--- a/bin/varnishtest/tests/v00011.vtc
+++ b/bin/varnishtest/tests/v00011.vtc
@@ -8,7 +8,7 @@ server s1 {
 	txresp -body "foo"
 } -start
 
-varnish v1 -vcl+backend { 
+varnish v1 -vcl+backend {
 	sub vcl_recv {
 		if (req.method == "PURGE") {
 			ban("req.url ~ ^/$");
@@ -19,7 +19,7 @@ varnish v1 -vcl+backend {
 } -start
 
 client c1 {
-	txreq 
+	txreq
 	rxresp
 	expect resp.http.X-Varnish == "1001"
 } -run
diff --git a/bin/varnishtest/tests/v00013.vtc b/bin/varnishtest/tests/v00013.vtc
index 882342f..fa3afda 100644
--- a/bin/varnishtest/tests/v00013.vtc
+++ b/bin/varnishtest/tests/v00013.vtc
@@ -41,4 +41,4 @@ client c1 {
 	expect resp.status == 200
 	expect resp.http.foo == 2
 	expect resp.http.bar >= 0.100
-} -run 
+} -run
diff --git a/bin/varnishtest/tests/v00015.vtc b/bin/varnishtest/tests/v00015.vtc
index c5441d0..1838a08 100644
--- a/bin/varnishtest/tests/v00015.vtc
+++ b/bin/varnishtest/tests/v00015.vtc
@@ -5,7 +5,7 @@ server s1 {
 	expect req.url == "/"
 	expect req.http.foobar == "snafu"
 	txresp -body "slash"
-} -start 
+} -start
 
 varnish v1 -vcl+backend {
 
diff --git a/bin/varnishtest/tests/v00016.vtc b/bin/varnishtest/tests/v00016.vtc
index 2d323b0..a155dd0 100644
--- a/bin/varnishtest/tests/v00016.vtc
+++ b/bin/varnishtest/tests/v00016.vtc
@@ -32,7 +32,7 @@ varnish v1 -vcl {
 varnish v1 -errvcl {include not followed by string constant.} {
 	/* token test */
         error lookup hash pipe pass fetch deliver discard keep restart
-        include 
+        include
         if else elseif elsif
 	++ -- && || <= == != >= >> << += -= *= /=
 	{ } ( ) * + - / % > < = ; ! & . | ~ ,
@@ -70,7 +70,7 @@ varnish v1 -vcl {
 			set beresp.ttl = 1h;
 		}
 	}
-	
+
 }
 
 varnish v1 -errvcl {Unknown time unit 'k'.  Legal are 's', 'm', 'h' and 'd'} {
diff --git a/bin/varnishtest/tests/v00017.vtc b/bin/varnishtest/tests/v00017.vtc
index ba0c8e4..1e6cce0 100644
--- a/bin/varnishtest/tests/v00017.vtc
+++ b/bin/varnishtest/tests/v00017.vtc
@@ -57,9 +57,9 @@ varnish v1 -errvcl {Expected ';' got ')'} {
 varnish v1 -vcl {
 	backend b { .host = "127.0.0.1"; }
 	acl a {
-		! "10.1.3"; 
-		("...com" / 22); 
-		(!"...com"); 
+		! "10.1.3";
+		("...com" / 22);
+		(!"...com");
 	}
 	sub vcl_recv { if (client.ip ~ a) { return(pass); } }
 }
@@ -78,12 +78,12 @@ varnish v1 -errvcl {Operator > not possible on IP} {
 varnish v1 -vcl {
 	backend b { .host = "127.0.0.1"; }
 	acl a {
-		"10.1.1"/25; 
-		"10.1.3"/26; 
-		"10.1.3"/25; 
-		"10.1.2"/25; 
-		"10.1.2"/26; 
-		"10.1.4"/25; 
+		"10.1.1"/25;
+		"10.1.3"/26;
+		"10.1.3"/25;
+		"10.1.2"/25;
+		"10.1.2"/26;
+		"10.1.4"/25;
 		"10.2.66"/23;
 		! "10.2.64"/23;
 		"10.2.68"/23;
diff --git a/bin/varnishtest/tests/v00022.vtc b/bin/varnishtest/tests/v00022.vtc
index 5bfb1fe..e6c2c0b 100644
--- a/bin/varnishtest/tests/v00022.vtc
+++ b/bin/varnishtest/tests/v00022.vtc
@@ -54,34 +54,34 @@ varnish v1 -vcl+backend {
 varnish v1 -cliok "debug.srandom 1"
 
 client c1 {
-	txreq 
+	txreq
 	rxresp
 	expect resp.bodylen == 2
-	txreq 
+	txreq
 	rxresp
 	expect resp.bodylen == 4
-	txreq 
+	txreq
 	rxresp
 	expect resp.bodylen == 4
-	txreq 
+	txreq
 	rxresp
 	expect resp.bodylen == 4
-	txreq 
+	txreq
 	rxresp
 	expect resp.bodylen == 1
-	txreq 
+	txreq
 	rxresp
 	expect resp.bodylen == 2
-	txreq 
+	txreq
 	rxresp
 	expect resp.bodylen == 4
-	txreq 
+	txreq
 	rxresp
 	expect resp.bodylen == 2
-	txreq 
+	txreq
 	rxresp
 	expect resp.bodylen == 3
-	txreq 
+	txreq
 	rxresp
 	expect resp.bodylen == 2
 } -run
diff --git a/bin/varnishtest/tests/v00023.vtc b/bin/varnishtest/tests/v00023.vtc
index ca36194..e96585a 100644
--- a/bin/varnishtest/tests/v00023.vtc
+++ b/bin/varnishtest/tests/v00023.vtc
@@ -9,7 +9,7 @@ server s1 {
 	txresp -status 200 -body "22"
 } -start
 
-varnish v1 -vcl+backend { 
+varnish v1 -vcl+backend {
 	sub vcl_hit {
 		set obj.ttl = 0s;
 		return (restart);
diff --git a/bin/varnishtest/tests/v00024.vtc b/bin/varnishtest/tests/v00024.vtc
index 5ef311a..f112559 100644
--- a/bin/varnishtest/tests/v00024.vtc
+++ b/bin/varnishtest/tests/v00024.vtc
@@ -6,7 +6,7 @@ server s1 {
 	txresp -status 200 -body "1"
 } -start
 
-varnish v1 -vcl+backend { 
+varnish v1 -vcl+backend {
 	sub vcl_recv {
 		if (req.http.etag == req.http.if-none-match) {
 			return(error(400,"FOO"));
diff --git a/bin/varnishtest/tests/v00027.vtc b/bin/varnishtest/tests/v00027.vtc
index 42cb312..72a7030 100644
--- a/bin/varnishtest/tests/v00027.vtc
+++ b/bin/varnishtest/tests/v00027.vtc
@@ -12,7 +12,7 @@ server s2 {
 
 varnish v1 -vcl {
 	backend s1 {
-		.host = "${s1_addr}"; 
+		.host = "${s1_addr}";
 		.port = "${s1_port}";
 	}
 	backend default {