Convert (most of) the test data files into genuine XML. A handful still

are not, due mainly to the lack of support for XML character entities (e.g. & => & ). This will make it easier to validate test files using tools like xmllint, as well as edit and view them using XML tools.
author: Dan Fandrich <dan@coneharvesters.com> 2007-01-23 02:25:56 +0000
committer: Dan Fandrich <dan@coneharvesters.com> 2007-01-23 02:25:56 +0000
commit: 33bea767ebd0bbf11867fe1af31dc345e9f816af (patch)
tree: 4c7d01783220f9e8b79c0239562af5d63d833359 /tests
parent: 9ab7cda0105cd926ab67c31508c5d835466ce8e7 (diff)
328 files changed, 795 insertions, 106 deletions
diff --git a/tests/FILEFORMAT b/tests/FILEFORMAT
index 594addb13..22c8f5807 100644
--- a/tests/FILEFORMAT
+++ b/tests/FILEFORMAT
@@ -1,7 +1,16 @@
- The file format of the test suite is a very simple and extendable format. All
-data for a single test case resides in a single ASCII file. Labels mark the
-beginning and the end of all sections. Each label must be written in its own
-line and is resembling XML/HTML.
+ The test suite's file format is very simple and extendable, closely
+resembling XML. All data for a single test case resides in a single
+ASCII file. Labels mark the beginning and the end of all sections, and each
+label must be written in its own line.  Comments are either XML-style
+(enclosed with <!-- and -->) or C-style (beginning with #) and must appear
+on their own lines and not alongside actual test data.  Most test data files
+are syntactically valid XML, although a few files are not (lack of
+support for character entities is the biggest omission).
+
+ The file begins with a 'testcase' tag, which encompasses the remainder of
+the file.
+
+<testcase>
 
  Each file is split up in three main sections: reply, client and verify. The
 reply section is used for the server to know what to send as a reply for the
@@ -24,14 +33,14 @@ statistical/informational purposes.
 </info>
 
 <reply>
-<data [nocheck=1] [sendzero=yes] [base64=yes]>
-�data to sent to the client on its request and later verified that it arrived
+<data [nocheck="1"] [sendzero="yes"] [base64="yes"]>
+data to be sent to the client on its request and later verified that it arrived
 safely. Set the nocheck=1 to prevent the test script to verify the arrival
 of this data.
 
 If the data contains 'swsclose' anywhere within the start and end tag, and
 this is a HTTP test, then the connection will be closed by the server after
-this response is sent. If not, the connection will be kept persistant.
+this response is sent. If not, the connection will be kept persistent.
 
 If the data contains 'swsbounce' anywhere within the start and end tag, the
 HTTP server will detect if this is a second request using the same test and
@@ -55,7 +64,7 @@ B) The request was HTTP and included digest details, which adds 1000 to NUM
 C) If a HTTP request is NTLM type-1, it adds 1001 to num
 D) If a HTTP request is NTLM type-3, it adds 1002 to num
 </dataNUM>
-<datacheck [nonewline=yes]>
+<datacheck [nonewline="yes"]>
 if the data is sent but this is what should be checked afterwards. If
 'nonewline' is set, we will cut off the trailing newline of this given data
 before comparing with the one actually received by the client
@@ -115,13 +124,15 @@ A list of features that MUST be present in the client/library for this test to
 be able to run (if these features are not present, the test will be
 SKIPPED). Features testable here are:
 
-SSL
-netrc_debug
-large_file
-idn
 getrlimit
+GnuTLS
+idn
 ipv6
+large_file
 libz
+netrc_debug
+OpenSSL
+SSL
 </features>
 
 <killserver>
@@ -154,7 +165,7 @@ Set the given environment variables to the specified value before the actual
 command is run, they are cleared again after the command has been run.
 </setenv>
 
-<command [option=no-output]>
+<command [option="no-output"]>
 command line to run, there's a bunch of %variables that get replaced
 accordingly.
 
@@ -172,13 +183,20 @@ argument that directs the output to a file. The --output is also not added if
 the client/stdout section is used.
 
 Available substitute variables include:
-%HOSTIP    - IP address of the host running this test
+%HOSTIP    - IPv6 address of the host running this test
 %HOSTPORT  - Port number of the HTTP server
+%HOST6IP   - IPv6 address of the host running this test
+%HOST6PORT - IPv6 port number of the HTTP server
 %HTTPSPORT - Port number of the HTTPS server
 %FTPPORT   - Port number of the FTP server
+%FTP6PORT  - IPv6 port number of the FTP server
 %FTPSPORT  - Port number of the FTPS server
+%FTP2PORT  - Port number of the FTP server 2
+%TFTPPORT  - Port number of the TFTP server
+%TFTP6PORT - IPv6 port number of the TFTP server
 %SRCDIR    - Full path to the source dir
 %PWD       - Current directory
+%CURL      - Path to the curl executable
 </command>
 
 <file name="log/filename">
@@ -200,28 +218,28 @@ example.
 </errorcode>
 <strip>
 One regex per line that is removed from the protocol dumps before the
-comparison is made. This is very useful to remove dependencies on dynamicly
+comparison is made. This is very useful to remove dependencies on dynamically
 changing protocol data such as port numbers or user-agent strings.
 </strip>
 <strippart>
 One perl op per line that operates on the protocol dump. This is pretty
 advanced. Example: "s/^EPRT .*/EPRT stripped/"
 </strippart>
-<protocol [nonewline=yes]>
+<protocol [nonewline="yes"]>
 the protocol dump curl should transmit, if 'nonewline' is set, we will cut
 off the trailing newline of this given data before comparing with the one
 actually sent by the client
 </protocol>
-<stdout [mode=text]>
-This verfies that this data was passed to stdout.
+<stdout [mode="text"]>
+This verifies that this data was passed to stdout.
 
-Use the "mode=text" attribute if the output is in text mode on platforms that
+Use the "mode="text"" attribute if the output is in text mode on platforms that
 have a text/binary difference.
 </stdout>
-<file name="log/filename" [mode=text]>
+<file name="log/filename" [mode="text"]>
 The file's contents must be identical to this after the test is complete.
 
-Use the "mode=text" attribute if the output is in text mode on platforms that
+Use the "mode="text" attribute if the output is in text mode on platforms that
 have a text/binary difference.
 </file>
 <stripfile>
@@ -235,3 +253,5 @@ the contents of the upload data curl should have sent
 disable - disables the valgrind log check for this test
 </valgrind>
 </verify>
+
+</testcase>
diff --git a/tests/data/test1 b/tests/data/test1
index 6f88024cf..3c9a90ea7 100644
--- a/tests/data/test1
+++ b/tests/data/test1
@@ -1,3 +1,4 @@
+<testcase>
 <info>
 <keywords>
 HTTP
@@ -20,7 +21,7 @@ Connection: close
 Content-Type: text/html
 Funny-head: yesyes
 
-<foo>
+-foo-
 </data>
 </reply>
 
@@ -51,3 +52,4 @@ Accept: */*
 
 </protocol>
 </verify>
+</testcase>
diff --git a/tests/data/test10 b/tests/data/test10
index f9fcbd717..25d5b6ffa 100644
--- a/tests/data/test10
+++ b/tests/data/test10
@@ -1,3 +1,4 @@
+<testcase>
 <info>
 <keywords>
 HTTP
@@ -63,3 +64,4 @@ the
       feature
 </protocol>
 </verify>
+</testcase>
diff --git a/tests/data/test100 b/tests/data/test100
index 930c70ccd..1829b0500 100644
--- a/tests/data/test100
+++ b/tests/data/test100
@@ -1,3 +1,4 @@
+<testcase>
 <info>
 <keywords>
 FTP
@@ -55,3 +56,4 @@ LIST
 QUIT
 </protocol>
 </verify>
+</testcase>
diff --git a/tests/data/test101 b/tests/data/test101
index 3109eef18..74886af8c 100644
--- a/tests/data/test101
+++ b/tests/data/test101
@@ -1,3 +1,4 @@
+<testcase>
 <info>
 <keywords>
 FTP
@@ -55,3 +56,4 @@ LIST
 QUIT
 </protocol>
 </verify>
+</testcase>
diff --git a/tests/data/test102 b/tests/data/test102
index 57df47e1d..99f0e3fc1 100644
--- a/tests/data/test102
+++ b/tests/data/test102
@@ -1,3 +1,4 @@
+<testcase>
 <info>
 <keywords>
 FTP
@@ -48,3 +49,4 @@ RETR 102
 QUIT
 </protocol>
 </verify>
+</testcase>
diff --git a/tests/data/test103 b/tests/data/test103
index 676cdf0e6..0cc557b98 100644
--- a/tests/data/test103
+++ b/tests/data/test103
@@ -1,3 +1,4 @@
+<testcase>
 <info>
 <keywords>
 FTP
@@ -50,3 +51,4 @@ RETR 103
 QUIT
 </protocol>
 </verify>
+</testcase>
diff --git a/tests/data/test104 b/tests/data/test104
index 03f967971..2806e75ac 100644
--- a/tests/data/test104
+++ b/tests/data/test104
@@ -1,3 +1,4 @@
+<testcase>
 <info>
 <keywords>
 FTP
@@ -39,3 +40,4 @@ REST 0
 QUIT
 </protocol>
 </verify>
+</testcase>
diff --git a/tests/data/test105 b/tests/data/test105
index eb18e1ac3..d3a0a4f2d 100644
--- a/tests/data/test105
+++ b/tests/data/test105
@@ -1,3 +1,4 @@
+<testcase>
 <info>
 <keywords>
 FTP
@@ -49,3 +50,4 @@ RETR 103
 QUIT
 </protocol>
 </verify>
+</testcase>
diff --git a/tests/data/test106 b/tests/data/test106
index deb623d22..fcf99d11e 100644
--- a/tests/data/test106
+++ b/tests/data/test106
@@ -1,3 +1,4 @@
+<testcase>
 <info>
 <keywords>
 FTP
@@ -46,3 +47,4 @@ RETR 106
 QUIT
 </protocol>
 </verify>
+</testcase>
diff --git a/tests/data/test107 b/tests/data/test107
index 8a487ba8e..c5f611d3c 100644
--- a/tests/data/test107
+++ b/tests/data/test107
@@ -1,3 +1,4 @@
+<testcase>
 <info>
 <keywords>
 FTP
@@ -47,3 +48,4 @@ STOR 107
 QUIT
 </protocol>
 </verify>
+</testcase>
diff --git a/tests/data/test108 b/tests/data/test108
index eabe92e10..535339236 100644
--- a/tests/data/test108
+++ b/tests/data/test108
@@ -1,3 +1,4 @@
+<testcase>
 <info>
 <keywords>
 FTP
@@ -52,3 +53,4 @@ Moooooooooooo
  upload this
 </upload>
 </verify>
+</testcase>
diff --git a/tests/data/test109 b/tests/data/test109
index f66fa9267..88b139989 100644
--- a/tests/data/test109
+++ b/tests/data/test109
@@ -1,3 +1,4 @@
+<testcase>
 <info>
 <keywords>
 FTP
@@ -46,3 +47,4 @@ Moooooooooooo
  upload this
 </upload>
 </verify>
+</testcase>
diff --git a/tests/data/test11 b/tests/data/test11
index 84baa9076..f86c834e2 100644
--- a/tests/data/test11
+++ b/tests/data/test11
@@ -1,3 +1,4 @@
+<testcase>
 <info>
 <keywords>
 HTTP
@@ -72,3 +73,4 @@ Accept: */*
 
 </protocol>
 </verify>
+</testcase>
diff --git a/tests/data/test110 b/tests/data/test110
index 6e7df1c68..3a1dbc64a 100644
--- a/tests/data/test110
+++ b/tests/data/test110
@@ -1,3 +1,4 @@
+<testcase>
 <info>
 <keywords>
 FTP
@@ -50,3 +51,4 @@ RETR 110
 QUIT
 </protocol>
 </verify>
+</testcase>
diff --git a/tests/data/test111 b/tests/data/test111
index 25e127438..f0479d83f 100644
--- a/tests/data/test111
+++ b/tests/data/test111
@@ -1,3 +1,4 @@
+<testcase>
 <info>
 <keywords>
 FTP
@@ -43,3 +44,4 @@ SIZE 111
 QUIT
 </protocol>
 </verify>
+</testcase>
diff --git a/tests/data/test112 b/tests/data/test112
index 6ab189706..0f743083d 100644
--- a/tests/data/test112
+++ b/tests/data/test112
@@ -1,3 +1,4 @@
+<testcase>
 <info>
 <keywords>
 FTP
@@ -47,3 +48,4 @@ QUIT
 worx?
 </upload>
 </verify>
+</testcase>
diff --git a/tests/data/test113 b/tests/data/test113
index c7b0e4f34..39d200e52 100644
--- a/tests/data/test113
+++ b/tests/data/test113
@@ -1,3 +1,4 @@
+<testcase>
 <info>
 <keywords>
 FTP
@@ -33,3 +34,4 @@ REPLY USER 314 bluah you fewl!
 USER anonymous
 </protocol>
 </verify>
+</testcase>
diff --git a/tests/data/test114 b/tests/data/test114
index 0b7fa4325..142dd7346 100644
--- a/tests/data/test114
+++ b/tests/data/test114
@@ -1,3 +1,4 @@
+<testcase>
 <info>
 <keywords>
 FTP
@@ -34,3 +35,4 @@ USER anonymous
 PASS curl_by_daniel@haxx.se
 </protocol>
 </verify>
+</testcase>
diff --git a/tests/data/test115 b/tests/data/test115
index a3709ad55..d2d1f035f 100644
--- a/tests/data/test115
+++ b/tests/data/test115
@@ -1,3 +1,4 @@
+<testcase>
 <info>
 <keywords>
 FTP
@@ -40,3 +41,4 @@ PASV
 QUIT
 </protocol>
 </verify>
+</testcase>
diff --git a/tests/data/test116 b/tests/data/test116
index 6e517aea0..59a28f442 100644
--- a/tests/data/test116
+++ b/tests/data/test116
@@ -1,3 +1,4 @@
+<testcase>
 <info>
 <keywords>
 FTP
@@ -42,3 +43,4 @@ PWD
 QUIT
 </protocol>
 </verify>
+</testcase>
diff --git a/tests/data/test117 b/tests/data/test117
index eb31b3395..90df955ec 100644
--- a/tests/data/test117
+++ b/tests/data/test117
@@ -1,3 +1,4 @@
+<testcase>
 <info>
 <keywords>
 FTP
@@ -40,3 +41,4 @@ TYPE I
 QUIT
 </protocol>
 </verify>
+</testcase>
diff --git a/tests/data/test118 b/tests/data/test118
index 122cff23e..68e699115 100644
--- a/tests/data/test118
+++ b/tests/data/test118
@@ -1,3 +1,4 @@
+<testcase>
 <info>
 <keywords>
 FTP
@@ -44,3 +45,4 @@ RETR 118
 QUIT
 </protocol>
 </verify>
+</testcase>
diff --git a/tests/data/test119 b/tests/data/test119
index 4de6e44d4..de6be4359 100644
--- a/tests/data/test119
+++ b/tests/data/test119
@@ -1,3 +1,4 @@
+<testcase>
 <info>
 <keywords>
 FTP
@@ -46,3 +47,4 @@ RETR 119
 QUIT
 </protocol>
 </verify>
+</testcase>
diff --git a/tests/data/test12 b/tests/data/test12
index e49676a20..e7acd2dac 100644
--- a/tests/data/test12
+++ b/tests/data/test12
@@ -1,3 +1,4 @@
+<testcase>
 <info>
 <keywords>
 HTTP
@@ -51,3 +52,4 @@ Accept: */*
 
 </protocol>
 </verify>
+</testcase>
diff --git a/tests/data/test120 b/tests/data/test120
index c55f658cf..bf1ab0bcc 100644
--- a/tests/data/test120
+++ b/tests/data/test120
@@ -1,3 +1,4 @@
+<testcase>
 <info>
 <keywords>
 FTP
@@ -49,3 +50,4 @@ DELE file
 QUIT
 </protocol>
 </verify>
+</testcase>
diff --git a/tests/data/test121 b/tests/data/test121
index 7db404b6d..2bed51914 100644
--- a/tests/data/test121
+++ b/tests/data/test121
@@ -1,3 +1,4 @@
+<testcase>
 <info>
 <keywords>
 FTP
@@ -47,3 +48,4 @@ DELE after_transfer
 QUIT
 </protocol>
 </verify>
+</testcase>
diff --git a/tests/data/test122 b/tests/data/test122
index 32e1a9ffb..70c37454a 100644
--- a/tests/data/test122
+++ b/tests/data/test122
@@ -1,3 +1,4 @@
+<testcase>
 <info>
 <keywords>
 FTP
@@ -41,3 +42,4 @@ SIZE 122
 QUIT
 </protocol>
 </verify>
+</testcase>
diff --git a/tests/data/test123 b/tests/data/test123
index aa705eae9..34f2aa000 100644
--- a/tests/data/test123
+++ b/tests/data/test123
@@ -1,3 +1,4 @@
+<testcase>
 <info>
 <keywords>
 FTP
@@ -36,3 +37,4 @@ TYPE I
 QUIT
 </protocol>
 </verify>
+</testcase>
diff --git a/tests/data/test124 b/tests/data/test124
index 03600dc9d..d2da7750b 100644
--- a/tests/data/test124
+++ b/tests/data/test124
@@ -1,3 +1,4 @@
+<testcase>
 <info>
 <keywords>
 FTP
@@ -43,3 +44,4 @@ RETR 124
 QUIT
 </protocol>
 </verify>
+</testcase>
diff --git a/tests/data/test125 b/tests/data/test125
index f5d69e4d1..1559c9ea8 100644
--- a/tests/data/test125
+++ b/tests/data/test125
@@ -1,3 +1,4 @@
+<testcase>
 <info>
 <keywords>
 FTP
@@ -37,3 +38,4 @@ CWD path
 QUIT
 </protocol>
 </verify>
+</testcase>
diff --git a/tests/data/test126 b/tests/data/test126
index 9efe3d7b3..39a312cfb 100644
--- a/tests/data/test126
+++ b/tests/data/test126
@@ -1,3 +1,4 @@
+<testcase>
 <info>
 <keywords>
 FTP
@@ -44,3 +45,4 @@ RETR 126
 QUIT
 </protocol>
 </verify>
+</testcase>
diff --git a/tests/data/test127 b/tests/data/test127
index ec81e72be..773f9630f 100644
--- a/tests/data/test127
+++ b/tests/data/test127
@@ -1,3 +1,4 @@
+<testcase>
 <info>
 <keywords>
 FTP
@@ -42,3 +43,4 @@ RETR 127
 QUIT
 </protocol>
 </verify>
+</testcase>
diff --git a/tests/data/test128 b/tests/data/test128
index d2b58c9cb..aca500b3b 100644
--- a/tests/data/test128
+++ b/tests/data/test128
@@ -1,3 +1,4 @@
+<testcase>
 <info>
 <keywords>
 FTP
@@ -53,3 +54,4 @@ the
 --crlf option
 </upload>
 </verify>
+</testcase>
diff --git a/tests/data/test13 b/tests/data/test13
index 3af6ff9b9..23f9cad80 100644
--- a/tests/data/test13
+++ b/tests/data/test13
@@ -1,3 +1,4 @@
+<testcase>
 <info>
 <keywords>
 HTTP
@@ -40,3 +41,4 @@ Accept: */*
 
 </protocol>
 </verify>
+</testcase>
diff --git a/tests/data/test130 b/tests/data/test130
index 34406ec9b..c1e9cd998 100644
--- a/tests/data/test130
+++ b/tests/data/test130
@@ -1,3 +1,4 @@
+<testcase>
 <info>
 <keywords>
 FTP
@@ -64,3 +65,4 @@ LIST
 QUIT
 </protocol>
 </verify>
+</testcase>
diff --git a/tests/data/test131 b/tests/data/test131
index 14bdae3e3..d14bea47c 100644
--- a/tests/data/test131
+++ b/tests/data/test131
@@ -1,3 +1,4 @@
+<testcase>
 <info>
 <keywords>
 FTP
