diff --git a/tests/data/test133 b/tests/data/test133
index 6c2b7a2eaf..f87229c34b 100644
--- a/tests/data/test133
+++ b/tests/data/test133
@@ -24,6 +24,7 @@ dr-xr-xr-x 2 0 1 512 Nov 30 1995 etc
drwxrwxrwx 2 98 1 512 Oct 30 14:33 pub
dr-xr-xr-x 5 0 1 512 Oct 1 1997 usr
+
#
# Client-side
diff --git a/tests/data/test150 b/tests/data/test150
index 60e6b912d4..46c556e972 100644
--- a/tests/data/test150
+++ b/tests/data/test150
@@ -68,7 +68,7 @@ http://%HOSTIP:%HTTPPORT/150 -u testuser:testpass --ntlm --fail
# the local host name and thus differs on different machines!
s/^(Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAACAAIAHAAAAA).*/$1/
-
GET /150 HTTP/1.1
Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=
diff --git a/tests/data/test155 b/tests/data/test155
index 871b0267ae..0ddace228f 100644
--- a/tests/data/test155
+++ b/tests/data/test155
@@ -94,7 +94,7 @@ four is the number of lines
# the local host name and thus differs on different machines!
s/^(Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAACAAIAHAAAAA).*/$1/
-
PUT /155 HTTP/1.1
Host: 127.0.0.1:%HTTPPORT
diff --git a/tests/data/test159 b/tests/data/test159
index 8513c30739..0bb4d89cc9 100644
--- a/tests/data/test159
+++ b/tests/data/test159
@@ -68,7 +68,7 @@ http://%HOSTIP:%HTTPPORT/159 -u testuser:testpass --ntlm -0
# the local host name and thus differs on different machines!
s/^(Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAACAAIAHAAAAA).*/$1/
-
GET /159 HTTP/1.0
Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=
diff --git a/tests/data/test161 b/tests/data/test161
index 81804b00cb..cc2d3f1715 100644
--- a/tests/data/test161
+++ b/tests/data/test161
@@ -35,5 +35,5 @@ RETR 161
18
-
+
diff --git a/tests/data/test169 b/tests/data/test169
index 42d5bb00b1..47139f81f6 100644
--- a/tests/data/test169
+++ b/tests/data/test169
@@ -84,7 +84,7 @@ http://data.from.server.requiring.digest.hohoho.com/169 --proxy http://%HOSTIP:%
# the local host name and thus differs on different machines!
s/^(Proxy-Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAAAwADAHAAAAA).*/$1/
-
GET http://data.from.server.requiring.digest.hohoho.com/169 HTTP/1.1
Proxy-Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=
diff --git a/tests/data/test180 b/tests/data/test180
index 5477bcc280..d759397ca8 100644
--- a/tests/data/test180
+++ b/tests/data/test180
@@ -31,7 +31,7 @@ the
PUT
feature
-
+
# Verify data after the test has been "shot"
diff --git a/tests/data/test181 b/tests/data/test181
index 76fb32c7ce..6f2a375c2c 100644
--- a/tests/data/test181
+++ b/tests/data/test181
@@ -31,7 +31,7 @@ the
POST
feature
-
+
# Verify data after the test has been "shot"
diff --git a/tests/data/test209 b/tests/data/test209
index 3538d7a6ef..4ebf7409f1 100644
--- a/tests/data/test209
+++ b/tests/data/test209
@@ -82,7 +82,7 @@ http://test.remote.server.com:209/path/2090002 --proxy http://%HOSTIP:%HTTPPORT
# the local host name and thus differs on different machines!
s/^(Proxy-Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAABQAFAHAAAAA).*/$1/
-
CONNECT test.remote.server.com:209 HTTP/1.0
Host: test.remote.server.com:209
diff --git a/tests/data/test212 b/tests/data/test212
index c5790df304..c34ffe0225 100644
--- a/tests/data/test212
+++ b/tests/data/test212
@@ -3,7 +3,6 @@
data blobb
-
# Client-side
diff --git a/tests/data/test213 b/tests/data/test213
index 79a8f77e78..364791cef0 100644
--- a/tests/data/test213
+++ b/tests/data/test213
@@ -82,7 +82,7 @@ http://test.remote.server.com:213/path/2130002 --proxy http://%HOSTIP:%HTTPPORT
# the local host name and thus differs on different machines!
s/^(Proxy-Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAABQAFAHAAAAA).*/$1/
-
CONNECT test.remote.server.com:213 HTTP/1.0
Host: test.remote.server.com:213
diff --git a/tests/data/test22 b/tests/data/test22
index 206e5f3dd4..0623d99bd2 100644
--- a/tests/data/test22
+++ b/tests/data/test22
@@ -40,5 +40,5 @@ User-Agent: curl/7.4.2 (sparc-sun-solaris2.7) libcurl 7.4.2 (SSL 0.9.6)
Host: 127.0.0.1:%HTTPPORT
Accept: */*
-
diff --git a/tests/data/test239 b/tests/data/test239
index 77e7ae2965..6fd4f09333 100644
--- a/tests/data/test239
+++ b/tests/data/test239
@@ -60,7 +60,7 @@ http://%HOSTIP:%HTTPPORT/239 --proxy http://%HOSTIP:%HTTPPORT --proxy-user silly
# the local host name and thus differs on different machines!
s/^(Proxy-Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAABQAFAHAAAAA).*/$1/
-
POST http://%HOSTIP:%HTTPPORT/239 HTTP/1.1
Proxy-Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=
diff --git a/tests/data/test243 b/tests/data/test243
index 614dfc0fe6..c020896fac 100644
--- a/tests/data/test243
+++ b/tests/data/test243
@@ -88,7 +88,7 @@ http://%HOSTIP:%HTTPPORT/243 --proxy http://%HOSTIP:%HTTPPORT --proxy-user silly
# the local host name and thus differs on different machines!
s/^(Proxy-Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAABQAFAHAAAAA).*/$1/
-
POST http://127.0.0.1:8990/243 HTTP/1.1
User-Agent: curl/7.13.2-CVS (i686-pc-linux-gnu) libcurl/7.13.2-CVS OpenSSL/0.9.7e zlib/1.2.2 libidn/0.5.13
diff --git a/tests/data/test265 b/tests/data/test265
index 3a49bfcbc8..5b44b6ff2f 100644
--- a/tests/data/test265
+++ b/tests/data/test265
@@ -85,7 +85,7 @@ http://test.remote.server.com:265/path/2650002 --proxy http://%HOSTIP:%HTTPPORT
# the local host name and thus differs on different machines!
s/^(Proxy-Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAABQAFAHAAAAA).*/$1/
-
CONNECT test.remote.server.com:265 HTTP/1.0
Host: test.remote.server.com:265
diff --git a/tests/data/test267 b/tests/data/test267
index c379d48650..dc7f8dc232 100644
--- a/tests/data/test267
+++ b/tests/data/test267
@@ -75,7 +75,7 @@ http://%HOSTIP:%HTTPPORT/267 -u testuser:testpass --ntlm -d "data" -H "Header1:
# the local host name and thus differs on different machines!
s/^(Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAACAAIAHAAAAA).*/$1/
-
POST /267 HTTP/1.1
Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=
diff --git a/tests/data/test36 b/tests/data/test36
index a71348e73f..8b50e822a7 100644
--- a/tests/data/test36
+++ b/tests/data/test36
@@ -50,7 +50,7 @@ http://%HOSTIP:%HTTPPORT/36
56
-
+
^User-Agent:.*
diff --git a/tests/data/test37 b/tests/data/test37
index 3d39295b59..6d2afc7d4b 100644
--- a/tests/data/test37
+++ b/tests/data/test37
@@ -31,7 +31,7 @@ http://%HOSTIP:%HTTPPORT/37
52
-
+
^User-Agent:.*
diff --git a/tests/data/test67 b/tests/data/test67
index 19aeeec9bf..16a634d678 100644
--- a/tests/data/test67
+++ b/tests/data/test67
@@ -75,7 +75,7 @@ http://%HOSTIP:%HTTPPORT/67 -u testuser:testpass --ntlm
# the local host name and thus differs on different machines!
s/^(Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAACAAIAHAAAAA).*/$1/
-
GET /67 HTTP/1.1
Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=
diff --git a/tests/data/test68 b/tests/data/test68
index 19215defc8..7367061f56 100644
--- a/tests/data/test68
+++ b/tests/data/test68
@@ -75,7 +75,7 @@ http://%HOSTIP:%HTTPPORT/68 -u testuser:testpass --ntlm
# the local host name and thus differs on different machines!
s/^(Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAACAAIAHAAAAA).*/$1/
-
GET /68 HTTP/1.1
Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=
diff --git a/tests/data/test69 b/tests/data/test69
index 7102342a92..573bdfbb08 100644
--- a/tests/data/test69
+++ b/tests/data/test69
@@ -92,7 +92,7 @@ http://%HOSTIP:%HTTPPORT/69 -u testuser:testpass --anyauth
# the local host name and thus differs on different machines!
s/^(Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAACAAIAHAAAAA).*/$1/
-
GET /69 HTTP/1.1
User-Agent: curl/7.10.6-pre1 (i686-pc-linux-gnu) libcurl/7.10.6-pre1 OpenSSL/0.9.7a ipv6 zlib/1.1.3
diff --git a/tests/data/test81 b/tests/data/test81
index eabd9fff75..95ca2191eb 100644
--- a/tests/data/test81
+++ b/tests/data/test81
@@ -73,7 +73,7 @@ http://%HOSTIP:%HTTPPORT/81 --proxy-user testuser:testpass -x http://%HOSTIP:%HT
# the local host name and thus differs on different machines!
s/(Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAACAAIAHAAAAA).*/$1/
-
GET http://127.0.0.1:%HTTPPORT/81 HTTP/1.1
Proxy-Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=
diff --git a/tests/data/test89 b/tests/data/test89
index 40b3074f42..d3392c6947 100644
--- a/tests/data/test89
+++ b/tests/data/test89
@@ -108,7 +108,7 @@ http://%HOSTIP:%HTTPPORT/89 -u testuser:testpass --ntlm -L
# the local host name and thus differs on different machines!
s/^(Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAACAAIAHAAAAA).*/$1/
-
GET /89 HTTP/1.1
Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=
diff --git a/tests/data/test90 b/tests/data/test90
index 70e77645ea..36d6d0cb7e 100644
--- a/tests/data/test90
+++ b/tests/data/test90
@@ -147,7 +147,7 @@ http://%HOSTIP:%HTTPPORT/90 -u testuser:testpass --anyauth -L
# the local host name and thus differs on different machines!
s/^(Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAACAAIAHAAAAA).*/$1/
-
GET /90 HTTP/1.1
Host: 127.0.0.1:%HTTPPORT
diff --git a/tests/data/test91 b/tests/data/test91
index ae64b16ef3..2e9f779e64 100644
--- a/tests/data/test91
+++ b/tests/data/test91
@@ -93,7 +93,7 @@ http://%HOSTIP:%HTTPPORT/91 --anyauth -u mydomain\\myself:secret
# the local host name and thus differs on different machines!
s/^(Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAgACABwAAAABgAGAHgAAAA).*/$1/
-
GET /91 HTTP/1.1
User-Agent: curl/7.10.6-pre1 (i686-pc-linux-gnu) libcurl/7.10.6-pre1 OpenSSL/0.9.7a ipv6 zlib/1.1.3