diff --git a/tests/data/test133 b/tests/data/test133
index 6c2b7a2eaf51ce0e05920d8c02df04e27d51f1f5..f87229c34ba4135535be842c72c2260a3772a393 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
</datacheck>
+</reply>
#
# Client-side
diff --git a/tests/data/test150 b/tests/data/test150
index 60e6b912d47fefd64a95fe2da495edaecbf27993..46c556e9722645d25712425dc4adeef7e0df498a 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!
<strippart>
s/^(Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAACAAIAHAAAAA).*/$1/
-</strippart)
+</strippart>
<protocol>
GET /150 HTTP/1.1
Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=
diff --git a/tests/data/test155 b/tests/data/test155
index 871b0267ae5dbc66dbb7dc8382d171afcbb458ed..0ddace228fa1bdf0d21cfe9827bcd6d3a0657797 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!
<strippart>
s/^(Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAACAAIAHAAAAA).*/$1/
-</strippart)
+</strippart>
<protocol>
PUT /155 HTTP/1.1
Host: 127.0.0.1:%HTTPPORT
diff --git a/tests/data/test159 b/tests/data/test159
index 8513c3073944e3e672e74c61542cb44b67defac3..0bb4d89cc9be3401079e85807516cf88f3ecfdc9 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!
<strippart>
s/^(Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAACAAIAHAAAAA).*/$1/
-</strippart)
+</strippart>
<protocol>
GET /159 HTTP/1.0
Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=
diff --git a/tests/data/test161 b/tests/data/test161
index 81804b00cb1cec5aacf7416f0f687a5a97ea3d98..cc2d3f1715922da1fdede683f5659d7f82bbf023 100644
--- a/tests/data/test161
+++ b/tests/data/test161
@@ -35,5 +35,5 @@ RETR 161
</protocol>
<errorcode>
18
-</errrorcode>
+</errorcode>
</verify>
diff --git a/tests/data/test169 b/tests/data/test169
index 42d5bb00b18c4ec2312968ea8bfb8287c929bfd6..47139f81f6de746fefd5de85aaafe9d3b27e60ce 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!
<strippart>
s/^(Proxy-Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAAAwADAHAAAAA).*/$1/
-</strippart)
+</strippart>
<protocol>
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 5477bcc2808378bf4e14915066dcad422c0a47ca..d759397ca8459ea35e4450ac4a7b54b9ea70ef89 100644
--- a/tests/data/test180
+++ b/tests/data/test180
@@ -31,7 +31,7 @@ the
PUT
feature
</file>
-</reply>
+</client>
# Verify data after the test has been "shot"
<verify>
diff --git a/tests/data/test181 b/tests/data/test181
index 76fb32c7ce22e308edd1a8ffb0f7e3866906c443..6f2a375c2c20bf9ae1bafc9435a5a8b48f03fd38 100644
--- a/tests/data/test181
+++ b/tests/data/test181
@@ -31,7 +31,7 @@ the
POST
feature
</file>
-</reply>
+</client>
# Verify data after the test has been "shot"
<verify>
diff --git a/tests/data/test209 b/tests/data/test209
index 3538d7a6ef33ff3736a58badcb56ff2a5aa81f93..4ebf7409f1ad04ac1e6555443bb7aa8bd047cc4a 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!
<strippart>
s/^(Proxy-Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAABQAFAHAAAAA).*/$1/
-</strippart)
+</strippart>
<protocol>
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 c5790df304db34c62610ac4bed0a37736905f491..c34ffe02254c6a832695a0c9b4fb2705daffcf37 100644
--- a/tests/data/test212
+++ b/tests/data/test212
@@ -3,7 +3,6 @@
<data>
data blobb
</data>
-</datacheck>
</reply>
# Client-side
diff --git a/tests/data/test213 b/tests/data/test213
index 79a8f77e7899d7e42fe20509cc4505f697b4c34d..364791cef0a88b17607b2dede3787f5af8ea0504 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!
<strippart>
s/^(Proxy-Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAABQAFAHAAAAA).*/$1/
-</strippart)
+</strippart>
<protocol nonewline=yes>
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 206e5f3dd4f1c04d67998d0cbb4cd79dfe717ad6..0623d99bd26dc1595d9ae0e485d1e3a9164ec027 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: */*
-</protocol
+</protocol>
</verify>
diff --git a/tests/data/test239 b/tests/data/test239
index 77e7ae2965550b3cdc5b0044592af2ea1c86b22c..6fd4f09333ae69b065a4983c56f19321595d3bc5 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!
<strippart>
s/^(Proxy-Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAABQAFAHAAAAA).*/$1/
-</strippart)
+</strippart>
<protocol nonewline=yes>
POST http://%HOSTIP:%HTTPPORT/239 HTTP/1.1
Proxy-Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=
diff --git a/tests/data/test243 b/tests/data/test243
index 614dfc0fe6c53809e6a375fae0698748cb6daab8..c020896facb220f4689b2726cdbfcc066858b678 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!
<strippart>
s/^(Proxy-Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAABQAFAHAAAAA).*/$1/
-</strippart)
+</strippart>
<protocol nonewline=yes>
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 3a49bfcbc82b2545be8a1912cfa12717860174d4..5b44b6ff2f123d70bd951db0973df1273236a785 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!
<strippart>
s/^(Proxy-Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAABQAFAHAAAAA).*/$1/
-</strippart)
+</strippart>
<protocol nonewline=yes>
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 c379d486504bc018be670a30879f57d85644d0c9..dc7f8dc232e8cd952bebd58d3ab3f924f7203e92 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!
<strippart>
s/^(Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAACAAIAHAAAAA).*/$1/
-</strippart)
+</strippart>
<protocol nonewline=yes>
POST /267 HTTP/1.1
Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=
diff --git a/tests/data/test36 b/tests/data/test36
index a71348e73fa60e4f5a2845b0500bbc767d3475e5..8b50e822a7fdb24117e8e707b949dea12be611eb 100644
--- a/tests/data/test36
+++ b/tests/data/test36
@@ -50,7 +50,7 @@ http://%HOSTIP:%HTTPPORT/36
<verify>
<errorcode>
56
-</errocode>
+</errorcode>
<strip>
^User-Agent:.*
</strip>
diff --git a/tests/data/test37 b/tests/data/test37
index 3d39295b59695d6357826a49350de34cfbc00019..6d2afc7d4b540a053682059782f99f4a0604c4c0 100644
--- a/tests/data/test37
+++ b/tests/data/test37
@@ -31,7 +31,7 @@ http://%HOSTIP:%HTTPPORT/37
<verify>
<errorcode>
52
-</errocode>
+</errorcode>
<strip>
^User-Agent:.*
</strip>
diff --git a/tests/data/test67 b/tests/data/test67
index 19aeeec9bfc0d4ec491932685c14b22a96a4d2ec..16a634d678cac70de5804ec81a9cc8d2bdc216b7 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!
<strippart>
s/^(Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAACAAIAHAAAAA).*/$1/
-</strippart)
+</strippart>
<protocol>
GET /67 HTTP/1.1
Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=
diff --git a/tests/data/test68 b/tests/data/test68
index 19215defc85b084c2215ff52d072105a65cf9031..7367061f56c8a27051d886a664d418db630904c5 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!
<strippart>
s/^(Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAACAAIAHAAAAA).*/$1/
-</strippart)
+</strippart>
<protocol>
GET /68 HTTP/1.1
Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=
diff --git a/tests/data/test69 b/tests/data/test69
index 7102342a92771bcb086c052129f4daf2f76c14a7..573bdfbb08da071ca976b4bb34c22bc78d91eeff 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!
<strippart>
s/^(Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAACAAIAHAAAAA).*/$1/
-</strippart)
+</strippart>
<protocol>
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 eabd9fff754475fc66beb1fcb76fde2c8c81321c..95ca2191eb76c47d1a99ee22e209de262c6245a5 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!
<strippart>
s/(Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAACAAIAHAAAAA).*/$1/
-</strippart)
+</strippart>
<protocol>
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 40b3074f42dbcf4f3d9dc7a3d1797798c438627f..d3392c6947f9c5759fd0e68b83f38c9a8f38465c 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!
<strippart>
s/^(Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAACAAIAHAAAAA).*/$1/
-</strippart)
+</strippart>
<protocol>
GET /89 HTTP/1.1
Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=
diff --git a/tests/data/test90 b/tests/data/test90
index 70e77645ea0d0c3628fa84331963a7fcdd9d7323..36d6d0cb7e685ce11fa846cbd639a9f432085cf4 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!
<strippart>
s/^(Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAACAAIAHAAAAA).*/$1/
-</strippart)
+</strippart>
<protocol>
GET /90 HTTP/1.1
Host: 127.0.0.1:%HTTPPORT
diff --git a/tests/data/test91 b/tests/data/test91
index ae64b16ef3e8344d4fd13e2fb7d282cde62e0e53..2e9f779e640d97a13b58443e2ef5c61f702624f8 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!
<strippart>
s/^(Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAgACABwAAAABgAGAHgAAAA).*/$1/
-</strippart)
+</strippart>
<protocol>
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