@@ -65,3 +66,4 @@ LIST
 QUIT
 </protocol>
 </verify>
+</testcase>
diff --git a/tests/data/test132 b/tests/data/test132
index bf09ee72d..c03e8ed41 100644
--- a/tests/data/test132
+++ b/tests/data/test132
@@ -1,3 +1,4 @@
+<testcase>
 <info>
 <keywords>
 FTP
@@ -64,3 +65,4 @@ LIST
 QUIT
 </protocol>
 </verify>
+</testcase>
diff --git a/tests/data/test133 b/tests/data/test133
index f87229c34..6016a64f1 100644
--- a/tests/data/test133
+++ b/tests/data/test133
@@ -1,3 +1,4 @@
+<testcase>
 <info>
 <keywords>
 FTP
@@ -64,3 +65,4 @@ LIST
 QUIT
 </protocol>
 </verify>
+</testcase>
diff --git a/tests/data/test134 b/tests/data/test134
index ced21d789..a18cbaa55 100644
--- a/tests/data/test134
+++ b/tests/data/test134
@@ -1,3 +1,4 @@
+<testcase>
 <info>
 <keywords>
 FTP
@@ -64,3 +65,4 @@ LIST
 QUIT
 </protocol>
 </verify>
+</testcase>
diff --git a/tests/data/test135 b/tests/data/test135
index 0ac1c5921..9a3d098d3 100644
--- a/tests/data/test135
+++ b/tests/data/test135
@@ -1,3 +1,4 @@
+<testcase>
 <info>
 <keywords>
 FTP
@@ -14,7 +15,7 @@ Range
 0123456789abcdef
 0123456789abcdef
 </data>
-<datacheck nonewline=yes>
+<datacheck nonewline="yes">
 0123456789abc
 </datacheck>
 <size>
@@ -49,3 +50,4 @@ RETR 135
 QUIT
 </protocol>
 </verify>
+</testcase>
diff --git a/tests/data/test136 b/tests/data/test136
index ea8a651d3..25940b50d 100644
--- a/tests/data/test136
+++ b/tests/data/test136
@@ -1,3 +1,4 @@
+<testcase>
 <info>
 <keywords>
 FTP
@@ -38,3 +39,4 @@ RETR 136
 QUIT
 </protocol>
 </verify>
+</testcase>
diff --git a/tests/data/test137 b/tests/data/test137
index d7475f843..816872fd2 100644
--- a/tests/data/test137
+++ b/tests/data/test137
@@ -1,3 +1,4 @@
+<testcase>
 # Server-side
 <reply>
 <data>
@@ -36,3 +37,4 @@ RETR 137
 QUIT
 </protocol>
 </verify>
+</testcase>
diff --git a/tests/data/test138 b/tests/data/test138
index 57577c2d7..46b787213 100644
--- a/tests/data/test138
+++ b/tests/data/test138
@@ -1,3 +1,4 @@
+<testcase>
 # Server-side
 <reply>
 <data>
@@ -39,3 +40,4 @@ RETR 138
 QUIT
 </protocol>
 </verify>
+</testcase>
diff --git a/tests/data/test139 b/tests/data/test139
index 052d1f06b..68cb8b250 100644
--- a/tests/data/test139
+++ b/tests/data/test139
@@ -1,3 +1,4 @@
+<testcase>
 # Server-side
 <reply>
 <data>
@@ -36,3 +37,4 @@ RETR 139
 QUIT
 </protocol>
 </verify>
+</testcase>
diff --git a/tests/data/test14 b/tests/data/test14
index f10c6f488..926e89cf5 100644
--- a/tests/data/test14
+++ b/tests/data/test14
@@ -1,3 +1,4 @@
+<testcase>
 <info>
 <keywords>
 HTTP
@@ -40,3 +41,4 @@ Accept: */*
 
 </protocol>
 </verify>
+</testcase>
diff --git a/tests/data/test140 b/tests/data/test140
index c030694ce..a2be1ffa4 100644
--- a/tests/data/test140
+++ b/tests/data/test140
@@ -1,3 +1,4 @@
+<testcase>
 # Server-side
 <reply>
 <data>
@@ -31,3 +32,4 @@ MDTM 140
 QUIT
 </protocol>
 </verify>
+</testcase>
diff --git a/tests/data/test141 b/tests/data/test141
index 65be0474b..f115b02ee 100644
--- a/tests/data/test141
+++ b/tests/data/test141
@@ -1,3 +1,4 @@
+<testcase>
 # Server-side
 <reply>
 <data>
@@ -37,3 +38,4 @@ QUIT
 Last-Modified: Wed, 09 Apr 2003 10:26:59 GMT
 </stdout>
 </verify>
+</testcase>
diff --git a/tests/data/test142 b/tests/data/test142
index 2061c9200..eb8583ffa 100644
--- a/tests/data/test142
+++ b/tests/data/test142
@@ -1,3 +1,4 @@
+<testcase>
 # Server-side
 <reply>
 <data>
@@ -181,3 +182,4 @@ RETR 142
 QUIT
 </protocol>
 </verify>
+</testcase>
diff --git a/tests/data/test143 b/tests/data/test143
index 157bdd9ea..237ee27ea 100644
--- a/tests/data/test143
+++ b/tests/data/test143
@@ -1,3 +1,4 @@
+<testcase>
 # Server-side
 <reply>
 <data>
@@ -33,3 +34,4 @@ RETR 143
 QUIT
 </protocol>
 </verify>
+</testcase>
diff --git a/tests/data/test144 b/tests/data/test144
index e47baf209..3b03a7880 100644
--- a/tests/data/test144
+++ b/tests/data/test144
@@ -1,3 +1,4 @@
+<testcase>
 # Server-side
 <reply>
 <data>
@@ -38,3 +39,4 @@ NLST
 QUIT
 </protocol>
 </verify>
+</testcase>
diff --git a/tests/data/test145 b/tests/data/test145
index b279bdaa4..b97bedf42 100644
--- a/tests/data/test145
+++ b/tests/data/test145
@@ -1,3 +1,4 @@
+<testcase>
 # Server-side
 <reply>
 <data>
@@ -41,3 +42,4 @@ NLST
 QUIT
 </protocol>
 </verify>
+</testcase>
diff --git a/tests/data/test146 b/tests/data/test146
index 2d1940bc8..94ff997ad 100644
--- a/tests/data/test146
+++ b/tests/data/test146
@@ -1,3 +1,4 @@
+<testcase>
 # Server-side
 <reply>
 <data>
@@ -44,3 +45,4 @@ RETR 146
 QUIT
 </protocol>
 </verify>
+</testcase>
diff --git a/tests/data/test147 b/tests/data/test147
index b92c75106..70bb76213 100644
--- a/tests/data/test147
+++ b/tests/data/test147
@@ -1,3 +1,4 @@
+<testcase>
 # Server-side
 <reply>
 <data>
@@ -46,3 +47,4 @@ RETR 147
 QUIT
 </protocol>
 </verify>
+</testcase>
diff --git a/tests/data/test148 b/tests/data/test148
index 5e1f78a10..e89cc82d3 100644
--- a/tests/data/test148
+++ b/tests/data/test148
@@ -1,3 +1,4 @@
+<testcase>
 # Server-side
 <reply>
 </reply>
@@ -39,3 +40,4 @@ MKD attempt
 QUIT
 </protocol>
 </verify>
+</testcase>
diff --git a/tests/data/test149 b/tests/data/test149
index 9195e19a9..5c21b3289 100644
--- a/tests/data/test149
+++ b/tests/data/test149
@@ -1,3 +1,4 @@
+<testcase>
 # Server-side
 <reply>
 </reply>
@@ -44,3 +45,4 @@ QUIT
 send away this contents
 </file>
 </verify>
+</testcase>
diff --git a/tests/data/test15 b/tests/data/test15
index e0a82826f..737ed419b 100644
--- a/tests/data/test15
+++ b/tests/data/test15
@@ -1,3 +1,4 @@
+<testcase>
 <info>
 <keywords>
 HTTP
@@ -7,7 +8,7 @@ HTTP GET
 </info>
 # Server-side
 <reply>
-<data nocheck=true>
+<data nocheck="true">
 HTTP/1.4 200 OK
 Fake: yes
 Fake: yes
@@ -53,3 +54,4 @@ Accept: */*
 
 </protocol>
 </verify>
+</testcase>
diff --git a/tests/data/test150 b/tests/data/test150
index 46c556e97..fd2f5a1fa 100644
--- a/tests/data/test150
+++ b/tests/data/test150
@@ -1,10 +1,13 @@
-# Server-side
+<testcase>
+
+<!-- Server-side -->
 <reply>
 
-# no <data> in this test since we have NTLM from the start
+<!-- no <data> in this test since we have NTLM from the start
+
+This is supposed to be returned when the server gets a first
+Authorization: NTLM line passed-in from the client -->
 
-# This is supposed to be returned when the server gets a first
-# Authorization: NTLM line passed-in from the client
 <data1001>
 HTTP/1.1 401 Now gimme that second request of crap
 Server: Microsoft-IIS/5.0
@@ -84,3 +87,4 @@ Accept: */*
 
 </protocol>
 </verify>
+</testcase>
diff --git a/tests/data/test151 b/tests/data/test151
index 82a0e108d..b9430b83b 100644
--- a/tests/data/test151
+++ b/tests/data/test151
@@ -1,3 +1,4 @@
+<testcase>
 # Server-side
 <reply>
 <data>
@@ -37,3 +38,4 @@ Accept: */*
 
 </protocol>
 </verify>
+</testcase>
diff --git a/tests/data/test152 b/tests/data/test152
index 12ba29c98..d2b77ff8c 100644
--- a/tests/data/test152
+++ b/tests/data/test152
@@ -1,6 +1,7 @@
+<testcase>
 # Server-side
 <reply>
-<data nocheck=1>
+<data nocheck="1">
 HTTP/1.0 401 BAD BOY
 Server: swsclose
 Content-Type: text/html
@@ -40,3 +41,4 @@ Accept: */*
 22
 </errorcode>
 </verify>
+</testcase>
diff --git a/tests/data/test153 b/tests/data/test153
index 51137b38f..aef165ef3 100644
--- a/tests/data/test153
+++ b/tests/data/test153
@@ -1,3 +1,4 @@
+<testcase>
 # Server-side
 <reply>
 # reply back and ask for Digest auth
@@ -118,3 +119,4 @@ Content-Length: 30
 This IS the second real page!
 </stdout>
 </verify>
+</testcase>
diff --git a/tests/data/test154 b/tests/data/test154
index e3d877082..5a79be380 100644
--- a/tests/data/test154
+++ b/tests/data/test154
@@ -1,3 +1,4 @@
+<testcase>
 # Server-side
 <reply>
 <servercmd>
@@ -92,3 +93,4 @@ line three
 four is the number of lines
 </protocol>
 </verify>
+</testcase>
diff --git a/tests/data/test155 b/tests/data/test155
index 0ddace228..50e6e9c76 100644
--- a/tests/data/test155
+++ b/tests/data/test155
@@ -1,3 +1,4 @@
+<testcase>
 # Server-side
 <reply>
 <servercmd>
@@ -123,3 +124,4 @@ line three
 four is the number of lines
 </protocol>
 </verify>
+</testcase>
diff --git a/tests/data/test156 b/tests/data/test156
index 67deb08ee..bbc94262a 100644
--- a/tests/data/test156
+++ b/tests/data/test156
@@ -1,3 +1,4 @@
+<testcase>
 # Server-side
 <reply>
 <data>
@@ -48,3 +49,4 @@ line three
 four is the number of lines
 </protocol>
 </verify>
+</testcase>
diff --git a/tests/data/test157 b/tests/data/test157
index 67cf26c95..33708fc0a 100644
--- a/tests/data/test157
+++ b/tests/data/test157
@@ -1,3 +1,4 @@
+<testcase>
 # Server-side
 <reply>
 <data>
@@ -35,3 +36,4 @@ Accept: */*
 
 </protocol>
 </verify>
+</testcase>
diff --git a/tests/data/test158 b/tests/data/test158
index f3aaa7ebb..7f9c6e744 100644
--- a/tests/data/test158
+++ b/tests/data/test158
@@ -1,3 +1,4 @@
+<testcase>
 # Server-side
 <reply>
 <data>
@@ -46,3 +47,4 @@ daniel
 52
 </errorcode>
 </verify>
+</testcase>
diff --git a/tests/data/test159 b/tests/data/test159
index 0bb4d89cc..245911de4 100644
--- a/tests/data/test159
+++ b/tests/data/test159
@@ -1,10 +1,12 @@
+<testcase>
 # Server-side
 <reply>
 
-# no <data> in this test since we have NTLM from the start
+<!-- no <data> in this test since we have NTLM from the start
+
+This is supposed to be returned when the server gets a first
+Authorization: NTLM line passed-in from the client -->
 
-# This is supposed to be returned when the server gets a first
-# Authorization: NTLM line passed-in from the client
 <data1001>
 HTTP/1.1 401 Now gimme that second request of crap
 Server: Microsoft-IIS/5.0
@@ -84,3 +86,4 @@ Accept: */*
 
 </protocol>
 </verify>
+</testcase>
diff --git a/tests/data/test16 b/tests/data/test16
index 7d2a8b406..142cecc80 100644
--- a/tests/data/test16
+++ b/tests/data/test16
@@ -1,3 +1,4 @@
+<testcase>
 <info>
 <keywords>
 HTTP
@@ -47,3 +48,4 @@ Proxy-Connection: Keep-Alive
 
 </protocol>
 </verify>
+</testcase>
diff --git a/tests/data/test160 b/tests/data/test160
index c831cce1f..b20df6dc9 100644
--- a/tests/data/test160
+++ b/tests/data/test160
@@ -1,6 +1,7 @@
+<testcase>
 # Server-side
 <reply>
-<data nocheck=true>
+<data nocheck="true">
 HTTP/1.1 200 OK swsclose
 Date: Thu, 09 Nov 2010 14:49:00 GMT
 Content-Length: 9
@@ -62,3 +63,4 @@ Accept: */*
 
 </protocol>
 </verify>
+</testcase>
diff --git a/tests/data/test161 b/tests/data/test161
index cc2d3f171..7a7fb8cbe 100644
--- a/tests/data/test161
+++ b/tests/data/test161
@@ -1,3 +1,4 @@
+<testcase>
 # Server-side
 <reply>
 <data>
@@ -37,3 +38,4 @@ RETR 161
 18
 </errorcode>
 </verify>
+</testcase>
diff --git a/tests/data/test162 b/tests/data/test162
index e0d602429..b73c3bba6 100644
--- a/tests/data/test162
+++ b/tests/data/test162
@@ -1,6 +1,7 @@
+<testcase>
 # Server-side
 <reply>
-<data1001 nocheck=1>
+<data1001 nocheck="1">
 HTTP/1.0 407 BAD BOY
 Proxy-Authenticate: Basic realm="Squid proxy-caching web server"
 Server: swsclose
@@ -47,3 +48,4 @@ Proxy-Connection: Keep-Alive
 22
 </errorcode>
 </verify>
+</testcase>
diff --git a/tests/data/test163 b/tests/data/test163
index b87504e44..8659410c5 100644
--- a/tests/data/test163
+++ b/tests/data/test163
@@ -1,3 +1,4 @@
+<testcase>
 # Server-side
 <reply>
 <data>
@@ -69,3 +70,4 @@ curl
 ------------------------------c2d1767eb6ac--
 </protocol>
 </verify>
+</testcase>
diff --git a/tests/data/test164 b/tests/data/test164
index 3aa03c481..958403eb1 100644
--- a/tests/data/test164
+++ b/tests/data/test164
@@ -1,3 +1,4 @@
+<testcase>
 # Server-side
 # This particular response is an exact excerpt from an actual Apache
 # server when asked for a 0-10,12-15 range.
@@ -56,3 +57,4 @@ Accept: */*
 
 </protocol>
 </verify>
+</testcase>
diff --git a/tests/data/test165 b/tests/data/test165
index 20ef32d38..812f1ef3a 100644
--- a/tests/data/test165
+++ b/tests/data/test165
@@ -1,3 +1,4 @@
+<testcase>
 #
 # Server-side
 <reply>
@@ -46,3 +47,4 @@ Proxy-Connection: Keep-Alive
 
 </protocol>
 </verify>
+</testcase>
diff --git a/tests/data/test166 b/tests/data/test166
index 0e915f9e0..274c0ce7b 100644
--- a/tests/data/test166
+++ b/tests/data/test166
@@ -1,3 +1,4 @@
+<testcase>
 # Server-side
 <reply>
 <data>
@@ -50,3 +51,4 @@ data inside the file
 ------------------------------b0b3d6d23991--
 </protocol>
 </verify>
+</testcase>
diff --git a/tests/data/test167 b/tests/data/test167
index 6fa5b1bd3..1667f3f8e 100644
--- a/tests/data/test167
+++ b/tests/data/test167
@@ -1,3 +1,4 @@
+<testcase>
 # Server-side
 <reply>
 <data>
@@ -64,3 +65,4 @@ Proxy-Connection: Keep-Alive
 
 </protocol>
 </verify>
+</testcase>
diff --git a/tests/data/test168 b/tests/data/test168
index 6f93ebab8..d867099ae 100644
--- a/tests/data/test168
+++ b/tests/data/test168
@@ -1,3 +1,4 @@
+<testcase>
 # Server-side
 <reply>
 
@@ -85,3 +86,4 @@ Proxy-Connection: Keep-Alive
 
 </protocol>
 </verify>
+</testcase>
diff --git a/tests/data/test169 b/tests/data/test169
index 47139f81f..0308ef54c 100644
--- a/tests/data/test169
+++ b/tests/data/test169
@@ -1,3 +1,4 @@
+<testcase>
 # Server-side
 <reply>
 
@@ -112,3 +113,4 @@ Proxy-Connection: Keep-Alive
 
 </protocol>
 </verify>
+</testcase>
diff --git a/tests/data/test17 b/tests/data/test17
index 54c591084..148b85464 100644
--- a/tests/data/test17
+++ b/tests/data/test17
@@ -1,3 +1,4 @@
+<testcase>
 <info>
 <keywords>
 HTTP
@@ -50,3 +51,4 @@ Accept: */*
 
 </protocol>
 </verify>
+</testcase>
diff --git a/tests/data/test170 b/tests/data/test170
index 4b957a578..ec9116a67 100644
--- a/tests/data/test170
+++ b/tests/data/test170
@@ -1,3 +1,4 @@
+<testcase>
 # Server-side
 <reply>
 </reply>
@@ -39,3 +40,4 @@ Content-Length: 0
 52
 </errorcode>
 </verify>
+</testcase>
diff --git a/tests/data/test171 b/tests/data/test171
index 2cd477f70..270c2fb38 100644
--- a/tests/data/test171
+++ b/tests/data/test171
@@ -1,3 +1,4 @@
+<testcase>
 # Server-side
 <reply>
 <data>
@@ -38,7 +39,7 @@ Accept: */*
 Proxy-Connection: Keep-Alive
 
 </protocol>
-<file name="log/jar171" mode=text>
+<file name="log/jar171" mode="text">
 # Netscape HTTP Cookie File
 # http://curlm.haxx.se/rfc/cookie_spec.html
 # This file was generated by libcurl! Edit at your own risk.
@@ -46,3 +47,4 @@ Proxy-Connection: Keep-Alive
 .z.x.com	TRUE	/	FALSE	0	XToken	xt
 </file>
 </verify>
+</testcase>
diff --git a/tests/data/test172 b/tests/data/test172
index 3fec8300a..f4b617cd9 100644
--- a/tests/data/test172
+++ b/tests/data/test172
@@ -1,3 +1,4 @@
+<testcase>
 # Server-side
 <reply>
 <data>
@@ -44,3 +45,4 @@ Cookie: nodomain=value; partmatch=present; tool=curl; name=fool
 
 </protocol>
 </verify>
+</testcase>
diff --git a/tests/data/test173 b/tests/data/test173
index 0050e5ccc..cbe47a3fc 100644
--- a/tests/data/test173
+++ b/tests/data/test173
@@ -1,3 +1,4 @@
+<testcase>
 # Server-side
 <reply>
 <data>
@@ -69,3 +70,4 @@ line8
 ------------------------------5dbea401cd8c--
 </protocol>
 </verify>
+</testcase>
diff --git a/tests/data/test174 b/tests/data/test174
index b14d39b1c..ea2771e37 100644
--- a/tests/data/test174
+++ b/tests/data/test174
@@ -1,3 +1,4 @@
+<testcase>
 # Server-side
 <reply>
 <data>
@@ -30,7 +31,7 @@ http://%HOSTIP:%HTTPPORT/174 -u testuser:testpass --anyauth -d "junkelijunk"
 <strip>
 ^User-Agent:.*
 </strip>
-<protocol nonewline=yes>
+<protocol nonewline="yes">
 POST /174 HTTP/1.1
 User-Agent: curl/7.12.1-CVS (i686-pc-linux-gnu) libcurl/7.12.1-CVS OpenSSL/0.9.6b ipv6 zlib/1.1.4 GSS libidn/0.4.6
 Host: 127.0.0.1:%HTTPPORT
@@ -41,3 +42,4 @@ Content-Type: application/x-www-form-urlencoded
 junkelijunk
 </protocol>
 </verify>
+</testcase>
diff --git a/tests/data/test175 b/tests/data/test175
index db8f8a88a..c793a2e1b 100644
--- a/tests/data/test175
+++ b/tests/data/test175
@@ -1,3 +1,4 @@
+<testcase>
 # Server-side
 <reply>
 <data>
@@ -53,7 +54,7 @@ http://%HOSTIP:%HTTPPORT/175 -u auser:apasswd --digest -d "junkelijunk"
 <strip>
 ^User-Agent:.*
 </strip>
-<protocol nonewline=yes>
+<protocol nonewline="yes">
 POST /175 HTTP/1.1
 User-Agent: curl/7.12.1-CVS (i686-pc-linux-gnu) libcurl/7.12.1-CVS OpenSSL/0.9.6b ipv6 zlib/1.1.4 GSS libidn/0.4.6
 Host: 127.0.0.1:%HTTPPORT
@@ -71,3 +72,4 @@ Content-Type: application/x-www-form-urlencoded
 junkelijunk
 </protocol>
 </verify>
+</testcase>
diff --git a/tests/data/test176 b/tests/data/test176
index f197367d7..ab5e2c347 100644
--- a/tests/data/test176
+++ b/tests/data/test176
@@ -1,3 +1,4 @@
+<testcase>
 # Server-side
 <reply>
 # the first request has NTLM type-1 included, and then the 1001 is returned
@@ -56,7 +57,7 @@ http://%HOSTIP:%HTTPPORT/176 -u auser:apasswd --ntlm -d "junkelijunk"
 <strip>
 ^User-Agent:.*
 </strip>
-<protocol nonewline=yes>
+<protocol nonewline="yes">
 POST /176 HTTP/1.1
 Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=
 User-Agent: curl/7.12.1-CVS (i686-pc-linux-gnu) libcurl/7.12.1-CVS OpenSSL/0.9.6b ipv6 zlib/1.1.4 GSS libidn/0.4.6
@@ -75,3 +76,4 @@ Content-Type: application/x-www-form-urlencoded
 junkelijunk
 </protocol>
 </verify>
+</testcase>
diff --git a/tests/data/test177 b/tests/data/test177
index 989eeb146..79a4e51d5 100644
--- a/tests/data/test177
+++ b/tests/data/test177
@@ -1,3 +1,4 @@
+<testcase>
 # Server-side
 <reply>
 <data>
@@ -38,3 +39,4 @@ Content-Type: application/x-www-form-urlencoded
 
 </protocol>
 </verify>
+</testcase>
diff --git a/tests/data/test178 b/tests/data/test178
index efb56c0a4..f90fd7462 100644
--- a/tests/data/test178
+++ b/tests/data/test178
@@ -1,3 +1,4 @@
+<testcase>
 #
 # Server-side
 <reply>
@@ -39,3 +40,4 @@ Accept: */*
 
 </protocol>
 </verify>
+</testcase>
diff --git a/tests/data/test179 b/tests/data/test179
index 6d2249ee1..a86f04e7e 100644
--- a/tests/data/test179
+++ b/tests/data/test179
@@ -1,3 +1,4 @@
+<testcase>
 # Server-side
 <reply>
 <data>
@@ -45,3 +46,4 @@ Cookie: moo2=indeed
 
 </protocol>
 </verify>
+</testcase>
diff --git a/tests/data/test18 b/tests/data/test18
index d235ffa41..0d3faeb47 100644
--- a/tests/data/test18
+++ b/tests/data/test18
@@ -1,3 +1,4 @@
+<testcase>
 <info>
 <keywords>
 HTTP
@@ -7,7 +8,7 @@ HTTP GET
 </info>
 # Server-side
 <reply>
-<data nocheck=1>
+<data nocheck="1">
 HTTP/1.1 200 OK
 Funny-head: yesyes
 Content-Length: 4
@@ -86,3 +87,4 @@ Content-Length: 4
 hoo
 </stdout>
 </verify>
+</testcase>
diff --git a/tests/data/test180 b/tests/data/test180
index d759397ca..2d007d17a 100644
--- a/tests/data/test180
+++ b/tests/data/test180
@@ -1,3 +1,4 @@
+<testcase>
 <reply>
 <data>
 HTTP/1.0 200 OK swsclose
@@ -55,3 +56,4 @@ the
       feature
 </protocol>
 </verify>
+</testcase>
diff --git a/tests/data/test181 b/tests/data/test181
index 6f2a375c2..aa145f0cb 100644
--- a/tests/data/test181
+++ b/tests/data/test181
@@ -1,3 +1,4 @@
+<testcase>
 <reply>
 <data>
 HTTP/1.0 200 OK swsclose
@@ -56,3 +57,4 @@ the
       feature
 </protocol>
 </verify>
+</testcase>
diff --git a/tests/data/test182 b/tests/data/test182
index 9d13a6a24..0db14b3b8 100644
--- a/tests/data/test182
+++ b/tests/data/test182
@@ -1,6 +1,7 @@
+<testcase>
 # Server-side
 <reply>
-<data sendzero=yes>
+<data sendzero="yes">
 </data>
 <size>
 0
@@ -33,3 +34,4 @@ RETR 182
 QUIT
 </protocol>
 </verify>
+</testcase>
diff --git a/tests/data/test183 b/tests/data/test183
index f7e54fa34..cf20083f9 100644
--- a/tests/data/test183
+++ b/tests/data/test183
@@ -1,3 +1,4 @@
+<testcase>
 # Server-side
 <reply>
 <data>
@@ -48,3 +49,4 @@ Proxy-Connection: Keep-Alive
 </protocol>
 
 </verify>
+</testcase>
diff --git a/tests/data/test184 b/tests/data/test184
index cd8de6315..3f1403bb3 100644
--- a/tests/data/test184
+++ b/tests/data/test184
@@ -1,3 +1,4 @@
+<testcase>
 # Server-side
 <reply>
 <data>
@@ -67,3 +68,4 @@ Proxy-Connection: Keep-Alive
 </protocol>
 
 </verify>
+</testcase>
diff --git a/tests/data/test185 b/tests/data/test185
index 9799c61c7..3ba31f888 100644
--- a/tests/data/test185
+++ b/tests/data/test185
@@ -1,3 +1,4 @@
+<testcase>
 # Server-side
 <reply>
 <data>
@@ -67,3 +68,4 @@ Host: another.visitor.stay.a.while.stay.foreeeeeever
 </protocol>
 
 </verify>
+</testcase>
diff --git a/tests/data/test186 b/tests/data/test186
index 763c6c805..682fd00f8 100644
--- a/tests/data/test186
+++ b/tests/data/test186
@@ -1,3 +1,4 @@
+<testcase>
 # Server-side
 <reply>
 <data>
@@ -52,3 +53,4 @@ Content-Type: text/html
 ------------------------------212d9006ceb5--
 </protocol>
 </verify>
+</testcase>
diff --git a/tests/data/test187 b/tests/data/test187
index 2919164f5..95a325fe5 100644
--- a/tests/data/test187
+++ b/tests/data/test187
@@ -1,3 +1,4 @@
+<testcase>
 # Server-side
 <reply>
 <data>
@@ -65,3 +66,4 @@ Accept: */*
 
 </protocol>
 </verify>
+</testcase>
diff --git a/tests/data/test188 b/tests/data/test188
index f6eded22b..f831cc454 100644
--- a/tests/data/test188
+++ b/tests/data/test188
@@ -1,3 +1,4 @@
+<testcase>
 # Server-side
 <reply>
 <data>
@@ -64,3 +65,4 @@ Accept: */*
 
 </protocol>
 </verify>
+</testcase>
diff --git a/tests/data/test189 b/tests/data/test189
index 1885c57e4..7e49e1eea 100644
--- a/tests/data/test189
+++ b/tests/data/test189
@@ -1,3 +1,4 @@
+<testcase>
 # Server-side
 <reply>
 <data>
@@ -65,3 +66,4 @@ Accept: */*
 33
 </errorcode>
 </verify>
+</testcase>
diff --git a/tests/data/test19 b/tests/data/test19
index 9a40db2ed..aba75d3ec 100644
--- a/tests/data/test19
+++ b/tests/data/test19
@@ -1,3 +1,4 @@
+<testcase>
 <info>
 <keywords>
 HTTP
@@ -30,3 +31,4 @@ attempt connect to non-listening socket
 7
 </errorcode>
 </verify>
+</testcase>
diff --git a/tests/data/test190 b/tests/data/test190
index ab241a760..b5c17850e 100644
--- a/tests/data/test190
+++ b/tests/data/test190
@@ -1,3 +1,4 @@
+<testcase>
 # Server-side
 <reply>
 moooooooo
@@ -35,3 +36,4 @@ PWD
 CWD path
 </protocol>
 </verify>
+</testcase>
diff --git a/tests/data/test191 b/tests/data/test191
index 91bc24526..090d4c5b6 100644
--- a/tests/data/test191
+++ b/tests/data/test191
@@ -1,3 +1,4 @@
+<testcase>
 # Server-side
 <reply>
 <data>
@@ -31,3 +32,4 @@ RETR 191
 QUIT
 </protocol>
 </verify>
+</testcase>
diff --git a/tests/data/test192 b/tests/data/test192
index e29cdcbc7..21e15d1a4 100644
--- a/tests/data/test192
+++ b/tests/data/test192
@@ -1,7 +1,8 @@
+<testcase>
 #
 # Server-side
 <reply>
-<data nocheck=1>
+<data nocheck="1">
 HTTP/1.1 200 OK
 Date: Thu, 09 Nov 2010 14:49:00 GMT
 Content-Length: 8
@@ -48,3 +49,4 @@ monster
 1
 </stdout>
 </verify>
+</testcase>
diff --git a/tests/data/test193 b/tests/data/test193
index 7c53de6c8..7e0c0b1cd 100644
--- a/tests/data/test193
+++ b/tests/data/test193
@@ -1,7 +1,8 @@
+<testcase>
 #
 # Server-side
 <reply>
-<data nocheck=1>
+<data nocheck="1">
 HTTP/1.1 302 OK swsbounce swsclose
 Date: Thu, 09 Nov 2010 14:49:00 GMT
 Content-Length: 8
@@ -10,7 +11,7 @@ Location: ./193
 
 monster
 </data>
-<data1 nocheck=1>
+<data1 nocheck="1">
 HTTP/1.1 200 OK
 Date: Thu, 09 Nov 2010 14:49:00 GMT
 Content-Length: 8
@@ -69,3 +70,4 @@ monster
 </stdout>
 
 </verify>
+</testcase>
diff --git a/tests/data/test194 b/tests/data/test194
index 9842551ce..38a5485d7 100644
--- a/tests/data/test194
+++ b/tests/data/test194
@@ -1,3 +1,4 @@
+<testcase>
 # Server-side
 <reply>
 <data>
@@ -43,3 +44,4 @@ Accept: */*
 </protocol>
 
 </verify>
+</testcase>
diff --git a/tests/data/test195 b/tests/data/test195
index cadfb3d6f..f986bfb6e 100644
--- a/tests/data/test195
+++ b/tests/data/test195
@@ -1,3 +1,4 @@
+<testcase>
 # Server-side
 <reply>
 </reply>
@@ -28,3 +29,4 @@ USER anonymous
 PASS curl_by_daniel@haxx.se
 </protocol>
 </verify>
+</testcase>
diff --git a/tests/data/test196 b/tests/data/test196
index b47cf5d6b..6bc3dbd86 100644
--- a/tests/data/test196
+++ b/tests/data/test196
@@ -1,3 +1,4 @@
+<testcase>
 # Server-side
 <reply>
 </reply>
@@ -31,3 +32,4 @@ USER anonymous
 PASS curl_by_daniel@haxx.se
 </protocol>
 </verify>
+</testcase>
diff --git a/tests/data/test197 b/tests/data/test197
index 59ee26029..8295b676b 100644
--- a/tests/data/test197
+++ b/tests/data/test197
@@ -1,14 +1,15 @@
+<testcase>
 #
 # Server-side
 <reply>
-<data nocheck=1>
+<data nocheck="1">
 HTTP/1.1 503 OK swsbounce
 Date: Thu, 09 Nov 2010 14:49:00 GMT
 Content-Length: 21
 
 server not available
 </data>
-<data1 nocheck=1>
+<data1 nocheck="1">
 HTTP/1.1 200 OK
 Date: Thu, 09 Nov 2010 14:49:00 GMT
 Content-Length: 3
@@ -65,3 +66,4 @@ ok
 </stdout>
 
 </verify>
+</testcase>
diff --git a/tests/data/test198 b/tests/data/test198
index 51d0e6f02..45438e542 100644
--- a/tests/data/test198
+++ b/tests/data/test198
@@ -1,3 +1,4 @@
+<testcase>
 #
 # Server-side
 <reply>
@@ -60,3 +61,4 @@ Accept: */*
 </protocol>
 
 </verify>
+</testcase>
diff --git a/tests/data/test199 b/tests/data/test199
index 2b2b435df..db0d12c92 100644
--- a/tests/data/test199
+++ b/tests/data/test199
@@ -1,3 +1,4 @@
+<testcase>
 #
 # Server-side
 <reply name="1">
@@ -13,7 +14,7 @@ Connection: close
 Content-Type: text/html
 Funny-head: yesyes
 
-<foo>
+-foo-
 </data>
 </reply>
 
@@ -48,3 +49,4 @@ Accept: */*
 
 </protocol>
 </verify>
+</testcase>
diff --git a/tests/data/test2 b/tests/data/test2
index c701e79ba..573bdfcdc 100644
--- a/tests/data/test2
+++ b/tests/data/test2
@@ -1,3 +1,4 @@
+<testcase>
 <info>
 <keywords>
 HTTP
@@ -49,3 +50,4 @@ Accept: */*
 [insert full protocol verifiction dump here]
 </data>
 </verify>
+</testcase>
diff --git a/tests/data/test20 b/tests/data/test20
index abc839892..cd1536060 100644
--- a/tests/data/test20
+++ b/tests/data/test20
@@ -1,3 +1,4 @@
+<testcase>
 <info>
 <keywords>
 non-existing host name
@@ -29,3 +30,4 @@ non-existing-and-weeeeeeirdname.
 6
 </errorcode>
 </verify>
+</testcase>
diff --git a/tests/data/test200 b/tests/data/test200
index bd9a448ae..7b5ec41ff 100644
--- a/tests/data/test200
+++ b/tests/data/test200
@@ -1,3 +1,4 @@
+<testcase>
 # Server-side
 <reply>
 <data>
@@ -32,3 +33,4 @@ moo
 # Verify data after the test has been "shot"
 <verify>
 </verify>
+</testcase>
diff --git a/tests/data/test201 b/tests/data/test201
index a2915923e..e8ddb7fae 100644
--- a/tests/data/test201
+++ b/tests/data/test201
@@ -1,3 +1,4 @@
+<testcase>
 # Server-side
 <reply>
 <data>
@@ -23,3 +24,4 @@ file://localhost/%PWD/log/non-existant-file.txt
 37
 </errorcode>
 </verify>
+</testcase>
diff --git a/tests/data/test202 b/tests/data/test202
index 937e0beb9..5b578cbab 100644
--- a/tests/data/test202
+++ b/tests/data/test202
@@ -1,3 +1,4 @@
+<testcase>
 # Server-side
 <reply>
 <data>
@@ -27,3 +28,4 @@ contents in a single file
 contents in a single file
 </stdout>
 </verify>
+</testcase>
diff --git a/tests/data/test203 b/tests/data/test203
index 2cec4a69d..c1c04209b 100644
--- a/tests/data/test203
+++ b/tests/data/test203
@@ -1,3 +1,4 @@
+<testcase>
 # Server-side
 <reply>
 <data>
@@ -32,3 +33,4 @@ moo
 # Verify data after the test has been "shot"
 <verify>
 </verify>
+</testcase>
diff --git a/tests/data/test204 b/tests/data/test204
index cd661d3f3..cb21c6d38 100644
--- a/tests/data/test204
+++ b/tests/data/test204
@@ -1,3 +1,4 @@
+<testcase>
 # no Server-side
 
 # Client-side
@@ -30,3 +31,4 @@ to
 write
 </file>
 </verify>
+</testcase>
diff --git a/tests/data/test205 b/tests/data/test205
index b82919053..7bef1a868 100644
--- a/tests/data/test205
+++ b/tests/data/test205
@@ -1,3 +1,4 @@
+<testcase>
 # no Server-side
 
 # Client-side
@@ -27,3 +28,4 @@ write
 23
 </errorcode>
 </verify>
+</testcase>
diff --git a/tests/data/test206 b/tests/data/test206
index b60393dfe..a2b7034b7 100644
--- a/tests/data/test206
+++ b/tests/data/test206
@@ -1,3 +1,4 @@
+<testcase>
 # Server-side
 <reply>
 
@@ -82,3 +83,4 @@ Accept: */*
 
 </protocol>
 </verify>
+</testcase>
diff --git a/tests/data/test207 b/tests/data/test207
index 48d556d7e..e3ac65c99 100644
--- a/tests/data/test207
+++ b/tests/data/test207
@@ -1,3 +1,4 @@
+<testcase>
 #
 # Server-side
 <reply>
@@ -54,3 +55,4 @@ Accept: */*
 18
 </errorcode>
 </verify>
+</testcase>
diff --git a/tests/data/test208 b/tests/data/test208
index d57b79fd8..97eacbc45 100644
--- a/tests/data/test208
+++ b/tests/data/test208
@@ -1,3 +1,4 @@
+<testcase>
 # Server-side
 <reply>
 <data>
@@ -60,3 +61,4 @@ the
       feature
 </protocol>
 </verify>
+</testcase>
diff --git a/tests/data/test209 b/tests/data/test209
index 4ebf7409f..e7f1d34d2 100644
--- a/tests/data/test209
+++ b/tests/data/test209
@@ -1,3 +1,4 @@
+<testcase>
 # Server-side
 <reply>
 
@@ -101,3 +102,4 @@ Accept: */*
 
 </protocol>
 </verify>
+</testcase>
diff --git a/tests/data/test21 b/tests/data/test21
index 5f0338cac..8e4e847e0 100644
--- a/tests/data/test21
+++ b/tests/data/test21
@@ -1,3 +1,4 @@
+<testcase>
 <info>
 <keywords>
 FAILURE
@@ -29,3 +30,4 @@ use curl with multiple request methods
 2
 </errorcode>
 </verify>
+</testcase>
diff --git a/tests/data/test210 b/tests/data/test210
index 711a26ad1..dd8c5c782 100644
--- a/tests/data/test210
+++ b/tests/data/test210
@@ -1,3 +1,4 @@
+<testcase>
 # Server-side
 <reply>
 <data>
@@ -42,3 +43,4 @@ RETR 210
 QUIT
 </protocol>
 </verify>
+</testcase>
diff --git a/tests/data/test211 b/tests/data/test211
index 18f4cb11e..46c538aeb 100644
--- a/tests/data/test211
+++ b/tests/data/test211
@@ -1,3 +1,4 @@
+<testcase>
 # Server-side
 <reply>
 <data>
@@ -44,3 +45,4 @@ RETR 211
 QUIT
 </protocol>
 </verify>
+</testcase>
diff --git a/tests/data/test212 b/tests/data/test212
index c34ffe022..943ae7a09 100644
--- a/tests/data/test212
+++ b/tests/data/test212
@@ -1,3 +1,4 @@
+<testcase>
 # Server-side
 <reply>
 <data>
@@ -51,3 +52,4 @@ RETR 212
 QUIT
 </protocol>
 </verify>
+</testcase>
diff --git a/tests/data/test213 b/tests/data/test213
index 364791cef..1e2464d5e 100644
--- a/tests/data/test213
+++ b/tests/data/test213
@@ -1,3 +1,4 @@
+<testcase>
 # Server-side
 <reply>
 
@@ -83,7 +84,7 @@ http://test.remote.server.com:213/path/2130002 --proxy http://%HOSTIP:%HTTPPORT
 <strippart>
 s/^(Proxy-Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAABQAFAHAAAAA).*/$1/
 </strippart>
-<protocol nonewline=yes>
+<protocol nonewline="yes">
 CONNECT test.remote.server.com:213 HTTP/1.0
 Host: test.remote.server.com:213
 Proxy-Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=
@@ -104,3 +105,4 @@ Content-Type: application/x-www-form-urlencoded
 postit
 </protocol>
 </verify>
+</testcase>
diff --git a/tests/data/test214 b/tests/data/test214
index f79f48520..7d93ab234 100644
--- a/tests/data/test214
+++ b/tests/data/test214
@@ -1,3 +1,4 @@
+<testcase>
 #
 # Server-side
 <reply>
@@ -8,7 +9,7 @@ Content-Length: 6
 Content-Type: text/html
 Funny-head: yesyes
 
-<foo>
+-foo-
 </data>
 </reply>
 
@@ -40,3 +41,4 @@ Accept: */*
 </protocol>
 
 </verify>
+</testcase>
diff --git a/tests/data/test215 b/tests/data/test215
index 6077feb8b..d44b2f367 100644
--- a/tests/data/test215
+++ b/tests/data/test215
@@ -1,3 +1,4 @@
+<testcase>
 # Server-side
 <reply>
 # When doing LIST, we get the default list output hard-coded in the test
@@ -48,3 +49,4 @@ LIST
 QUIT
 </protocol>
 </verify>
+</testcase>
diff --git a/tests/data/test216 b/tests/data/test216
index ba3d52720..2ed0925f3 100644
--- a/tests/data/test216
+++ b/tests/data/test216
@@ -1,3 +1,4 @@
+<testcase>
 # Server-side
 <reply>
 </reply>
@@ -35,3 +36,4 @@ STOR ..anotherup
 QUIT
 </protocol>
 </verify>
+</testcase>
diff --git a/tests/data/test217 b/tests/data/test217
index c74ac9cb5..da98339ee 100644
--- a/tests/data/test217
+++ b/tests/data/test217
@@ -1,8 +1,9 @@
+<testcase>
 # Server-side
 <reply>
 
 # this is returned first since we get no proxy-auth
-<data nocheck=1>
+<data nocheck="1">
 HTTP/1.1 405 Method Not Allowed swsclose
 
 And you should ignore this data.
@@ -44,3 +45,4 @@ HTTP/1.1 405 Method Not Allowed swsclose
 000 405
 </stdout>
 </verify>
+</testcase>
diff --git a/tests/data/test218 b/tests/data/test218
index bcf5d7a47..4b1248381 100644
--- a/tests/data/test218
+++ b/tests/data/test218
@@ -1,3 +1,4 @@
+<testcase>
 #
 # Server-side
 <reply>
@@ -48,3 +49,4 @@ just some tiny teeny contents
 
 </protocol>
 </verify>
+</testcase>
diff --git a/tests/data/test22 b/tests/data/test22
index 0623d99bd..075cf2882 100644
--- a/tests/data/test22
+++ b/tests/data/test22
@@ -1,3 +1,4 @@
+<testcase>
 <info>
 <keywords>
 HTTP
@@ -42,3 +43,4 @@ Accept: */*
 
 </protocol>
 </verify>
+</testcase>
diff --git a/tests/data/test220 b/tests/data/test220
index 2fa2d9f48..b41b91f38 100644
--- a/tests/data/test220
+++ b/tests/data/test220
@@ -1,3 +1,4 @@
+<testcase>
 <info>
 <keywords>
 HTTP
@@ -8,7 +9,7 @@ compressed
 #
 # Server-side
 <reply>
-<data base64=yes>
+<data base64="yes">
 SFRUUC8xLjEgMjAwIE9LDQpEYXRlOiBNb24sIDI5IE5vdiAyMDA0IDIxOjU2OjUzIEdNVA0KU2Vy
 dmVyOiBBcGFjaGUvMS4zLjMxIChEZWJpYW4gR05VL0xpbnV4KSBtb2RfZ3ppcC8xLjMuMjYuMWEg
 UEhQLzQuMy45LTEgbW9kX3NzbC8yLjguMjAgT3BlblNTTC8wLjkuN2QgbW9kX3BlcmwvMS4yOQ0K
@@ -64,3 +65,4 @@ Accept-Encoding: deflate, gzip
 
 </protocol>
 </verify>
+</testcase>
diff --git a/tests/data/test221 b/tests/data/test221
index 211ca1e0c..6ba88ee7b 100644
--- a/tests/data/test221
+++ b/tests/data/test221
@@ -1,3 +1,4 @@
+<testcase>
 <info>
 <keywords>
 HTTP
@@ -9,7 +10,7 @@ FAILURE
 #
 # Server-side
 <reply>
-<data base64=yes>
+<data base64="yes">
 SFRUUC8xLjEgMjAwIE9LDQpEYXRlOiBNb24sIDI5IE5vdiAyMDA0IDIxOjU2OjUzIEdNVA0KU2Vy
 dmVyOiBBcGFjaGUvMS4zLjMxIChEZWJpYW4gR05VL0xpbnV4KSBtb2RfZ3ppcC8xLjMuMjYuMWEg
 UEhQLzQuMy45LTEgbW9kX3NzbC8yLjguMjAgT3BlblNTTC8wLjkuN2QgbW9kX3BlcmwvMS4yOQ0K
@@ -67,3 +68,4 @@ Accept-Encoding: deflate, gzip
 61
 </errorcode>
 </verify>
+</testcase>
diff --git a/tests/data/test222 b/tests/data/test222
index 4c089dd52..fc77837d2 100644
--- a/tests/data/test222
+++ b/tests/data/test222
@@ -1,3 +1,4 @@
+<testcase>
 <info>
 <keywords>
 HTTP
@@ -8,7 +9,7 @@ compressed
 #
 # Server-side
 <reply>
-<data base64=yes>
+<data base64="yes">
 SFRUUC8xLjEgMjAwIE9LDQpEYXRlOiBNb24sIDI5IE5vdiAyMDA0IDIxOjU2OjUzIEdNVA0KU2Vy
 dmVyOiBBcGFjaGUvMS4zLjMxIChEZWJpYW4gR05VL0xpbnV4KSBtb2RfZ3ppcC8xLjMuMjYuMWEg
 UEhQLzQuMy45LTEgbW9kX3NzbC8yLjguMjAgT3BlblNTTC8wLjkuN2QgbW9kX3BlcmwvMS4yOQ0K
@@ -195,3 +196,4 @@ Accept-Encoding: deflate, gzip
 
 </protocol>
 </verify>
+</testcase>
diff --git a/tests/data/test223 b/tests/data/test223
index df367f715..bed5d1882 100644
--- a/tests/data/test223
+++ b/tests/data/test223
@@ -1,3 +1,4 @@
+<testcase>
 <info>
 <keywords>
 HTTP
@@ -10,7 +11,7 @@ FAILURE
 # Server-side
 <reply>
 # this deflate chunk has three bytes removed from the beginning
-<data base64=yes>
+<data base64="yes">
 SFRUUC8xLjEgMjAwIE9LDQpEYXRlOiBNb24sIDI5IE5vdiAyMDA0IDIxOjU2OjUzIEdNVA0KU2Vy
 dmVyOiBBcGFjaGUvMS4zLjMxIChEZWJpYW4gR05VL0xpbnV4KSBtb2RfZ3ppcC8xLjMuMjYuMWEg
 UEhQLzQuMy45LTEgbW9kX3NzbC8yLjguMjAgT3BlblNTTC8wLjkuN2QgbW9kX3BlcmwvMS4yOQ0K
@@ -88,3 +89,4 @@ Accept-Encoding: deflate, gzip
 61
 </errorcode>
 </verify>
+</testcase>
diff --git a/tests/data/test224 b/tests/data/test224
index 84cedd65a..dc713651b 100644
--- a/tests/data/test224
+++ b/tests/data/test224
@@ -1,3 +1,4 @@
+<testcase>
 <info>
 <keywords>
 HTTP
@@ -8,7 +9,7 @@ compressed
 #
 # Server-side
 <reply>
-<data base64=yes>
+<data base64="yes">
 SFRUUC8xLjEgMjAwIE9LDQpEYXRlOiBNb24sIDI5IE5vdiAyMDA0IDIxOjU2OjUzIEdNVA0KU2Vy
 dmVyOiBBcGFjaGUvMS4zLjMxIChEZWJpYW4gR05VL0xpbnV4KSBtb2RfZ3ppcC8xLjMuMjYuMWEg
 UEhQLzQuMy45LTEgbW9kX3NzbC8yLjguMjAgT3BlblNTTC8wLjkuN2QgbW9kX3BlcmwvMS4yOQ0K
@@ -100,3 +101,4 @@ Accept-Encoding: deflate, gzip
 
 </protocol>
 </verify>
+</testcase>
diff --git a/tests/data/test225 b/tests/data/test225
index 9dee84255..fe39db9ec 100644
--- a/tests/data/test225
+++ b/tests/data/test225
@@ -1,3 +1,4 @@
+<testcase>
 <info>
 <keywords>
 FTP
@@ -25,3 +26,4 @@ ftp://bad%0auser:passwd@%HOSTIP:%FTPPORT/225%0a
 3
 </errorcode>
 </verify>
+</testcase>
diff --git a/tests/data/test226 b/tests/data/test226
index e0ccf5b93..727e1534c 100644
--- a/tests/data/test226
+++ b/tests/data/test226
@@ -1,3 +1,4 @@
+<testcase>
 <info>
 <keywords>
 FTP
@@ -25,3 +26,4 @@ ftp://%HOSTIP:%FTPPORT/226%0d
 3
 </errorcode>
 </verify>
+</testcase>
diff --git a/tests/data/test227 b/tests/data/test227
index b5e0d9379..7ce25a60b 100644
--- a/tests/data/test227
+++ b/tests/data/test227
@@ -1,3 +1,4 @@
+<testcase>
 <info>
 <keywords>
 FTP
@@ -52,3 +53,4 @@ NOOP 3
 QUIT
 </protocol>
 </verify>
+</testcase>
diff --git a/tests/data/test228 b/tests/data/test228
index d1c5daf87..714f7cae6 100644
--- a/tests/data/test228
+++ b/tests/data/test228
@@ -1,3 +1,4 @@
+<testcase>
 <info>
 <keywords>
 FTP
@@ -49,3 +50,4 @@ RETR 228
 QUIT
 </protocol>
 </verify>
+</testcase>
diff --git a/tests/data/test229 b/tests/data/test229
index 92c83fb81..8b6af9602 100644
--- a/tests/data/test229
+++ b/tests/data/test229
@@ -1,3 +1,4 @@
+<testcase>
 <info>
 <keywords>
 FTP
@@ -38,3 +39,4 @@ ACCT one count
 11
 </errorcode>
 </verify>
+</testcase>
diff --git a/tests/data/test23 b/tests/data/test23
index 4155ea2cd..46872e82e 100644
--- a/tests/data/test23
+++ b/tests/data/test23
@@ -1,3 +1,4 @@
+<testcase>
 <info>
 <keywords>
 unsupported protocol
@@ -29,3 +30,4 @@ htfp://%HOSTIP:%HTTPPORT/none.htfml
 1
 </errorcode>
 </verify>
+</testcase>
diff --git a/tests/data/test233 b/tests/data/test233
index b11aabbbd..6832ae5dd 100644
--- a/tests/data/test233
+++ b/tests/data/test233
@@ -1,3 +1,4 @@
+<testcase>
 <info>
 <keywords>
 HTTP
@@ -92,3 +93,4 @@ Proxy-Connection: Keep-Alive
 
 </protocol>
 </verify>
+</testcase>
diff --git a/tests/data/test234 b/tests/data/test234
index c8775c543..47cd0270e 100644
--- a/tests/data/test234
+++ b/tests/data/test234
@@ -1,3 +1,4 @@
+<testcase>
 #
 # Server-side
 <reply>
@@ -84,3 +85,4 @@ Proxy-Connection: Keep-Alive
 
 </protocol>
 </verify>
+</testcase>
diff --git a/tests/data/test235 b/tests/data/test235
index c1345b9c2..699a478f9 100644
--- a/tests/data/test235
+++ b/tests/data/test235
@@ -1,3 +1,4 @@
+<testcase>
 # Server-side
 <reply>
 </reply>
@@ -40,3 +41,4 @@ this is the *****crap******** that we're gonna upload
 worx?
 </upload>
 </verify>
+</testcase>
diff --git a/tests/data/test236 b/tests/data/test236
index 29d739f92..b25e898f8 100644
--- a/tests/data/test236
+++ b/tests/data/test236
@@ -1,3 +1,4 @@
+<testcase>
 # Client-side
 <client>
 <server>
@@ -35,3 +36,4 @@ QUIT
 25
 </errorcode>
 </verify>
+</testcase>
diff --git a/tests/data/test237 b/tests/data/test237
index c276da917..a1e105af7 100644
--- a/tests/data/test237
+++ b/tests/data/test237
@@ -1,3 +1,4 @@
+<testcase>
 # Server-side
 <reply>
 </reply>
@@ -38,3 +39,4 @@ PWD
 PASV
 </protocol>
 </verify>
+</testcase>
diff --git a/tests/data/test238 b/tests/data/test238
index 8e23b4fb0..97050157f 100644
--- a/tests/data/test238
+++ b/tests/data/test238
@@ -1,3 +1,4 @@
+<testcase>
 # Server-side
 <reply>
 </reply>
@@ -37,3 +38,4 @@ EPSV
 PASV
 </protocol>
 </verify>
+</testcase>
diff --git a/tests/data/test239 b/tests/data/test239
index 6fd4f0933..0f6bb249a 100644
--- a/tests/data/test239
+++ b/tests/data/test239
@@ -1,3 +1,4 @@
+<testcase>
 # Server-side
 <reply>
 
@@ -61,7 +62,7 @@ http://%HOSTIP:%HTTPPORT/239 --proxy http://%HOSTIP:%HTTPPORT --proxy-user silly
 <strippart>
 s/^(Proxy-Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAABQAFAHAAAAA).*/$1/
 </strippart>
-<protocol nonewline=yes>
+<protocol nonewline="yes">
 POST http://%HOSTIP:%HTTPPORT/239 HTTP/1.1
 Proxy-Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=
 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
@@ -85,3 +86,4 @@ Content-Type: application/x-www-form-urlencoded
 postit
 </protocol>
 </verify>
+</testcase>
diff --git a/tests/data/test24 b/tests/data/test24
index be12be5d0..e650b311e 100644
--- a/tests/data/test24
+++ b/tests/data/test24
@@ -1,3 +1,4 @@
+<testcase>
 <info>
 <keywords>
 HTTP
@@ -6,7 +7,7 @@ HTTP GET
 </info>
 # Server-side
 <reply>
-<data nocheck=1>
+<data nocheck="1">
 HTTP/1.0 404 BAD BOY
 Content-Type: text/html
 
@@ -43,3 +44,4 @@ Accept: */*
 22
 </errorcode>
 </verify>
+</testcase>
diff --git a/tests/data/test240 b/tests/data/test240
index 77029d44c..cd8594d63 100644
--- a/tests/data/test240
+++ b/tests/data/test240
@@ -1,3 +1,4 @@
+<testcase>
 <info>
 <keywords>
 HTTP
@@ -20,7 +21,7 @@ Connection: close
 Content-Type: text/html
 Funny-head: yesyes
 
-<foo>
+-foo-
 </data>
 </reply>
 
@@ -54,3 +55,4 @@ Accept: */*
 
 </protocol>
 </verify>
+</testcase>
diff --git a/tests/data/test241 b/tests/data/test241
index 29143dc7a..46eae1f72 100644
--- a/tests/data/test241
+++ b/tests/data/test241
@@ -1,3 +1,4 @@
+<testcase>
 <info>
 <keywords>
 HTTP
@@ -52,3 +53,4 @@ Accept: */*
 
 </protocol>
 </verify>
+</testcase>
diff --git a/tests/data/test242 b/tests/data/test242
index 275b0221b..639b2c093 100644
--- a/tests/data/test242
+++ b/tests/data/test242
@@ -1,3 +1,4 @@
+<testcase>
 <info>
 <keywords>
 HTTP
@@ -50,3 +51,4 @@ Accept: */*
 
 </protocol>
 </verify>
+</testcase>
diff --git a/tests/data/test243 b/tests/data/test243
index c020896fa..fcb10885c 100644
--- a/tests/data/test243
+++ b/tests/data/test243
@@ -1,3 +1,4 @@
+<testcase>
 <info>
 <keywords>
 HTTP
@@ -89,7 +90,7 @@ http://%HOSTIP:%HTTPPORT/243 --proxy http://%HOSTIP:%HTTPPORT --proxy-user silly
 <strippart>
 s/^(Proxy-Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAABQAFAHAAAAA).*/$1/
 </strippart>
-<protocol nonewline=yes>
+<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
 Host: 127.0.0.1:8990
@@ -122,3 +123,4 @@ Content-Type: application/x-www-form-urlencoded
 postit
 </protocol>
 </verify>
+</testcase>
diff --git a/tests/data/test245 b/tests/data/test245
index c4de97b83..ffefb219b 100644
--- a/tests/data/test245
+++ b/tests/data/test245
@@ -1,3 +1,4 @@
+<testcase>
 # Server-side
 <reply>
 <data>
@@ -53,7 +54,7 @@ http://%HOSTIP:%HTTPPORT/245 -u auser:apasswd --digest -d "junkelijunk"
 <strip>
 ^User-Agent:.*
 </strip>
-<protocol nonewline=yes>
+<protocol nonewline="yes">
 POST /245 HTTP/1.1
 User-Agent: curl/7.12.1-CVS (i686-pc-linux-gnu) libcurl/7.12.1-CVS OpenSSL/0.9.6b ipv6 zlib/1.1.4 GSS libidn/0.4.6
 Host: 127.0.0.1:%HTTPPORT
@@ -72,3 +73,4 @@ Content-Type: application/x-www-form-urlencoded
 junkelijunk
 </protocol>
 </verify>
+</testcase>
diff --git a/tests/data/test246 b/tests/data/test246
index 540f1d794..72e27b998 100644
--- a/tests/data/test246
+++ b/tests/data/test246
@@ -1,3 +1,4 @@
+<testcase>
 # Server-side
 <reply>
 <data>
@@ -63,7 +64,7 @@ http://%HOSTIP:%HTTPPORT/246 -u auser:apasswd --digest -d "junkelijunk"
 <strip>
 ^User-Agent:.*
 </strip>
-<protocol nonewline=yes>
+<protocol nonewline="yes">
 POST /246 HTTP/1.1
 User-Agent: curl/7.12.1-CVS (i686-pc-linux-gnu) libcurl/7.12.1-CVS OpenSSL/0.9.6b ipv6 zlib/1.1.4 GSS libidn/0.4.6
 Host: 127.0.0.1:%HTTPPORT
@@ -82,3 +83,4 @@ Content-Type: application/x-www-form-urlencoded
 junkelijunk
 </protocol>
 </verify>
+</testcase>
diff --git a/tests/data/test247 b/tests/data/test247
index 0985b8682..3ed809d2e 100644
--- a/tests/data/test247
+++ b/tests/data/test247
@@ -1,3 +1,4 @@
+<testcase>
 <reply>
 <mdtm>
 213 20030409102659
@@ -37,3 +38,4 @@ MDTM 247
 QUIT
 </protocol>
 </verify>
+</testcase>
diff --git a/tests/data/test248 b/tests/data/test248
index 3fc3fc14b..b2c3c4a36 100644
--- a/tests/data/test248
+++ b/tests/data/test248
@@ -1,3 +1,4 @@
+<testcase>
 <reply>
 <mdtm>
 213 20050409102659
@@ -46,3 +47,4 @@ STOR 248
 QUIT
 </protocol>
 </verify>
+</testcase>
diff --git a/tests/data/test249 b/tests/data/test249
index f196e23ee..190732569 100644
--- a/tests/data/test249
+++ b/tests/data/test249
@@ -1,3 +1,4 @@
+<testcase>
 #
 # Server-side
 <reply>
@@ -43,3 +44,4 @@ If-Modified-Since: Sun, 12 Dec 1999 12:00:00 GMT
 
 </protocol>
 </verify>
+</testcase>
diff --git a/tests/data/test25 b/tests/data/test25
index b0c6cd5d8..9c3a99178 100644
--- a/tests/data/test25
+++ b/tests/data/test25
@@ -1,3 +1,4 @@
+<testcase>
 <info>
 <keywords>
 HTTP
@@ -112,3 +113,4 @@ Accept: */*
 47
 </errorcode>
 </verify>
+</testcase>
diff --git a/tests/data/test250 b/tests/data/test250
index b3fa1cfdc..fc5ce0b02 100644
--- a/tests/data/test250
+++ b/tests/data/test250
@@ -1,3 +1,4 @@
+<testcase>
 #
 # Server-side
 <reply>
@@ -51,3 +52,4 @@ LIST
 QUIT
 </protocol>
 </verify>
+</testcase>
diff --git a/tests/data/test251 b/tests/data/test251
index 6b3cf7b21..1afc12b35 100644
--- a/tests/data/test251
+++ b/tests/data/test251
@@ -1,3 +1,4 @@
+<testcase>
 # Server-side
 <reply>
 # When doing LIST, we get the default list output hard-coded in the test
@@ -51,3 +52,4 @@ LIST
 QUIT
 </protocol>
 </verify>
+</testcase>
diff --git a/tests/data/test252 b/tests/data/test252
index 0cb6544b8..37769d92b 100644
--- a/tests/data/test252
+++ b/tests/data/test252
@@ -1,3 +1,4 @@
+<testcase>
 <info>
 <keywords>
 FTP-ipv6
@@ -57,3 +58,4 @@ LIST
 QUIT
 </protocol>
 </verify>
+</testcase>
diff --git a/tests/data/test253 b/tests/data/test253
index c4419a4a6..a1620dd73 100644
--- a/tests/data/test253
+++ b/tests/data/test253
@@ -1,3 +1,4 @@
+<testcase>
 <info>
 <keywords>
 FTP-ipv6
@@ -57,3 +58,4 @@ LIST
 QUIT
 </protocol>
 </verify>
+</testcase>
diff --git a/tests/data/test254 b/tests/data/test254
index ddabed8a2..416064731 100644
--- a/tests/data/test254
+++ b/tests/data/test254
@@ -1,3 +1,4 @@
+<testcase>
 <info>
 <keywords>
 FTP-ipv6
@@ -58,3 +59,4 @@ LIST
 QUIT
 </protocol>
 </verify>
+</testcase>
diff --git a/tests/data/test255 b/tests/data/test255
index 893256e9c..d26e82a7e 100644
--- a/tests/data/test255
+++ b/tests/data/test255
@@ -1,3 +1,4 @@
+<testcase>
 <info>
 <keywords>
 FTP-ipv6
@@ -58,3 +59,4 @@ LIST
 QUIT
 </protocol>
 </verify>
+</testcase>
diff --git a/tests/data/test256 b/tests/data/test256
index 38a38ba08..3bee0dbde 100644
--- a/tests/data/test256
+++ b/tests/data/test256
@@ -1,3 +1,4 @@
+<testcase>
 <info>
 <keywords>
 HTTP
@@ -9,7 +10,7 @@ FAILURE
 </info>
 # Server-side
 <reply>
-<data nocheck=1>
+<data nocheck="1">
 HTTP/1.0 200 Mooo
 Date: Mon, 13 Nov 2000 13:41:09 GMT
 Server: myown/1.0
@@ -61,3 +62,4 @@ This text is here to simulate a partly downloaded file to resume
 download on.
 </file>
 </verify>
+</testcase>
diff --git a/tests/data/test257 b/tests/data/test257
index 90680f395..1020c613e 100644
--- a/tests/data/test257
+++ b/tests/data/test257
@@ -1,3 +1,4 @@
+<testcase>
 <info>
 <keywords>
 HTTP
@@ -111,3 +112,4 @@ Proxy-Connection: Keep-Alive
 
 </protocol>
 </verify>
+</testcase>
diff --git a/tests/data/test258 b/tests/data/test258
index 947f0e0cd..1a839d8a2 100644
--- a/tests/data/test258
+++ b/tests/data/test258
@@ -1,3 +1,4 @@
+<testcase>
 <info>
 <keywords>
 HTTP
@@ -127,3 +128,4 @@ bar
 ------------------------------7c633d5c27ce--
 </protocol>
 </verify>
+</testcase>
diff --git a/tests/data/test259 b/tests/data/test259
index 84017407d..9d8627245 100644
--- a/tests/data/test259
+++ b/tests/data/test259
@@ -1,3 +1,4 @@
+<testcase>
 <info>
 <keywords>
 HTTP
@@ -126,3 +127,4 @@ bar
 ------------------------------7c633d5c27ce--
 </protocol>
 </verify>
+</testcase>
diff --git a/tests/data/test26 b/tests/data/test26
index f92cf2326..a7505b5b1 100644
--- a/tests/data/test26
+++ b/tests/data/test26
@@ -1,3 +1,4 @@
+<testcase>
 <info>
 <keywords>
 HTTP
@@ -41,3 +42,4 @@ Accept: */*
 
 </protocol>
 </verify>
+</testcase>
diff --git a/tests/data/test260 b/tests/data/test260
index 930786435..5555366ff 100644
--- a/tests/data/test260
+++ b/tests/data/test260
@@ -1,3 +1,4 @@
+<testcase>
 <info>
 <keywords>
 HTTP
@@ -20,7 +21,7 @@ Connection: close
 Content-Type: text/html
 Funny-head: yesyes
 
-<foo>
+-foo-
 </data>
 </reply>
 
@@ -51,3 +52,4 @@ Accept: */*
 
 </protocol>
 </verify>
+</testcase>
diff --git a/tests/data/test261 b/tests/data/test261
index 419bf9b26..79af663fd 100644
--- a/tests/data/test261
+++ b/tests/data/test261
@@ -1,3 +1,4 @@
+<testcase>
 <info>
 <keywords>
 FTP
@@ -47,3 +48,4 @@ RETR 261
 QUIT
 </protocol>
 </verify>
+</testcase>
diff --git a/tests/data/test262 b/tests/data/test262
index b9b5a61f4..0178a1304 100644
--- a/tests/data/test262
+++ b/tests/data/test262
diff --git a/tests/data/test263 b/tests/data/test263
index 837f2470e..b08585166 100644
--- a/tests/data/test263
+++ b/tests/data/test263
@@ -1,3 +1,4 @@
+<testcase>
 <info>
 <keywords>
 HTTP
@@ -51,3 +52,4 @@ Proxy-Connection: Keep-Alive
 
 </protocol>
 </verify>
+</testcase>
diff --git a/tests/data/test264 b/tests/data/test264
index 55f79b6d2..9648f05f8 100644
--- a/tests/data/test264
+++ b/tests/data/test264
@@ -1,3 +1,4 @@
+<testcase>
 <info>
 <keywords>
 HTTP
@@ -46,3 +47,4 @@ Proxy-Connection: Keep-Alive
 
 </protocol>
 </verify>
+</testcase>
diff --git a/tests/data/test265 b/tests/data/test265
index 5b44b6ff2..649aa04b4 100644
--- a/tests/data/test265
+++ b/tests/data/test265
@@ -1,3 +1,4 @@
+<testcase>
 # Server-side
 <reply>
 
@@ -86,7 +87,7 @@ http://test.remote.server.com:265/path/2650002 --proxy http://%HOSTIP:%HTTPPORT
 <strippart>
 s/^(Proxy-Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAABQAFAHAAAAA).*/$1/
 </strippart>
-<protocol nonewline=yes>
+<protocol nonewline="yes">
 CONNECT test.remote.server.com:265 HTTP/1.0
 Host: test.remote.server.com:265
 Proxy-Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=
@@ -107,3 +108,4 @@ Content-Type: application/x-www-form-urlencoded
 postit
 </protocol>
 </verify>
+</testcase>
diff --git a/tests/data/test266 b/tests/data/test266
index f3c613293..e82b215a8 100644
--- a/tests/data/test266
+++ b/tests/data/test266
@@ -1,3 +1,4 @@
+<testcase>
 <info>
 <keywords>
 HTTP
@@ -74,3 +75,4 @@ chunky-trailer: header data
 </file>
 </verify>
 
+</testcase>
diff --git a/tests/data/test267 b/tests/data/test267
index dc7f8dc23..78676dfbc 100644
--- a/tests/data/test267
+++ b/tests/data/test267
@@ -1,3 +1,4 @@
+<testcase>
 <info>
 <keywords>
 HTTP
@@ -8,10 +9,11 @@ HTTP NTLM auth
 # Server-side
 <reply>
 
-# no <data> in this test since we have NTLM from the start
+<!-- no <data> in this test since we have NTLM from the start
+
+This is supposed to be returned when the server gets a first
+Authorization: NTLM line passed-in from the client -->
 
-# This is supposed to be returned when the server gets a first
-# Authorization: NTLM line passed-in from the client
 <data1001>
 HTTP/1.1 401 Now gimme that second request of crap
 Server: Microsoft-IIS/5.0
@@ -76,7 +78,7 @@ http://%HOSTIP:%HTTPPORT/267 -u testuser:testpass --ntlm -d "data" -H "Header1:
 <strippart>
 s/^(Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAACAAIAHAAAAA).*/$1/
 </strippart>
-<protocol nonewline=yes>
+<protocol nonewline="yes">
 POST /267 HTTP/1.1
 Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=
 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
@@ -100,3 +102,4 @@ Content-Type: application/x-www-form-urlencoded
 data
 </protocol>
 </verify>
+</testcase>
diff --git a/tests/data/test268 b/tests/data/test268
index 4b8b6b9d2..e68479377 100644
--- a/tests/data/test268
+++ b/tests/data/test268
@@ -1,3 +1,4 @@
+<testcase>
 <info>
 <keywords>
 HTTP
@@ -53,3 +54,4 @@ Content-Type: application/x-www-form-urlencoded
 
 </protocol>
 </verify>
+</testcase>
diff --git a/tests/data/test269 b/tests/data/test269
index 1fbf90a3c..aa3b8e5de 100644
--- a/tests/data/test269
+++ b/tests/data/test269
@@ -1,3 +1,4 @@
+<testcase>
 <info>
 <keywords>
 HTTP
@@ -49,3 +50,4 @@ Accept: */*
 
 </protocol>
 </verify>
+</testcase>
diff --git a/tests/data/test27 b/tests/data/test27
index 85b087aab..980b07ac6 100644
--- a/tests/data/test27
+++ b/tests/data/test27
@@ -1,3 +1,4 @@
+<testcase>
 <info>
 <keywords>
 HTTP
@@ -52,3 +53,4 @@ Cookie: thewinneris=nowayyouwin
 
 </protocol>
 </verify>
+</testcase>
diff --git a/tests/data/test270 b/tests/data/test270
index 6c47b559e..c6f1ea394 100644
--- a/tests/data/test270
+++ b/tests/data/test270
@@ -1,3 +1,4 @@
+<testcase>
 <info>
 <keywords>
 FTP
@@ -46,3 +47,4 @@ RETR 270
 QUIT
 </protocol>
 </verify>
+</testcase>
diff --git a/tests/data/test271 b/tests/data/test271
index d650f9a31..af5a6c603 100644
--- a/tests/data/test271
+++ b/tests/data/test271
@@ -1,3 +1,4 @@
+<testcase>
 <info>
 <keywords>
 TFTP
@@ -39,3 +40,4 @@ filename: /271
 mode: octet
 </protocol>
 </verify>
+</testcase>
diff --git a/tests/data/test272 b/tests/data/test272
index e8cac9219..d47f50c3c 100644
--- a/tests/data/test272
+++ b/tests/data/test272
@@ -1,3 +1,4 @@
+<testcase>
 <info>
 <keywords>
 FTP
@@ -36,3 +37,4 @@ MDTM 272
 QUIT
 </protocol>
 </verify>
+</testcase>
diff --git a/tests/data/test273 b/tests/data/test273
index 6aabfdcbd..626107951 100644
--- a/tests/data/test273
+++ b/tests/data/test273
@@ -1,3 +1,4 @@
+<testcase>
 <info>
 <keywords>
 HTTP
@@ -76,3 +77,4 @@ Accept: */*
 
 </protocol>
 </verify>
+</testcase>
diff --git a/tests/data/test274 b/tests/data/test274
index 4eac4d5fd..7d010b4ff 100644
--- a/tests/data/test274
+++ b/tests/data/test274
@@ -1,3 +1,4 @@
+<testcase>
 <info>
 <keywords>
 HTTP
@@ -48,3 +49,4 @@ Accept: */*
 47
 </errorcode>
 </verify>
+</testcase>
diff --git a/tests/data/test275 b/tests/data/test275
index fea185018..e07b1a83e 100644
--- a/tests/data/test275
+++ b/tests/data/test275
@@ -1,3 +1,4 @@
+<testcase>
 <info>
 <keywords>
 HTTP
@@ -71,3 +72,4 @@ Accept: */*
 
 </protocol>
 </verify>
+</testcase>
diff --git a/tests/data/test276 b/tests/data/test276
index aa56090f4..b21136713 100644
--- a/tests/data/test276
+++ b/tests/data/test276
@@ -1,3 +1,4 @@
+<testcase>
 <info>
 <keywords>
 HTTP
@@ -72,3 +73,4 @@ Accept: */*
 
 </protocol>
 </verify>
+</testcase>
diff --git a/tests/data/test277 b/tests/data/test277
index f19e3423d..8051e5522 100644
--- a/tests/data/test277
+++ b/tests/data/test277
@@ -1,3 +1,4 @@
+<testcase>
 <info>
 <keywords>
 HTTP
@@ -55,3 +56,4 @@ daniel
 --------------------------------
 </protocol>
 </verify>
+</testcase>
diff --git a/tests/data/test278 b/tests/data/test278
index 795b090ce..5b24df82c 100644
--- a/tests/data/test278
+++ b/tests/data/test278
@@ -1,3 +1,4 @@
+<testcase>
 <info>
 <keywords>
 HTTP
@@ -46,3 +47,4 @@ Proxy-Connection: Keep-Alive
 
 </protocol>
 </verify>
+</testcase>
diff --git a/tests/data/test279 b/tests/data/test279
index 2483e39d2..150c767c8 100644
--- a/tests/data/test279
+++ b/tests/data/test279
@@ -1,3 +1,4 @@
+<testcase>
 <info>
 <keywords>
 HTTP
@@ -46,3 +47,4 @@ Proxy-Connection: Keep-Alive
 
 </protocol>
 </verify>
+</testcase>
diff --git a/tests/data/test28 b/tests/data/test28
index 98d19c59d..43ea09b23 100644
--- a/tests/data/test28
+++ b/tests/data/test28
@@ -1,3 +1,4 @@
+<testcase>
 <info>
 <keywords>
 HTTP
@@ -71,3 +72,4 @@ Accept: */*
 
 </protocol>
 </verify>
+</testcase>
diff --git a/tests/data/test280 b/tests/data/test280
index a354c31c6..3bf2f953f 100644
--- a/tests/data/test280
+++ b/tests/data/test280
@@ -1,3 +1,4 @@
+<testcase>
 <info>
 <keywords>
 FTP
@@ -62,3 +63,4 @@ LIST
 QUIT
 </protocol>
 </verify>
+</testcase>
diff --git a/tests/data/test281 b/tests/data/test281
index f228d2d0b..d399fc05b 100644
--- a/tests/data/test281
+++ b/tests/data/test281
@@ -1,3 +1,4 @@
+<testcase>
 <info>
 <keywords>
 HTTP
@@ -61,3 +62,4 @@ Weird
    upload
 </protocol>
 </verify>
+</testcase>
diff --git a/tests/data/test282 b/tests/data/test282
index b15745b18..557e46144 100644
--- a/tests/data/test282
+++ b/tests/data/test282
@@ -1,3 +1,4 @@
+<testcase>
 <info>
 <keywords>
 HTTP
@@ -41,3 +42,4 @@ Accept: */*
 
 </protocol>
 </verify>
+</testcase>
diff --git a/tests/data/test283 b/tests/data/test283
index 54e86fe80..e470c87fc 100644
--- a/tests/data/test283
+++ b/tests/data/test283
@@ -1,3 +1,4 @@
+<testcase>
 <info>
 <keywords>
 TFTP
@@ -31,3 +32,4 @@ filename: /invalid-file
 mode: octet
 </protocol>
 </verify>
+</testcase>
diff --git a/tests/data/test284 b/tests/data/test284
index f04fef589..0c2a66560 100644
--- a/tests/data/test284
+++ b/tests/data/test284
@@ -1,3 +1,4 @@
+<testcase>
 <info>
 <keywords>
 TFTP
@@ -63,3 +64,4 @@ filename: /284
 mode: octet
 </protocol>
 </verify>
+</testcase>
diff --git a/tests/data/test285 b/tests/data/test285
index 72f0455dd..75a19991d 100644
--- a/tests/data/test285
+++ b/tests/data/test285
@@ -1,3 +1,4 @@
+<testcase>
 <info>
 <keywords>
 TFTP
@@ -40,3 +41,4 @@ filename: /test285.txt
 mode: octet
 </protocol>
 </verify>
+</testcase>
diff --git a/tests/data/test286 b/tests/data/test286
index d78e24f3a..841ee1e2a 100644
--- a/tests/data/test286
+++ b/tests/data/test286
@@ -1,3 +1,4 @@
+<testcase>
 <info>
 <keywords>
 TFTP
@@ -88,3 +89,4 @@ filename: /test286.txt
 mode: octet
 </protocol>
 </verify>
+</testcase>
diff --git a/tests/data/test29 b/tests/data/test29
index 5d18c39ae..640e312fc 100644
--- a/tests/data/test29
+++ b/tests/data/test29
@@ -1,3 +1,4 @@
+<testcase>
 <info>
 <keywords>
 HTTP
@@ -48,3 +49,4 @@ Accept: */*
 28
 </errorcode>
 </verify>
+</testcase>
diff --git a/tests/data/test3 b/tests/data/test3
index 2dc78967e..c1b542eef 100644
--- a/tests/data/test3
+++ b/tests/data/test3
@@ -1,3 +1,4 @@
+<testcase>
 <info>
 <keywords>
 HTTP
@@ -45,7 +46,7 @@ HTTP POST with auth and contents but with content-length set to 0
 <strip>
 ^User-Agent:.*
 </strip>
-<protocol nonewline=yes>
+<protocol nonewline="yes">
 POST /3 HTTP/1.1
 Authorization: Basic ZmFrZTotdXNlcg==
 Host: 127.0.0.1:%HTTPPORT
@@ -56,3 +57,4 @@ Content-Type: application/x-www-form-urlencoded
 fooo=mooo&pooo=clue&doo=%20%20%20++++
 </protocol>
 </verify>
+</testcase>
diff --git a/tests/data/test30 b/tests/data/test30
index efb183640..218dd9657 100644
--- a/tests/data/test30
+++ b/tests/data/test30
@@ -1,3 +1,4 @@
+<testcase>
 <info>
 <keywords>
 HTTP
@@ -39,3 +40,4 @@ Accept: */*
 52
 </errorcode>
 </verify>
+</testcase>
diff --git a/tests/data/test300 b/tests/data/test300
index 1c2d3b12d..0d7896cbf 100644
--- a/tests/data/test300
+++ b/tests/data/test300
@@ -1,3 +1,4 @@
+<testcase>
 #
 # Server-side
 <reply>
@@ -41,3 +42,4 @@ Accept: */*
 
 </protocol>
 </verify>
+</testcase>
diff --git a/tests/data/test301 b/tests/data/test301
index a93559b78..ff38deaec 100644
--- a/tests/data/test301
+++ b/tests/data/test301
@@ -1,3 +1,4 @@
+<testcase>
 #
 # Server-side
 <reply>
@@ -45,3 +46,4 @@ Accept: */*
 [insert full protocol verifiction dump here]
 </data>
 </verify>
+</testcase>
diff --git a/tests/data/test302 b/tests/data/test302
index 2f6e381c8..bb48e9e46 100644
--- a/tests/data/test302
+++ b/tests/data/test302
@@ -1,3 +1,4 @@
+<testcase>
 #
 # Server-side
 <reply>
@@ -36,3 +37,4 @@ HTTPS GET over HTTP proxy fails
 [insert full protocol verifiction dump here]
 </data>
 </verify>
+</testcase>
diff --git a/tests/data/test303 b/tests/data/test303
index bf221f889..191fd5474 100644
--- a/tests/data/test303
+++ b/tests/data/test303
@@ -1,3 +1,4 @@
+<testcase>
 # Server-side
 <reply>
 <data>
@@ -43,3 +44,4 @@ Accept: */*
 28
 </errorcode>
 </verify>
+</testcase>
diff --git a/tests/data/test304 b/tests/data/test304
index 459034c2c..9678e8cb1 100644
--- a/tests/data/test304
+++ b/tests/data/test304
@@ -1,3 +1,4 @@
+<testcase>
 # Server-side
 <reply>
 <data>
@@ -61,3 +62,4 @@ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
 ------------------------------c3b2ef7f0bb8--
 </protocol>
 </verify>
+</testcase>
diff --git a/tests/data/test305 b/tests/data/test305
index 0e01ea2e9..4f77334bb 100644
--- a/tests/data/test305
+++ b/tests/data/test305
@@ -1,3 +1,4 @@
+<testcase>
 # Server-side
 <reply>
 <data>
@@ -31,3 +32,4 @@ https://%HOSTIP:%HTTPSPORT/want/305 --cacert moooo
 77
 </errorcode>
 </verify>
+</testcase>
diff --git a/tests/data/test306 b/tests/data/test306
index c0f3f09e1..c70feda54 100644
--- a/tests/data/test306
+++ b/tests/data/test306
@@ -1,3 +1,4 @@
+<testcase>
 #
 # Server-side
 <reply>
@@ -54,3 +55,4 @@ Accept: */*
 
 </protocol>
 </verify>
+</testcase>
diff --git a/tests/data/test307 b/tests/data/test307
index 5d626d75d..093555cc3 100644
--- a/tests/data/test307
+++ b/tests/data/test307
@@ -1,3 +1,4 @@
+<testcase>
 #
 # Server-side
 <reply>
@@ -45,3 +46,4 @@ Accept: */*
 
 </protocol>
 </verify>
+</testcase>
diff --git a/tests/data/test308 b/tests/data/test308
index 136088b6b..cc7b32296 100644
--- a/tests/data/test308
+++ b/tests/data/test308
@@ -1,3 +1,4 @@
+<testcase>
 #
 # Client-side
 <client>
@@ -22,3 +23,4 @@ simple HTTPS GET with invalid crypto engine
 53
 </errorcode>
 </verify>
+</testcase>
diff --git a/tests/data/test31 b/tests/data/test31
index 744129d20..a9aec7722 100644
--- a/tests/data/test31
+++ b/tests/data/test31
@@ -1,3 +1,4 @@
+<testcase>
 <info>
 <keywords>
 HTTP
@@ -54,7 +55,7 @@ Host: 127.0.0.1:%HTTPPORT
 Accept: */*
 
 </protocol>
-<file name="log/jar31.txt" mode=text>
+<file name="log/jar31.txt" mode="text">
 # Netscape HTTP Cookie File
 # http://curlm.haxx.se/rfc/cookie_spec.html
 # This file was generated by libcurl! Edit at your own risk.
@@ -64,3 +65,4 @@ Accept: */*
 127.0.0.1	FALSE	/we/want/	FALSE	1391255787	nodomain	value
 </file>
 </verify>
+</testcase>
diff --git a/tests/data/test32 b/tests/data/test32
index da0517f0b..6ae563092 100644
--- a/tests/data/test32
+++ b/tests/data/test32
@@ -1,3 +1,4 @@
+<testcase>
 <info>
 <keywords>
 HTTP
@@ -20,7 +21,7 @@ Connection: close
 Content-Type: text/html
 Funny-head: yesyes
 
-<foo>
+-foo-
 </data>
 </reply>
 
@@ -52,3 +53,4 @@ Accept: */*
 
 </protocol>
 </verify>
+</testcase>
diff --git a/tests/data/test33 b/tests/data/test33
index 780c94e04..8037ce809 100644
--- a/tests/data/test33
+++ b/tests/data/test33
@@ -1,3 +1,4 @@
+<testcase>
 <info>
 <keywords>
 HTTP
@@ -60,3 +61,4 @@ Expect: 100-continue
 012345678
 </protocol>
 </verify>
+</testcase>
diff --git a/tests/data/test34 b/tests/data/test34
index a05ba7516..2c73137ba 100644
--- a/tests/data/test34
+++ b/tests/data/test34
@@ -1,3 +1,4 @@
+<testcase>
 <info>
 <keywords>
 HTTP
@@ -62,3 +63,4 @@ Accept: */*
 </protocol>
 </verify>
 
+</testcase>
diff --git a/tests/data/test36 b/tests/data/test36
index 8b50e822a..7219d3d3b 100644
--- a/tests/data/test36
+++ b/tests/data/test36
@@ -1,3 +1,4 @@
+<testcase>
 <info>
 <keywords>
 HTTP
@@ -62,3 +63,4 @@ Accept: */*
 </protocol>
 </verify>
 
+</testcase>
diff --git a/tests/data/test37 b/tests/data/test37
index 6d2afc7d4..60e13be89 100644
--- a/tests/data/test37
+++ b/tests/data/test37
@@ -1,3 +1,4 @@
+<testcase>
 <info>
 <keywords>
 HTTP
@@ -43,3 +44,4 @@ Accept: */*
 </protocol>
 </verify>
 
+</testcase>
diff --git a/tests/data/test38 b/tests/data/test38
index bf8cce8bd..ddc4c31a3 100644
--- a/tests/data/test38
+++ b/tests/data/test38
@@ -1,3 +1,4 @@
+<testcase>
 <info>
 <keywords>
 HTTP
@@ -8,7 +9,7 @@ FAILURE
 </info>
 # Server-side
 <reply>
-<data nocheck=1>
+<data nocheck="1">
 HTTP/1.0 200 Mooo
 Date: Mon, 13 Nov 2000 13:41:09 GMT
 Server: myown/1.0
@@ -57,3 +58,4 @@ This text is here to simulate a partly downloaded file to resume
 download on.
 </file>
 </verify>
+</testcase>
diff --git a/tests/data/test39 b/tests/data/test39
index 862a24385..9a076b0e0 100644
--- a/tests/data/test39
+++ b/tests/data/test39
@@ -1,3 +1,4 @@
+<testcase>
 <info>
 <keywords>
 HTTP
@@ -87,3 +88,4 @@ foo
 ------------------------------24e78000bd32--
 </protocol>
 </verify>
+</testcase>
diff --git a/tests/data/test4 b/tests/data/test4
index 342afadcd..7bdfa0157 100644
--- a/tests/data/test4
+++ b/tests/data/test4
@@ -1,3 +1,4 @@
+<testcase>
 <info>
 <keywords>
 HTTP
@@ -47,3 +48,4 @@ Accept: replaced
 
 </protocol>
 </verify>
+</testcase>
diff --git a/tests/data/test40 b/tests/data/test40
index c3bbe7956..28daa018e 100644
--- a/tests/data/test40
+++ b/tests/data/test40
@@ -1,3 +1,4 @@
+<testcase>
 <info>
 <keywords>
 HTTP
@@ -70,3 +71,4 @@ Accept: */*
 
 </protocol>
 </verify>
+</testcase>
diff --git a/tests/data/test41 b/tests/data/test41
index 025ba4ca9..08eca38c9 100644
--- a/tests/data/test41
+++ b/tests/data/test41
@@ -1,3 +1,4 @@
+<testcase>
 <info>
 <keywords>
 HTTP
@@ -28,3 +29,4 @@ http://%HOSTIP:%HTTPPORT/want/41 -F moo=@boo
 26
 </errorcode>
 </verify>
+</testcase>
diff --git a/tests/data/test42 b/tests/data/test42
index df0edd5dd..5f52bbfbb 100644
--- a/tests/data/test42
+++ b/tests/data/test42
@@ -1,3 +1,4 @@
+<testcase>
 <info>
 <keywords>
 HTTP
@@ -70,3 +71,4 @@ Accept: */*
 
 </protocol>
 </verify>
+</testcase>
diff --git a/tests/data/test43 b/tests/data/test43
index fe6c54e18..8db367491 100644
--- a/tests/data/test43
+++ b/tests/data/test43
@@ -1,3 +1,4 @@
+<testcase>
 <info>
 <keywords>
 HTTP
@@ -77,3 +78,4 @@ Proxy-Connection: Keep-Alive
 
 </protocol>
 </verify>
+</testcase>
diff --git a/tests/data/test44 b/tests/data/test44
index beea1cf6e..2d91d7f66 100644
--- a/tests/data/test44
+++ b/tests/data/test44
@@ -1,3 +1,4 @@
+<testcase>
 <info>
 <keywords>
 HTTP
@@ -68,3 +69,4 @@ bar
 ------------------------------7c633d5c27ce--
 </protocol>
 </verify>
+</testcase>
diff --git a/tests/data/test45 b/tests/data/test45
index b8d96f7e6..7faa1ccaf 100644
--- a/tests/data/test45
+++ b/tests/data/test45
@@ -1,3 +1,4 @@
+<testcase>
 <info>
 <keywords>
 HTTP
@@ -72,3 +73,4 @@ Accept: */*
 
 </protocol>
 </verify>
+</testcase>
diff --git a/tests/data/test46 b/tests/data/test46
index 8ebdcf8fd..563ba0735 100644
--- a/tests/data/test46
+++ b/tests/data/test46
@@ -1,3 +1,4 @@
+<testcase>
 <info>
 <keywords>
 HTTP
@@ -60,7 +61,7 @@ Accept: */*
 Cookie: empty=; mooo=indeed
 
 </protocol>
-<file name="log/jar46" mode=text>
+<file name="log/jar46" mode="text">
 # Netscape HTTP Cookie File
 # http://curlm.haxx.se/rfc/cookie_spec.html
 # This file was generated by libcurl! Edit at your own risk.
@@ -76,3 +77,4 @@ www.loser.com	FALSE	/	FALSE	1139150993	UID	99
 127.0.0.1	FALSE	/want/	FALSE	0	simplyhuge	zzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzz
 </file>
 </verify>
+</testcase>
diff --git a/tests/data/test47 b/tests/data/test47
index 835fcec19..e00b4422a 100644
--- a/tests/data/test47
+++ b/tests/data/test47
@@ -1,3 +1,4 @@
+<testcase>
 <info>
 <keywords>
 HTTP
@@ -13,7 +14,7 @@ HTTP/1.0 200 OK swsclose
 Date: Thu, 09 Nov 2010 14:49:00 GMT
 Server: test-server/fake
 
-<foo> within foo </foo>
+-foo- within foo -!foo-
 </data>
 </reply>
 
@@ -45,3 +46,4 @@ Accept: */*
 </protocol>
 </verify>
 
+</testcase>
diff --git a/tests/data/test48 b/tests/data/test48
index 036f739e9..69d2fd310 100644
--- a/tests/data/test48
+++ b/tests/data/test48
@@ -1,3 +1,4 @@
+<testcase>
 <info>
 <keywords>
 HTTP
@@ -43,3 +44,4 @@ Accept: */*
 
 </protocol>
 </verify>
+</testcase>
diff --git a/tests/data/test49 b/tests/data/test49
index 8822434ef..002e7d176 100644
--- a/tests/data/test49
+++ b/tests/data/test49
@@ -1,3 +1,4 @@
+<testcase>
 <info>
 <keywords>
 HTTP
@@ -70,3 +71,4 @@ Accept: */*
 
 </protocol>
 </verify>
+</testcase>
diff --git a/tests/data/test5 b/tests/data/test5
index db8aec2d0..59c8f47b8 100644
--- a/tests/data/test5
+++ b/tests/data/test5
@@ -1,3 +1,4 @@
+<testcase>
 <info>
 <keywords>
 HTTP
@@ -47,3 +48,4 @@ Proxy-Connection: Keep-Alive
 
 </protocol>
 </verify>
+</testcase>
diff --git a/tests/data/test50 b/tests/data/test50
index e508cc086..8cdd62b3f 100644
--- a/tests/data/test50
+++ b/tests/data/test50
@@ -1,3 +1,4 @@
+<testcase>
 <info>
 <keywords>
 HTTP
@@ -70,3 +71,4 @@ Accept: */*
 
 </protocol>
 </verify>
+</testcase>
diff --git a/tests/data/test500 b/tests/data/test500
index eafd13825..2e53cebfc 100644
--- a/tests/data/test500
+++ b/tests/data/test500
@@ -1,3 +1,4 @@
+<testcase>
 #
 # Server-side
 <reply name="1">
@@ -13,7 +14,7 @@ Connection: close
 Content-Type: text/html
 Funny-head: yesyes
 
-<foo>
+-foo-
 </data>
 </reply>
 
@@ -45,3 +46,4 @@ Accept: */*
 
 </protocol>
 </verify>
+</testcase>
diff --git a/tests/data/test501 b/tests/data/test501
index 3a0334b3b..f8a859157 100644
--- a/tests/data/test501
+++ b/tests/data/test501
@@ -1,3 +1,4 @@
+<testcase>
 #
 # Server-side
 <reply name="1">
@@ -28,3 +29,4 @@ http://%HOSTIP:%HTTPPORT/501
 3
 </errorcode>
 </verify>
+</testcase>
diff --git a/tests/data/test502 b/tests/data/test502
index 4ef6e5d9c..99dc2f029 100644
--- a/tests/data/test502
+++ b/tests/data/test502
@@ -1,3 +1,4 @@
+<testcase>
 #
 # Server-side
 <reply>
@@ -38,3 +39,4 @@ moo
 # Verify data after the test has been "shot"
 <verify>
 </verify>
+</testcase>
diff --git a/tests/data/test503 b/tests/data/test503
index 5fd45be41..730f5b778 100644
--- a/tests/data/test503
+++ b/tests/data/test503
@@ -1,3 +1,4 @@
+<testcase>
 # Server-side
 <reply>
 <data>
@@ -60,3 +61,4 @@ Accept: */*
 
 </protocol>
 </verify>
+</testcase>
diff --git a/tests/data/test504 b/tests/data/test504
index 32cff5f71..488fb5c77 100644
--- a/tests/data/test504
+++ b/tests/data/test504
@@ -1,3 +1,4 @@
+<testcase>
 # Server-side
 <reply>
 </reply>
@@ -26,3 +27,4 @@ http://%HOSTIP:%HTTPSPORT/504 127.0.0.1:55555
 100
 </errorcode>
 </verify>
+</testcase>
diff --git a/tests/data/test505 b/tests/data/test505
index 84cb00910..fa2ea20ca 100644
--- a/tests/data/test505
+++ b/tests/data/test505
@@ -1,3 +1,4 @@
+<testcase>
 # Server-side
 <reply>
 </reply>
@@ -56,3 +57,4 @@ RNTO 505-forreal
 QUIT
 </protocol>
 </verify>
+</testcase>
diff --git a/tests/data/test506 b/tests/data/test506
index 5f0597f75..8b3aeedf6 100644
--- a/tests/data/test506
+++ b/tests/data/test506
@@ -1,3 +1,4 @@
+<testcase>
 # Server-side
 <reply>
 <data1>
@@ -160,3 +161,4 @@ http://%HOSTIP:%HTTPPORT/506
 .host.foo.com	TRUE	/	FALSE	1170330987	test5	five
 </file>
 </verify>
+</testcase>
diff --git a/tests/data/test507 b/tests/data/test507
index 59266dfbb..bd4bada99 100644
--- a/tests/data/test507
+++ b/tests/data/test507
@@ -1,3 +1,4 @@
+<testcase>
 # Server-side
 <reply>
 </reply>
@@ -24,3 +25,4 @@ http://doesnotexist.foo./
 6
 </errorcode>
 </verify>
+</testcase>
diff --git a/tests/data/test508 b/tests/data/test508
index 9ebbaa92a..8f3662b0c 100644
--- a/tests/data/test508
+++ b/tests/data/test508
@@ -1,3 +1,4 @@
+<testcase>
 #
 # Server-side
 <reply>
@@ -43,3 +44,4 @@ Content-Type: application/x-www-form-urlencoded
 this is what we post to the silly web server
 </protocol>
 </verify>
+</testcase>
diff --git a/tests/data/test509 b/tests/data/test509
index 0bf6d3da0..bba2d86da 100644
--- a/tests/data/test509
+++ b/tests/data/test509
@@ -1,3 +1,4 @@
+<testcase>
 #
 # Server-side
 <reply>
@@ -53,3 +54,4 @@ Accept: */*
 disable
 </valgrind>
 </verify>
+</testcase>
diff --git a/tests/data/test51 b/tests/data/test51
index 73774f488..9fbe4cae2 100644
--- a/tests/data/test51
+++ b/tests/data/test51
@@ -1,3 +1,4 @@
+<testcase>
 <info>
 <keywords>
 HTTP
@@ -70,3 +71,4 @@ Accept: */*
 
 </protocol>
 </verify>
+</testcase>
diff --git a/tests/data/test510 b/tests/data/test510
index 1c883f18d..587f53098 100644
--- a/tests/data/test510
+++ b/tests/data/test510
@@ -1,3 +1,4 @@
+<testcase>
 #
 # Server-side
 <reply>
@@ -52,3 +53,4 @@ and a final longer crap: four
 
 </protocol>
 </verify>
+</testcase>
diff --git a/tests/data/test511 b/tests/data/test511
index 4bcd1a980..65f9f1c67 100644
--- a/tests/data/test511
+++ b/tests/data/test511
@@ -1,3 +1,4 @@
+<testcase>
 #
 # Server-side
 <reply>
@@ -40,3 +41,4 @@ MDTM 511
 QUIT
 </protocol>
 </verify>
+</testcase>
diff --git a/tests/data/test512 b/tests/data/test512
index 1df968b36..5fe8fe05f 100644
--- a/tests/data/test512
+++ b/tests/data/test512
@@ -1,7 +1,8 @@
+<testcase>
 #
 # Server-side
 <reply>
-<data mode=text>
+<data mode="text">
 HTTP/1.1 200 OK swsclose
 Date: Thu, 09 Nov 2010 14:49:00 GMT
 Server: yes
@@ -42,3 +43,4 @@ Accept: */*
 
 </protocol>
 </verify>
+</testcase>
diff --git a/tests/data/test513 b/tests/data/test513
index 44063bc18..2d4e3b0d7 100644
--- a/tests/data/test513
+++ b/tests/data/test513
@@ -1,3 +1,4 @@
+<testcase>
 #
 # Server-side
 <reply>
@@ -37,3 +38,4 @@ Content-Type: application/x-www-form-urlencoded
 42
 </errorcode>
 </verify>
+</testcase>
diff --git a/tests/data/test514 b/tests/data/test514
index 5db18b356..c61a4a6da 100644
--- a/tests/data/test514
+++ b/tests/data/test514
@@ -1,3 +1,4 @@
+<testcase>
 #
 # Server-side
 <reply>
@@ -46,3 +47,4 @@ Accept: */*
 
 </protocol>
 </verify>
+</testcase>
diff --git a/tests/data/test515 b/tests/data/test515
index c2dd48fe8..9de0ac2b9 100644
--- a/tests/data/test515
+++ b/tests/data/test515
@@ -1,3 +1,4 @@
+<testcase>
 #
 # Server-side
 <reply>
@@ -44,3 +45,4 @@ Content-Type: application/x-www-form-urlencoded
 
 </protocol>
 </verify>
+</testcase>
diff --git a/tests/data/test516 b/tests/data/test516
index 3a8210f22..22c39dc5e 100644
--- a/tests/data/test516
+++ b/tests/data/test516
@@ -1,3 +1,4 @@
+<testcase>
 #
 # Server-side
 <reply>
@@ -43,3 +44,4 @@ Content-Length: 0
 
 </protocol>
 </verify>
+</testcase>
diff --git a/tests/data/test517 b/tests/data/test517
index 3254855d9..8673139ce 100644
--- a/tests/data/test517
+++ b/tests/data/test517
@@ -1,3 +1,4 @@
+<testcase>
 #
 # Server-side
 <reply>
@@ -24,7 +25,7 @@ nothing
 #
 # Verify data after the test has been "shot"
 <verify>
-<stdout mode=text>
+<stdout mode="text">
 0: Sun, 06 Nov 1994 08:49:37 GMT => 784111777
 1: Sunday, 06-Nov-94 08:49:37 GMT => 784111777
 2: Sun Nov  6 08:49:37 1994 => 784111777
@@ -57,3 +58,4 @@ nothing
 # for this kind of things.
 
 </verify>
+</testcase>
diff --git a/tests/data/test518 b/tests/data/test518
index d050d073f..86c62cb58 100644
--- a/tests/data/test518
+++ b/tests/data/test518
@@ -1,3 +1,4 @@
+<testcase>
 #
 # Server-side
 <reply>
@@ -13,7 +14,7 @@ Connection: close
 Content-Type: text/html
 Funny-head: yesyes
 
-<foo>
+-foo-
 </data>
 </reply>
 
@@ -53,3 +54,4 @@ Accept: */*
 
 </protocol>
 </verify>
+</testcase>
diff --git a/tests/data/test519 b/tests/data/test519
index e86acabd2..c6bc8615b 100644
--- a/tests/data/test519
+++ b/tests/data/test519
@@ -1,3 +1,4 @@
+<testcase>
 #
 # Server-side
 <reply>
@@ -67,3 +68,4 @@ Accept: */*
 
 </protocol>
 </verify>
+</testcase>
diff --git a/tests/data/test52 b/tests/data/test52
index ae78473cd..d316331e9 100644
--- a/tests/data/test52
+++ b/tests/data/test52
@@ -1,3 +1,4 @@
+<testcase>
 <info>
 <keywords>
 HTTP
@@ -70,3 +71,4 @@ Accept: */*
 
 </protocol>
 </verify>
+</testcase>
diff --git a/tests/data/test520 b/tests/data/test520
index b12f47cc2..fe942bad4 100644
--- a/tests/data/test520
+++ b/tests/data/test520
@@ -1,3 +1,4 @@
+<testcase>
 #
 # Server-side
 <reply>
@@ -43,3 +44,4 @@ RETR 520
 QUIT
 </protocol>
 </verify>
+</testcase>
diff --git a/tests/data/test521 b/tests/data/test521
index 747037c85..012ea18a9 100644
--- a/tests/data/test521
+++ b/tests/data/test521
@@ -1,3 +1,4 @@
+<testcase>
 <info>
 <keywords>
 FTP
@@ -59,3 +60,4 @@ LIST
 QUIT
 </protocol>
 </verify>
+</testcase>
diff --git a/tests/data/test522 b/tests/data/test522
index 753526c84..eb56dc3fa 100644
--- a/tests/data/test522
+++ b/tests/data/test522
@@ -1,3 +1,4 @@
+<testcase>
 <info>
 <keywords>
 HTTP
@@ -9,7 +10,7 @@ CURLOPT_PORT
 #
 # Server-side
 <reply>
-<data nocheck=1>
+<data nocheck="1">
 HTTP/1.1 200 OK
 Date: Thu, 09 Nov 2010 14:49:00 GMT
 Server: test-server/fake
@@ -56,3 +57,4 @@ Accept: */*
 hello
 </stdout>
 </verify>
+</testcase>
diff --git a/tests/data/test523 b/tests/data/test523
index e86f3a5b2..0459d2caf 100644
--- a/tests/data/test523
+++ b/tests/data/test523
@@ -1,3 +1,4 @@
+<testcase>
 <info>
 <keywords>
 HTTP
@@ -10,7 +11,7 @@ CURLOPT_PROXY
 #
 # Server-side
 <reply>
-<data nocheck=1>
+<data nocheck="1">
 HTTP/1.1 200 OK swsclose
 Date: Thu, 09 Nov 2010 14:49:00 GMT
 Server: test-server/fake
@@ -56,7 +57,8 @@ Accept: */*
 Proxy-Connection: Keep-Alive
 
 </protocol>
-<stdout mode=text>
+<stdout mode="text">
 hello
 </stdout>
 </verify>
+</testcase>
diff --git a/tests/data/test524 b/tests/data/test524
index 36946667c..98805f4f7 100644
--- a/tests/data/test524
+++ b/tests/data/test524
@@ -1,3 +1,4 @@
+<testcase>
 <info>
 <keywords>
 FTP
@@ -42,3 +43,4 @@ PWD
 3
 </errorcode>
 </verify>
+</testcase>
diff --git a/tests/data/test525 b/tests/data/test525
index d26490e7c..0e3353d7b 100644
--- a/tests/data/test525
+++ b/tests/data/test525
@@ -1,3 +1,4 @@
+<testcase>
 <info>
 <keywords>
 FTP
@@ -53,3 +54,4 @@ Moooooooooooo
  upload this
 </upload>
 </verify>
+</testcase>
diff --git a/tests/data/test526 b/tests/data/test526
index 29d995983..5d45b5c20 100644
--- a/tests/data/test526
+++ b/tests/data/test526
@@ -1,3 +1,4 @@
+<testcase>
 <info>
 <keywords>
 FTP
@@ -59,3 +60,4 @@ RETR 526
 QUIT
 </protocol>
 </verify>
+</testcase>
diff --git a/tests/data/test527 b/tests/data/test527
index f00a5c69f..2a6df836a 100644
--- a/tests/data/test527
+++ b/tests/data/test527
@@ -1,3 +1,4 @@
+<testcase>
 <info>
 <keywords>
 FTP
@@ -59,3 +60,4 @@ RETR 527
 QUIT
 </protocol>
 </verify>
+</testcase>
diff --git a/tests/data/test528 b/tests/data/test528
index 2bfdc20ce..1079491d1 100644
--- a/tests/data/test528
+++ b/tests/data/test528
@@ -1,3 +1,4 @@
+<testcase>
 <info>
 <keywords>
 HTTP
@@ -60,3 +61,4 @@ Accept: */*
 
 </protocol>
 </verify>
+</testcase>
diff --git a/tests/data/test529 b/tests/data/test529
index d5c657d30..36643ff95 100644
--- a/tests/data/test529
+++ b/tests/data/test529
@@ -1,3 +1,4 @@
+<testcase>
 <info>
 <keywords>
 FTP
@@ -53,3 +54,4 @@ Moooooooooooo
  upload this
 </upload>
 </verify>
+</testcase>
diff --git a/tests/data/test53 b/tests/data/test53
index c653c355b..4c79c6cf4 100644
--- a/tests/data/test53
+++ b/tests/data/test53
@@ -1,3 +1,4 @@
+<testcase>
 <info>
 <keywords>
 HTTP
@@ -50,3 +51,4 @@ Cookie: mooo=indeed
 
 </protocol>
 </verify>
+</testcase>
diff --git a/tests/data/test530 b/tests/data/test530
index 671efd85c..5586d6e91 100644
--- a/tests/data/test530
+++ b/tests/data/test530
@@ -1,3 +1,4 @@
+<testcase>
 <info>
 <keywords>
 HTTP
@@ -76,3 +77,4 @@ Accept: */*
 
 </protocol>
 </verify>
+</testcase>
diff --git a/tests/data/test531 b/tests/data/test531
index 0909e812a..8e577c981 100644
--- a/tests/data/test531
+++ b/tests/data/test531
@@ -1,3 +1,4 @@
+<testcase>
 <info>
 <keywords>
 FTP
@@ -53,3 +54,4 @@ QUIT
 </protocol>
 
 </verify>
+</testcase>
diff --git a/tests/data/test532 b/tests/data/test532
index 5421f81a7..5a509ef3d 100644
--- a/tests/data/test532
+++ b/tests/data/test532
@@ -1,3 +1,4 @@
+<testcase>
 <info>
 <keywords>
 FTP
@@ -59,3 +60,4 @@ RETR 532
 QUIT
 </protocol>
 </verify>
+</testcase>
diff --git a/tests/data/test533 b/tests/data/test533
index 578daf8ce..58db1950f 100644
--- a/tests/data/test533
+++ b/tests/data/test533
@@ -1,3 +1,4 @@
+<testcase>
 <info>
 <keywords>
 FTP
@@ -51,3 +52,4 @@ RETR 533
 QUIT
 </protocol>
 </verify>
+</testcase>
diff --git a/tests/data/test534 b/tests/data/test534
index 5676b77e4..19755377c 100644
--- a/tests/data/test534
+++ b/tests/data/test534
@@ -1,3 +1,4 @@
+<testcase>
 <info>
 <keywords>
 FTP
@@ -48,3 +49,4 @@ RETR 534
 QUIT
 </protocol>
 </verify>
+</testcase>
diff --git a/tests/data/test535 b/tests/data/test535
index ea43a1ab6..adfc9e173 100644
--- a/tests/data/test535
+++ b/tests/data/test535
@@ -1,3 +1,4 @@
+<testcase>
 <reply>
 <data mode="text">
 HTTP/1.1 404 Badness
@@ -57,3 +58,4 @@ Accept: */*
 
 </protocol>
 </verify>
+</testcase>
diff --git a/tests/data/test536 b/tests/data/test536
index eeadf0d77..f1ed5e349 100644
--- a/tests/data/test536
+++ b/tests/data/test536
@@ -1,3 +1,4 @@
+<testcase>
 <reply>
 <data mode="text">
 HTTP/1.1 404 Badness
@@ -61,3 +62,4 @@ Accept: */*
 
 </protocol>
 </verify>
+</testcase>
diff --git a/tests/data/test537 b/tests/data/test537
index 85f07327b..d00b4c05d 100644
--- a/tests/data/test537
+++ b/tests/data/test537
@@ -1,3 +1,4 @@
+<testcase>
 #
 # Server-side
 <reply>
@@ -13,7 +14,7 @@ Connection: close
 Content-Type: text/html
 Funny-head: yesyes
 
-<foo>
+-foo-
 </data>
 </reply>
 
@@ -53,3 +54,4 @@ Accept: */*
 
 </protocol>
 </verify>
+</testcase>
diff --git a/tests/data/test538 b/tests/data/test538
index 6ad2aac13..24d960325 100644
--- a/tests/data/test538
+++ b/tests/data/test538
@@ -1,3 +1,4 @@
+<testcase>
 <info>
 <keywords>
 FTP
@@ -40,3 +41,4 @@ USER anonymous
 PASS curl_by_daniel@haxx.se
 </protocol>
 </verify>
+</testcase>
diff --git a/tests/data/test54 b/tests/data/test54
index 0d5747eb6..8c42df70a 100644
--- a/tests/data/test54
+++ b/tests/data/test54
@@ -1,3 +1,4 @@
+<testcase>
 <info>
 <keywords>
 HTTP
@@ -41,3 +42,4 @@ Accept: */*
 
 </protocol>
 </verify>
+</testcase>
diff --git a/tests/data/test55 b/tests/data/test55
index c4a6e4c9b..53108de10 100644
--- a/tests/data/test55
+++ b/tests/data/test55
@@ -1,3 +1,4 @@
+<testcase>
 <info>
 <keywords>
 HTTP
@@ -62,3 +63,4 @@ Accept: */*
 
 </protocol>
 </verify>
+</testcase>
diff --git a/tests/data/test56 b/tests/data/test56
index d84b86ddc..43cd3bf08 100644
--- a/tests/data/test56
+++ b/tests/data/test56
@@ -1,3 +1,4 @@
+<testcase>
 <info>
 <keywords>
 HTTP
@@ -58,3 +59,4 @@ we post this
 
 </protocol>
 </verify>
+</testcase>
diff --git a/tests/data/test57 b/tests/data/test57
index 5c63d8c54..6676ec568 100644
--- a/tests/data/test57
+++ b/tests/data/test57
@@ -1,3 +1,4 @@
+<testcase>
 <info>
 <keywords>
 HTTP
@@ -7,7 +8,7 @@ HTTP GET
 </info>
 # Server-side
 <reply>
-<data nocheck=1>
+<data nocheck="1">
 HTTP/1.1 200 OK swsclose
 Funny-head: yesyes
 Content-Type: text/html; charset=ISO-8859-4   
@@ -30,7 +31,7 @@ HTTP content-type with spaces in
 
 # Verify data after the test has been "shot"
 <verify>
-<stdout mode=text>
+<stdout mode="text">
 text/html; charset=ISO-8859-4
 </stdout>
 <strip>
@@ -43,3 +44,4 @@ Accept: */*
 
 </protocol>
 </verify>
+</testcase>
diff --git a/tests/data/test58 b/tests/data/test58
index 32d773192..97c74fa4a 100644
--- a/tests/data/test58
+++ b/tests/data/test58
@@ -1,3 +1,4 @@
+<testcase>
 <info>
 <keywords>
 HTTP
@@ -47,3 +48,4 @@ Expect: 100-continue
 a few bytes
 </protocol>
 </verify>
+</testcase>
diff --git a/tests/data/test59 b/tests/data/test59
index 7ea59af86..87a8af94e 100644
--- a/tests/data/test59
+++ b/tests/data/test59
@@ -1,3 +1,4 @@
+<testcase>
 <info>
 <keywords>
 HTTP
@@ -43,3 +44,4 @@ Accept: */*
 
 </protocol>
 </verify>
+</testcase>
diff --git a/tests/data/test6 b/tests/data/test6
index f7f1a4f0d..5c0de9eed 100644
--- a/tests/data/test6
+++ b/tests/data/test6
@@ -1,3 +1,4 @@
+<testcase>
 <info>
 <keywords>
 HTTP
@@ -44,3 +45,4 @@ Cookie: name=contents;name2=content2
 
 </protocol>
 </verify>
+</testcase>
diff --git a/tests/data/test60 b/tests/data/test60
index c4d6c4fb4..be6dccf83 100644
--- a/tests/data/test60
+++ b/tests/data/test60
@@ -1,3 +1,4 @@
+<testcase>
 <info>
 <keywords>
 HTTP
@@ -52,3 +53,4 @@ more than one byte
 
 </protocol>
 </verify>
+</testcase>
diff --git a/tests/data/test61 b/tests/data/test61
index 59c5eb271..5ccd7724d 100644
--- a/tests/data/test61
+++ b/tests/data/test61
@@ -1,3 +1,4 @@
+<testcase>
 <info>
 <keywords>
 HTTP
@@ -50,7 +51,7 @@ Accept: */*
 Host: www.host.foo.com
 
 </protocol>
-<file name="log/jar61.txt" mode=text>
+<file name="log/jar61.txt" mode="text">
 # Netscape HTTP Cookie File
 # http://curlm.haxx.se/rfc/cookie_spec.html
 # This file was generated by libcurl! Edit at your own risk.
@@ -60,3 +61,4 @@ Host: www.host.foo.com
 .foo.com	TRUE	/moo	TRUE	0	test3	maybe
 </file>
 </verify>
+</testcase>
diff --git a/tests/data/test62 b/tests/data/test62
index fd08f7e5f..a2f9ec511 100644
--- a/tests/data/test62
+++ b/tests/data/test62
@@ -1,3 +1,4 @@
+<testcase>
 <info>
 <keywords>
 HTTP
@@ -53,3 +54,4 @@ Host: www.host.foo.com
 
 </protocol>
 </verify>
+</testcase>
diff --git a/tests/data/test63 b/tests/data/test63
index 179b9e6b8..667fc104b 100644
--- a/tests/data/test63
+++ b/tests/data/test63
@@ -1,3 +1,4 @@
+<testcase>
 <info>
 <keywords>
 HTTP
@@ -49,3 +50,4 @@ Proxy-Connection: Keep-Alive
 
 </protocol>
 </verify>
+</testcase>
diff --git a/tests/data/test64 b/tests/data/test64
index e2ba87dcd..4add34789 100644
--- a/tests/data/test64
+++ b/tests/data/test64
@@ -1,3 +1,4 @@
+<testcase>
 <info>
 <keywords>
 HTTP
@@ -76,3 +77,4 @@ Accept: */*
 
 </protocol>
 </verify>
+</testcase>
diff --git a/tests/data/test65 b/tests/data/test65
index ab519f916..097c58afd 100644
--- a/tests/data/test65
+++ b/tests/data/test65
@@ -1,3 +1,4 @@
+<testcase>
 <info>
 <keywords>
 HTTP
@@ -76,3 +77,4 @@ Accept: */*
 
 </protocol>
 </verify>
+</testcase>
diff --git a/tests/data/test66 b/tests/data/test66
index a67cf6386..e088d64dd 100644
--- a/tests/data/test66
+++ b/tests/data/test66
@@ -1,3 +1,4 @@
+<testcase>
 <info>
 <keywords>
 HTTP
@@ -37,3 +38,4 @@ Accept: */*
 
 </protocol>
 </verify>
+</testcase>
diff --git a/tests/data/test67 b/tests/data/test67
index 16a634d67..e2d30da04 100644
--- a/tests/data/test67
+++ b/tests/data/test67
@@ -1,3 +1,4 @@
+<testcase>
 <info>
 <keywords>
 HTTP
@@ -8,10 +9,11 @@ HTTP NTLM auth
 # Server-side
 <reply>
 
-# no <data> in this test since we have NTLM from the start
+<!-- no <data> in this test since we have NTLM from the start
+
+This is supposed to be returned when the server gets a first
+Authorization: NTLM line passed-in from the client -->
 
-# This is supposed to be returned when the server gets a first
-# Authorization: NTLM line passed-in from the client
 <data1001>
 HTTP/1.1 401 Now gimme that second request of crap
 Server: Microsoft-IIS/5.0
@@ -91,3 +93,4 @@ Accept: */*
 
 </protocol>
 </verify>
+</testcase>
diff --git a/tests/data/test68 b/tests/data/test68
index 7367061f5..85586ff54 100644
--- a/tests/data/test68
+++ b/tests/data/test68
@@ -1,3 +1,4 @@
+<testcase>
 <info>
 <keywords>
 HTTP
@@ -91,3 +92,4 @@ Accept: */*
 
 </protocol>
 </verify>
+</testcase>
diff --git a/tests/data/test69 b/tests/data/test69
index 573bdfbb0..e773f7043 100644
--- a/tests/data/test69
+++ b/tests/data/test69
@@ -1,3 +1,4 @@
+<testcase>
 <info>
 <keywords>
 HTTP
@@ -113,3 +114,4 @@ Accept: */*
 
 </protocol>
 </verify>
+</testcase>
diff --git a/tests/data/test7 b/tests/data/test7
index cf15ff484..b90cc721c 100644
--- a/tests/data/test7
+++ b/tests/data/test7
@@ -1,3 +1,4 @@
+<testcase>
 <info>
 <keywords>
 HTTP
@@ -56,3 +57,4 @@ Set-Cookie: partmatch=present; domain=.0.0.1; path=/;
 
 </file>
 </verify>
+</testcase>
diff --git a/tests/data/test70 b/tests/data/test70
index 0c904ef7e..f91a3c059 100644
--- a/tests/data/test70
+++ b/tests/data/test70
@@ -1,3 +1,4 @@
+<testcase>
 <info>
 <keywords>
 HTTP
@@ -83,3 +84,4 @@ Accept: */*
 
 </protocol>
 </verify>
+</testcase>
diff --git a/tests/data/test71 b/tests/data/test71
index baedaab89..7a938095c 100644
--- a/tests/data/test71
+++ b/tests/data/test71
@@ -1,3 +1,4 @@
+<testcase>
 <info>
 <keywords>
 HTTP
@@ -74,3 +75,4 @@ bar
 ------------------------------9ef8d6205763--
 </protocol>
 </verify>
+</testcase>
diff --git a/tests/data/test72 b/tests/data/test72
index 465c61199..77f2b2285 100644
--- a/tests/data/test72
+++ b/tests/data/test72
@@ -1,3 +1,4 @@
+<testcase>
 <info>
 <keywords>
 HTTP
@@ -79,3 +80,4 @@ Accept: */*
 
 </protocol>
 </verify>
+</testcase>
diff --git a/tests/data/test73 b/tests/data/test73
index 6e612eec6..5941c7254 100644
--- a/tests/data/test73
+++ b/tests/data/test73
@@ -1,3 +1,4 @@
+<testcase>
 <info>
 <keywords>
 HTTP
@@ -42,7 +43,7 @@ Accept: */*
 Host: host.NOT_DISCLOSED.se
 
 </protocol>
-<file name="log/jar73.txt" mode=text>
+<file name="log/jar73.txt" mode="text">
 # Netscape HTTP Cookie File
 # http://curlm.haxx.se/rfc/cookie_spec.html
 # This file was generated by libcurl! Edit at your own risk.
@@ -50,3 +51,4 @@ Host: host.NOT_DISCLOSED.se
 .NOT_DISCLOSED.se	TRUE	/	FALSE	0	IPCZQX01af0fca5c	000010008168c200d25dfc4b
 </file>
 </verify>
+</testcase>
diff --git a/tests/data/test74 b/tests/data/test74
index 6a0793d7c..7cb582de8 100644
--- a/tests/data/test74
+++ b/tests/data/test74
@@ -1,3 +1,4 @@
+<testcase>
 <info>
 <keywords>
 HTTP
@@ -8,7 +9,7 @@ HTTP GET
 #
 # Server-side
 <reply>
-<data nocheck=1>
+<data nocheck="1">
 HTTP/1.1 200 OK
 Date: Thu, 09 Nov 2010 14:49:00 GMT
 Server: test-server/fake
@@ -19,7 +20,7 @@ Content-Length: 6
 Content-Type: text/html
 Funny-head: yesyes
 
-<foo>
+-foo-
 </data>
 <data1>
 HTTP/1.0 200 OK
@@ -40,7 +41,7 @@ http
  <name>
 HTTP, urlglob {}-retrieval and -o #[num] usage
  </name>
- <command option=no-output>
+ <command option="no-output">
 "http://%HOSTIP:%HTTPPORT/{74,740001}" -o "log/dumpit#1.dump"
 </command>
 </client>
@@ -70,3 +71,4 @@ Connection: close
 crap data
 </file>
 </verify>
+</testcase>
diff --git a/tests/data/test75 b/tests/data/test75
index 6aeaf14c4..25440f513 100644
--- a/tests/data/test75
+++ b/tests/data/test75
@@ -1,3 +1,4 @@
+<testcase>
 <info>
 <keywords>
 HTTP
@@ -19,7 +20,7 @@ none
  <name>
 HTTP, urlglob retrieval with bad range
  </name>
- <command option=no-output>
+ <command option="no-output">
 "http://%HOSTIP:%HTTPPORT/[1-1]" -o "log/weee#1.dump" --stderr -
 </command>
 </client>
@@ -33,8 +34,9 @@ HTTP, urlglob retrieval with bad range
 <errorcode>
 3
 </errorcode>
-<stdout mode=text>
+<stdout mode="text">
 curl: (3) [globbing] error: bad range specification after pos 24
 
 </stdout>
 </verify>
+</testcase>
diff --git a/tests/data/test76 b/tests/data/test76
index d6b18ad7c..d4094038b 100644
--- a/tests/data/test76
+++ b/tests/data/test76
@@ -1,3 +1,4 @@
+<testcase>
 <info>
 <keywords>
 FAILURE
@@ -17,7 +18,7 @@ none
  <name>
 HTTP, -O with no file name part in the URL
  </name>
- <command option=no-output>
+ <command option="no-output">
 http://%HOSTIP:%HTTPPORT/76/ -O
 </command>
 </client>
@@ -32,3 +33,4 @@ http://%HOSTIP:%HTTPPORT/76/ -O
 23
 </errorcode>
 </verify>
+</testcase>
diff --git a/tests/data/test77 b/tests/data/test77
index 369120ceb..3a9d2a742 100644
--- a/tests/data/test77
+++ b/tests/data/test77
@@ -1,3 +1,4 @@
+<testcase>
 <info>
 <keywords>
 HTTP
@@ -19,7 +20,7 @@ Content-Length: 6
 Connection: close
 Content-Type: text/html
 
-<foo>
+-foo-
 </data>
 </reply>
 
@@ -51,3 +52,4 @@ If-Modified-Since: Sun, 12 Dec 1999 12:00:00 GMT
 
 </protocol>
 </verify>
+</testcase>
diff --git a/tests/data/test78 b/tests/data/test78
index a3b2d5b6e..9192f5f6a 100644
--- a/tests/data/test78
+++ b/tests/data/test78
@@ -1,3 +1,4 @@
+<testcase>
 <info>
 <keywords>
 HTTP
@@ -19,7 +20,7 @@ Connection: close
 Content-Type: text/html
 Funny-head: yesyes
 
-<foo>
+-foo-
 </data>
 <datacheck>
 HTTP/1.1 200 OK
@@ -63,3 +64,4 @@ If-Modified-Since: Sun, 12 Dec 1999 11:00:00 GMT
 
 </protocol>
 </verify>
+</testcase>
diff --git a/tests/data/test79 b/tests/data/test79
index 8954360f0..382eddde7 100644
--- a/tests/data/test79
+++ b/tests/data/test79
@@ -1,3 +1,4 @@
+<testcase>
 <info>
 <keywords>
 FTP
@@ -49,3 +50,4 @@ Proxy-Connection: Keep-Alive
 
 </protocol>
 </verify>
+</testcase>
diff --git a/tests/data/test8 b/tests/data/test8
index 50c5d4f2b..1dfbfb992 100644
--- a/tests/data/test8
+++ b/tests/data/test8
@@ -1,3 +1,4 @@
+<testcase>
 <info>
 <keywords>
 HTTP
@@ -56,3 +57,4 @@ Cookie: cookie=yes; partmatch=present; foobar=name
 
 </protocol>
 </verify>
+</testcase>
diff --git a/tests/data/test80 b/tests/data/test80
index 41656810b..558afdff3 100644
--- a/tests/data/test80
+++ b/tests/data/test80
@@ -1,3 +1,4 @@
+<testcase>
 <info>
 <keywords>
 HTTP
@@ -69,3 +70,4 @@ Accept: */*
 
 </protocol>
 </verify>
+</testcase>
diff --git a/tests/data/test81 b/tests/data/test81
index 95ca2191e..5689df807 100644
--- a/tests/data/test81
+++ b/tests/data/test81
@@ -1,3 +1,4 @@
+<testcase>
 <info>
 <keywords>
 HTTP
@@ -93,3 +94,4 @@ Proxy-Connection: Keep-Alive
 
 </protocol>
 </verify>
+</testcase>
diff --git a/tests/data/test82 b/tests/data/test82
index 3bfae9fc2..7d760faed 100644
--- a/tests/data/test82
+++ b/tests/data/test82
@@ -1,3 +1,4 @@
+<testcase>
 <info>
 <keywords>
 HTTP
@@ -52,3 +53,4 @@ Proxy-Connection: Keep-Alive
 
 </protocol>
 </verify>
+</testcase>
diff --git a/tests/data/test83 b/tests/data/test83
index 7c176969f..182650efe 100644
--- a/tests/data/test83
+++ b/tests/data/test83
@@ -1,3 +1,4 @@
+<testcase>
 <info>
 <keywords>
 HTTP
@@ -68,3 +69,4 @@ Accept: */*
 
 </protocol>
 </verify>
+</testcase>
diff --git a/tests/data/test84 b/tests/data/test84
index 9d5e678b6..c6ca496a9 100644
--- a/tests/data/test84
+++ b/tests/data/test84
@@ -1,3 +1,4 @@
+<testcase>
 <info>
 <keywords>
 HTTP
@@ -51,3 +52,4 @@ Proxy-Connection: Keep-Alive
 
 </protocol>
 </verify>
+</testcase>
diff --git a/tests/data/test85 b/tests/data/test85
index a82110769..80d83694e 100644
--- a/tests/data/test85
+++ b/tests/data/test85
@@ -1,3 +1,4 @@
+<testcase>
 <info>
 <keywords>
 HTTP
@@ -53,3 +54,4 @@ Proxy-Connection: Keep-Alive
 
 </protocol>
 </verify>
+</testcase>
diff --git a/tests/data/test86 b/tests/data/test86
index e1403962d..ac611bd29 100644
--- a/tests/data/test86
+++ b/tests/data/test86
@@ -1,3 +1,4 @@
+<testcase>
 <info>
 <keywords>
 HTTP
@@ -8,7 +9,7 @@ HTTP GET
 #
 # Server-side
 <reply>
-<data nocheck=1>
+<data nocheck="1">
 HTTP/1.1 200 OK
 Date: Thu, 09 Nov 2010 14:49:00 GMT
 Server: test-server/fake
@@ -20,7 +21,7 @@ Connection: close
 Content-Type: text/html
 Funny-head: yesyes
 
-<foo>
+-foo-
 </data>
 <data1>
 HTTP/1.0 200 OK
@@ -54,7 +55,7 @@ http
  <name>
 HTTP, urlglob []-retrieval and -o #[num] usage
  </name>
- <command option=no-output>
+ <command option="no-output">
 "http://%HOSTIP:%HTTPPORT/[860001-860003]" -o "log/dumpit#1.dump"
 </command>
 </client>
@@ -92,3 +93,4 @@ Funny-head: swsclose
 crap data
 </file>
 </verify>
+</testcase>
diff --git a/tests/data/test87 b/tests/data/test87
index 6f047e6fc..773165690 100644
--- a/tests/data/test87
+++ b/tests/data/test87
@@ -1,3 +1,4 @@
+<testcase>
 <info>
 <keywords>
 [] range
@@ -17,7 +18,7 @@ none
  <name>
 urlglob with bad -o #[num] usage
  </name>
- <command option=no-output>
+ <command option="no-output">
 "http://%HOSTIP:%HTTPPORT/[870001-870003]" -o "log/dumpit#2.dump"
 </command>
 </client>
@@ -29,3 +30,4 @@ urlglob with bad -o #[num] usage
 2
 </errorcode>
 </verify>
+</testcase>
diff --git a/tests/data/test88 b/tests/data/test88
index 45791fcba..fd7bc94ca 100644
--- a/tests/data/test88
+++ b/tests/data/test88
@@ -1,3 +1,4 @@
+<testcase>
 <info>
 <keywords>
 HTTP
@@ -94,3 +95,4 @@ line three
 four is the number of lines
 </protocol>
 </verify>
+</testcase>
diff --git a/tests/data/test89 b/tests/data/test89
index d3392c694..30741bed6 100644
--- a/tests/data/test89
+++ b/tests/data/test89
@@ -1,3 +1,4 @@
+<testcase>
 <info>
 <keywords>
 HTTP
@@ -9,10 +10,11 @@ followlocation
 # Server-side
 <reply>
 
-# no <data> in this test since we have NTLM from the start
+<!-- no <data> in this test since we have NTLM from the start
+
+This is supposed to be returned when the server gets a first
+Authorization: NTLM line passed-in from the client -->
 
-# This is supposed to be returned when the server gets a first
-# Authorization: NTLM line passed-in from the client
 <data1001>
 HTTP/1.1 401 Now gimme that second request of crap
 Server: Microsoft-IIS/5.0
@@ -136,3 +138,4 @@ Accept: */*
 
 </protocol>
 </verify>
+</testcase>
diff --git a/tests/data/test9 b/tests/data/test9
index 034a60517..16793d440 100644
--- a/tests/data/test9
+++ b/tests/data/test9
@@ -1,3 +1,4 @@
+<testcase>
 <info>
 <keywords>
 HTTP
@@ -69,3 +70,4 @@ bar
 ------------------------------9ef8d6205763--
 </protocol>
 </verify>
+</testcase>
diff --git a/tests/data/test90 b/tests/data/test90
index 36d6d0cb7..755dd4061 100644
--- a/tests/data/test90
+++ b/tests/data/test90
@@ -1,3 +1,4 @@
+<testcase>
 <info>
 <keywords>
 HTTP
@@ -183,3 +184,4 @@ Accept: */*
 
 </protocol>
 </verify>
+</testcase>
diff --git a/tests/data/test91 b/tests/data/test91
index 2e9f779e6..189a6f97d 100644
--- a/tests/data/test91
+++ b/tests/data/test91
@@ -1,3 +1,4 @@
+<testcase>
 <info>
 <keywords>
 HTTP
@@ -114,3 +115,4 @@ Accept: */*
 
 </protocol>
 </verify>
+</testcase>
diff --git a/tests/data/test92 b/tests/data/test92
index 3c043aab0..0e873689a 100644
--- a/tests/data/test92
+++ b/tests/data/test92
@@ -1,3 +1,4 @@
+<testcase>
 <info>
 <keywords>
 HTTP
@@ -48,3 +49,4 @@ Accept: */*
 </protocol>
 
 </verify>
+</testcase>
diff --git a/tests/data/test93 b/tests/data/test93
index b98d32bdc..55569ddd8 100644
--- a/tests/data/test93
+++ b/tests/data/test93
@@ -1,3 +1,4 @@
+<testcase>
 <info>
 <keywords>
 HTTP
@@ -47,3 +48,4 @@ Proxy-Connection: Keep-Alive
 
 </protocol>
 </verify>
+</testcase>
diff --git a/tests/data/test94 b/tests/data/test94
index 2deeb4f27..63aae01e4 100644
--- a/tests/data/test94
+++ b/tests/data/test94
@@ -1,3 +1,4 @@
+<testcase>
 <info>
 <keywords>
 HTTPS
@@ -9,7 +10,7 @@ FAILURE
 #
 # Server-side
 <reply>
-<data nocheck=1>
+<data nocheck="1">
 HTTP/1.1 407 Needs proxy authentication
 Server: test-server/fake swsclose yesyes
 Proxy-Authenticate: Basic "oh please"
@@ -53,3 +54,4 @@ Proxy-Connection: Keep-Alive
 
 </protocol>
 </verify>
+</testcase>
diff --git a/tests/data/test95 b/tests/data/test95
index d2cd2c429..eadcd7a67 100644
--- a/tests/data/test95
+++ b/tests/data/test95
@@ -1,3 +1,4 @@
+<testcase>
 <info>
 <keywords>
 HTTP
@@ -52,7 +53,7 @@ http://%HOSTIP:%HTTPPORT/we/want/that/page/95 -p -x %HOSTIP:%HTTPPORT -d "datato
 <strip>
 ^User-Agent:.*
 </strip>
-<protocol nonewline=yes>
+<protocol nonewline="yes">
 CONNECT 127.0.0.1:%HTTPPORT HTTP/1.0
 User-Agent: curl/7.10.7-pre2 (i686-pc-linux-gnu) libcurl/7.10.7-pre2 OpenSSL/0.9.7a zlib/1.1.3
 Host: 127.0.0.1:%HTTPPORT
@@ -68,3 +69,4 @@ Content-Type: application/x-www-form-urlencoded
 datatopost=ohthatsfunyesyes
 </protocol>
 </verify>
+</testcase>
diff --git a/tests/data/test97 b/tests/data/test97
index 121ffa4db..b309ff3e7 100644
--- a/tests/data/test97
+++ b/tests/data/test97
@@ -1,3 +1,4 @@
+<testcase>
 <info>
 <keywords>
 HTTP
@@ -38,7 +39,7 @@ HTTP POST with custom content-type
 <strip>
 ^User-Agent:.*
 </strip>
-<protocol nonewline=yes>
+<protocol nonewline="yes">
 POST /97 HTTP/1.1
 Host: 127.0.0.1:%HTTPPORT
 Accept: */*
@@ -48,3 +49,4 @@ Content-Length: 14
 hejsanallabarn
 </protocol>
 </verify>
+</testcase>
diff --git a/tests/data/test98 b/tests/data/test98
index 5878c578f..fb7aa7d30 100644
--- a/tests/data/test98
+++ b/tests/data/test98
@@ -1,3 +1,4 @@
+<testcase>
 <info>
 <keywords>
 HTTP
@@ -51,3 +52,4 @@ Expect: 100-continue
 data on stdin
 </protocol>
 </verify>
+</testcase>
diff --git a/tests/data/test99 b/tests/data/test99
index 49cfdc286..2fdb15f9c 100644
--- a/tests/data/test99
+++ b/tests/data/test99
@@ -1,3 +1,4 @@
+<testcase>
 <info>
 <keywords>
 HTTP
@@ -64,3 +65,4 @@ Accept: */*
 
 </protocol>
 </verify>
+</testcase>
diff --git a/tests/server/getpart.c b/tests/server/getpart.c
index 5a839b122..3453bf313 100644
--- a/tests/server/getpart.c
+++ b/tests/server/getpart.c
@@ -120,6 +120,7 @@ const char *spitout(FILE *stream,
 
   enum {
     STATE_OUTSIDE,
+    STATE_OUTER,
     STATE_INMAIN,
     STATE_INSUB,
     STATE_ILLEGAL
@@ -173,6 +174,10 @@ const char *spitout(FILE *stream,
         cmain[0]=0; /* no main anymore */
         display=0;
       }
+      else if(state == STATE_OUTER) {
+        /* this is the end of the outermost file section */
+        state--;
+      }
     }
     else if(!display) {
       /* this is the beginning of a section */
@@ -182,6 +187,10 @@ const char *spitout(FILE *stream,
       *end = 0;
       switch(state) {
       case STATE_OUTSIDE:
+        /* Ignore the outermost <testcase> element */
+        state = STATE_OUTER;
+        break;
+      case STATE_OUTER:
         strcpy(cmain, ptr);
         state = STATE_INMAIN;
         break;
@@ -214,6 +223,10 @@ const char *spitout(FILE *stream,
       show(("* (%d bytes) %s\n", stringlen, buffer));
       display = 1; /* start displaying */
     }
+    else if ((*cmain == '!') || (*csub == '!')) {
+        /* This is just a comment, not a new section */
+        state--;
+    }
     else {
       show(("%d (%s/%s): %s\n", state, cmain, csub, buffer));
       display = 0; /* no display */
author	Dan Fandrich <dan@coneharvesters.com>	2007-01-23 02:25:56 +0000
committer	Dan Fandrich <dan@coneharvesters.com>	2007-01-23 02:25:56 +0000
commit	33bea767ebd0bbf11867fe1af31dc345e9f816af (patch)
tree	4c7d01783220f9e8b79c0239562af5d63d833359 /tests
parent	9ab7cda0105cd926ab67c31508c5d835466ce8e7 (diff)