A minor "syntax error" in numerous test files corrected

158 files changed, 158 insertions, 160 deletions

diff --git a/tests/data/test10 b/tests/data/test10
index e2f0909e6..cfe53f6cc 100644
--- a/tests/data/test10
+++ b/tests/data/test10
@@ -32,7 +32,7 @@ the
    PUT
       feature
 </file>
-</test>
+</client>
 
 # Verify data after the test has been "shot"
 <verify>
diff --git a/tests/data/test100 b/tests/data/test100
index aad460161..8131fefbf 100644
--- a/tests/data/test100
+++ b/tests/data/test100
@@ -1,6 +1,6 @@
 #
 # Server-side
-<reply name="1">
+<reply>
 <data>
 total 20

 drwxr-xr-x   8 98       98           512 Oct 22 13:06 .

@@ -28,7 +28,7 @@ FTP dir list PASV
  <command>
 ftp://%HOSTIP:%FTPPORT/
 </command>
-</test>
+</client>
 
 #
 # Verify data after the test has been "shot"
diff --git a/tests/data/test101 b/tests/data/test101
index 67f5968e4..735ef95bb 100644
--- a/tests/data/test101
+++ b/tests/data/test101
@@ -26,7 +26,7 @@ FTP dir list, PORT with specified IP
  <command>
 ftp://%HOSTIP:%FTPPORT/ -P %HOSTIP
 </command>
-</test>
+</client>
 
 # Verify data after the test has been "shot"
 <verify>
diff --git a/tests/data/test102 b/tests/data/test102
index ebb58e898..8765c0193 100644
--- a/tests/data/test102
+++ b/tests/data/test102
@@ -21,11 +21,11 @@ FTP RETR PASV
  <command>
 ftp://%HOSTIP:%FTPPORT/102
 </command>
-</test>
+
 <file name="log/ftpserver.cmd">
 REPLY EPSV 500 no such command
 </file>
-
+</client>
 
 # Verify data after the test has been "shot"
 <verify>
diff --git a/tests/data/test103 b/tests/data/test103
index d8aa339c3..54d6d91c7 100644
--- a/tests/data/test103
+++ b/tests/data/test103
@@ -21,7 +21,7 @@ FTP RETR PORT with CWD
  <command>
 ftp://%HOSTIP:%FTPPORT/a/path/103 -P -
 </command>
-</test>
+</client>
 
 # Verify data after the test has been "shot"
 <verify>
diff --git a/tests/data/test104 b/tests/data/test104
index b0b9c45ef..476c0b30b 100644
--- a/tests/data/test104
+++ b/tests/data/test104
@@ -16,7 +16,7 @@ FTP --head to get file size only
  <command>
 ftp://%HOSTIP:%FTPPORT/a/path/103 --head
 </command>
-</test>
+</client>
 
 # Verify data after the test has been "shot"
 <verify>
diff --git a/tests/data/test105 b/tests/data/test105
index 0245592e3..e42492b54 100644
--- a/tests/data/test105
+++ b/tests/data/test105
@@ -25,7 +25,7 @@ ftp://userdude:passfellow@%HOSTIP:%FTPPORT/103 --use-ascii
 REPLY EPSV 500 no such command
 REPLY SIZE 500 no such command
 </file>
-</test>
+</client>
 
 # Verify data after the test has been "shot"
 <verify>
diff --git a/tests/data/test106 b/tests/data/test106
index 359af4f2e..e7576e75e 100644
--- a/tests/data/test106
+++ b/tests/data/test106
@@ -21,7 +21,7 @@ FTP GET with type=A style ASCII URL using %20 codes
  <command>
 "ftp://%HOSTIP:%FTPPORT//path%20with%20%20spaces//and%20things2/106;type=A"
 </command>
-</test>
+</client>
 
 # Verify data after the test has been "shot"
 <verify>
diff --git a/tests/data/test107 b/tests/data/test107
index c97dbb9a4..bc6ad6a3e 100644
--- a/tests/data/test107
+++ b/tests/data/test107
@@ -18,7 +18,7 @@ works
  <command>
 ftp://%HOSTIP:%FTPPORT/107 -T log/test107.txt
 </command>
-</test>
+</client>
 
 # Verify data after the test has been "shot"
 <verify>
diff --git a/tests/data/test108 b/tests/data/test108
index 7ab7b4791..f2473752d 100644
--- a/tests/data/test108
+++ b/tests/data/test108
@@ -19,7 +19,7 @@ ftp://%HOSTIP:%FTPPORT/CWD/STOR/RETR/108 -T log/upload108 -P -
 Moooooooooooo
  upload this
 </file>
-</test>
+</client>
 
 # Verify data after the test has been "shot"
 <verify>
diff --git a/tests/data/test109 b/tests/data/test109
index 1362d5b31..bad568069 100644
--- a/tests/data/test109
+++ b/tests/data/test109
@@ -19,7 +19,7 @@ ftp://%HOSTIP:%FTPPORT/109 -T log/upload109 --append
 Moooooooooooo
  upload this
 </file>
-</test>
+</client>
 
 # Verify data after the test has been "shot"
 <verify>
diff --git a/tests/data/test11 b/tests/data/test11
index 932dd2391..eb72dfb65 100644
--- a/tests/data/test11
+++ b/tests/data/test11
@@ -45,7 +45,7 @@ simple HTTP Location: following
  <command>
 http://%HOSTIP:%HTTPPORT/want/11 -L
 </command>
-</test>
+</client>
 
 # Verify data after the test has been "shot"
 <verify>
diff --git a/tests/data/test110 b/tests/data/test110
index 38f40c7b7..ac021cf65 100644
--- a/tests/data/test110
+++ b/tests/data/test110
@@ -23,7 +23,7 @@ ftp://%HOSTIP:%FTPPORT/110 -C 20
 <file name="log/ftpserver.cmd">
 REPLY EPSV 500 no such command
 </file>
-</test>
+</client>
 
 # Verify data after the test has been "shot"
 <verify>
diff --git a/tests/data/test111 b/tests/data/test111
index 0664bfd77..9bd53af55 100644
--- a/tests/data/test111
+++ b/tests/data/test111
@@ -16,7 +16,7 @@ FTP download resume beyond file size
  <command>
 ftp://%HOSTIP:%FTPPORT/111 -C 2000
 </command>
-</test>
+</client>
 
 # Verify data after the test has been "shot"
 <verify>
diff --git a/tests/data/test112 b/tests/data/test112
index fe3dd52cb..a9f021532 100644
--- a/tests/data/test112
+++ b/tests/data/test112
@@ -18,7 +18,7 @@ this is the *****crap******** that we're gonna upload
 
 worx?
 </file>
-</test>
+</client>
 
 # Verify data after the test has been "shot"
 <verify>
diff --git a/tests/data/test113 b/tests/data/test113
index 6357897b4..19dcc5582 100644
--- a/tests/data/test113
+++ b/tests/data/test113
@@ -16,7 +16,7 @@ ftp://%HOSTIP:%FTPPORT/113
 <file name="log/ftpserver.cmd">
 REPLY USER 314 bluah you fewl!
 </file>
-</test>
+</client>
 
 # Verify data after the test has been "shot"
 <verify>
diff --git a/tests/data/test114 b/tests/data/test114
index 0dfff77a0..05555abf9 100644
--- a/tests/data/test114
+++ b/tests/data/test114
@@ -16,7 +16,7 @@ ftp://%HOSTIP:%FTPPORT/114
 <file name="log/ftpserver.cmd">
 REPLY PASS 314 bluah you f00l!
 </file>
-</test>
+</client>
 
 # Verify data after the test has been "shot"
 <verify>
diff --git a/tests/data/test115 b/tests/data/test115
index 03a5caf1d..094af900a 100644
--- a/tests/data/test115
+++ b/tests/data/test115
@@ -17,7 +17,7 @@ ftp://%HOSTIP:%FTPPORT/115
 REPLY PASV 314 bluah you f00l!
 REPLY EPSV 314 bluah you f00l!
 </file>
-</test>
+</client>
 
 # Verify data after the test has been "shot"
 <verify>
diff --git a/tests/data/test116 b/tests/data/test116
index 57ad11ae2..831a331d7 100644
--- a/tests/data/test116
+++ b/tests/data/test116
@@ -16,7 +16,7 @@ ftp://%HOSTIP:%FTPPORT/116 -P 127.0.0.1
 <file name="log/ftpserver.cmd">
 REPLY PORT 314 bluah you f00l!
 </file>
-</test>
+</client>
 
 # Verify data after the test has been "shot"
 <verify>
diff --git a/tests/data/test117 b/tests/data/test117
index 43a10958e..1e3e15520 100644
--- a/tests/data/test117
+++ b/tests/data/test117
@@ -17,7 +17,7 @@ ftp://%HOSTIP:%FTPPORT/117
 REPLY EPSV 314 bluah you f00l!
 REPLY TYPE 314 bluah you f00l!
 </file>
-</test>
+</client>
 
 # Verify data after the test has been "shot"
 <verify>
diff --git a/tests/data/test118 b/tests/data/test118
index 0cce25cb8..4fef96783 100644
--- a/tests/data/test118
+++ b/tests/data/test118
@@ -17,7 +17,7 @@ ftp://%HOSTIP:%FTPPORT/118
 REPLY RETR 314 bluah you f00l!
 REPLY EPSV 314 bluah you f00l!
 </file>
-</test>
+</client>
 
 # Verify data after the test has been "shot"
 <verify>
diff --git a/tests/data/test119 b/tests/data/test119
index 96d30d7e7..b0c7e0f31 100644
--- a/tests/data/test119
+++ b/tests/data/test119
@@ -16,7 +16,7 @@ ftp://%HOSTIP:%FTPPORT/119 -P -
 <file name="log/ftpserver.cmd">
 REPLY RETR 314 bluah you f00l!
 </file>
-</test>
+</client>
 
 # Verify data after the test has been "shot"
 <verify>
diff --git a/tests/data/test12 b/tests/data/test12
index 245fde2ae..06a2eaeec 100644
--- a/tests/data/test12
+++ b/tests/data/test12
@@ -29,7 +29,7 @@ HTTP range support
  <command>
 http://%HOSTIP:%HTTPPORT/want/12 -r 100-200
 </command>
-</test>
+</client>
 
 # Verify data after the test has been "shot"
 <verify>
diff --git a/tests/data/test120 b/tests/data/test120
index ebc5691cd..8c30ea2aa 100644
--- a/tests/data/test120
+++ b/tests/data/test120
@@ -24,7 +24,7 @@ ftp://%HOSTIP:%FTPPORT/120 -Q "-DELE file"
 <file name="log/ftpserver.cmd">
 REPLY EPSV 314 bluah you f00l!
 </file>
-</test>
+</client>
 
 # Verify data after the test has been "shot"
 <verify>
diff --git a/tests/data/test121 b/tests/data/test121
index 427d88ba7..00870a25b 100644
--- a/tests/data/test121
+++ b/tests/data/test121
@@ -21,7 +21,7 @@ ftp download with post- and pre-transfer delete operations
  <command>
 ftp://%HOSTIP:%FTPPORT/121 -Q "-DELE after_transfer" -Q "DELE before_transfer"
 </command>
-</test>
+</client>
 
 # Verify data after the test has been "shot"
 <verify>
diff --git a/tests/data/test122 b/tests/data/test122
index 5b7bafe75..982684fb7 100644
--- a/tests/data/test122
+++ b/tests/data/test122
@@ -19,7 +19,7 @@ ftp://%HOSTIP:%FTPPORT/122 -C 5
 <file name="log/ftpserver.cmd">
 REPLY EPSV 500 no such command
 </file>
-</test>
+</client>
 
 # Verify data after the test has been "shot"
 <verify>
diff --git a/tests/data/test123 b/tests/data/test123
index 3825360b0..446387dc7 100644
--- a/tests/data/test123
+++ b/tests/data/test123
@@ -16,7 +16,7 @@ ftp://%HOSTIP:%FTPPORT/123 -T log/upload123 -C 51
 <file name="log/upload123">
 --------------------------------------------------
 </file>
-</test>
+</client>
 
 # Verify data after the test has been "shot"
 <verify>
diff --git a/tests/data/test124 b/tests/data/test124
index f8c206094..dffef0dd6 100644
--- a/tests/data/test124
+++ b/tests/data/test124
@@ -20,7 +20,7 @@ ftp://%HOSTIP:%FTPPORT/124
 REPLY PWD 314 bluah you f00l!
 REPLY EPSV 314 bluah you f00l!
 </file>
-</test>
+</client>
 
 # Verify data after the test has been "shot"
 <verify>
diff --git a/tests/data/test125 b/tests/data/test125
index 715eb472e..6a72fcd4e 100644
--- a/tests/data/test125
+++ b/tests/data/test125
@@ -16,7 +16,7 @@ ftp://%HOSTIP:%FTPPORT/path/to/file/125
 <file name="log/ftpserver.cmd">
 REPLY CWD 314 bluah you f00l!
 </file>
-</test>
+</client>
 
 # Verify data after the test has been "shot"
 <verify>
diff --git a/tests/data/test126 b/tests/data/test126
index e670a2550..dd124f9a9 100644
--- a/tests/data/test126
+++ b/tests/data/test126
@@ -19,7 +19,7 @@ ftp://%HOSTIP:%FTPPORT/blalbla/lululul/126
 <file name="log/ftpserver.cmd">
 RETRWEIRDO
 </file>
-</test>
+</client>
 
 # Verify data after the test has been "shot"
 <verify>
diff --git a/tests/data/test127 b/tests/data/test127
index 5df4e6aff..7e85fd6c1 100644
--- a/tests/data/test127
+++ b/tests/data/test127
@@ -16,7 +16,7 @@ FTP --disable-epsv
  <command>
 ftp://%HOSTIP:%FTPPORT/path/to/file/127 --disable-epsv
 </command>
-</test>
+</client>
 
 # Verify data after the test has been "shot"
 <verify>
diff --git a/tests/data/test128 b/tests/data/test128
index 8e5d99106..3ec30ff4e 100644
--- a/tests/data/test128
+++ b/tests/data/test128
@@ -22,7 +22,7 @@ with
 the
 --crlf option
 </file>
-</test>
+</client>
 
 # Verify data after the test has been "shot"
 <verify>
diff --git a/tests/data/test13 b/tests/data/test13
index 45d0768dc..7f7ddf8fe 100644
--- a/tests/data/test13
+++ b/tests/data/test13
@@ -20,7 +20,7 @@ HTTP custom request 'DELETE'
  <command>
 http://%HOSTIP:%HTTPPORT/want/13 -X DELETE
 </command>
-</test>
+</client>
 
 # Verify data after the test has been "shot"
 <verify>
diff --git a/tests/data/test130 b/tests/data/test130
index 5693f07b0..76bab63c1 100644
--- a/tests/data/test130
+++ b/tests/data/test130
@@ -36,7 +36,7 @@ FTP (optional .netrc; no user/pass) dir list PASV
 machine %HOSTIP login user1 password passwd1
 machine %HOSTIP login user2 password passwd2
 </file>
-</test>
+</client>
 
 #
 # Verify data after the test has been "shot"
diff --git a/tests/data/test131 b/tests/data/test131
index 6501b8de6..d55f3eda2 100644
--- a/tests/data/test131
+++ b/tests/data/test131
@@ -36,7 +36,7 @@ FTP (optional .netrc; user/no pass) dir list PASV
 machine %HOSTIP login user1 password passwd1
 machine %HOSTIP login user2 password passwd2
 </file>
-</test>
+</client>
 
 #
 # Verify data after the test has been "shot"
diff --git a/tests/data/test132 b/tests/data/test132
index 09655701d..1ba3fd98e 100644
--- a/tests/data/test132
+++ b/tests/data/test132
@@ -36,7 +36,7 @@ FTP (optional .netrc; user/passwd supplied) dir list PASV
 machine %HOSTIP login user1 password passwd1
 machine %HOSTIP login user2 password passwd2
 </file>
-</test>
+</client>
 
 #
 # Verify data after the test has been "shot"
diff --git a/tests/data/test133 b/tests/data/test133
index 6fda5cd43..2678d0b97 100644
--- a/tests/data/test133
+++ b/tests/data/test133
@@ -36,7 +36,7 @@ FTP (compulsory .netrc; ignored user/passwd) dir list PASV
 machine %HOSTIP login user1 password passwd1
 machine %HOSTIP login user2 password passwd2
 </file>
-</test>
+</client>
 
 #
 # Verify data after the test has been "shot"
diff --git a/tests/data/test134 b/tests/data/test134
index 1a2567304..60913e128 100644
--- a/tests/data/test134
+++ b/tests/data/test134
@@ -36,7 +36,7 @@ FTP (optional .netrc; programmatic user/passwd) dir list PASV
 machine %HOSTIP login user1 password passwd1
 machine %HOSTIP login user2 password passwd2
 </file>
-</test>
+</client>
 
 #
 # Verify data after the test has been "shot"
diff --git a/tests/data/test135 b/tests/data/test135
index d8f4546cf..53ad36332 100644
--- a/tests/data/test135
+++ b/tests/data/test135
@@ -25,7 +25,7 @@ FTP retrieve a byte-range
  <command>
 -r 4-16 ftp://%HOSTIP:%FTPPORT/135
 </command>
-</test>
+</client>
 
 # Verify data after the test has been "shot"
 <verify>
diff --git a/tests/data/test136 b/tests/data/test136
index 5e6059bd3..ffbf9e3b7 100644
--- a/tests/data/test136
+++ b/tests/data/test136
@@ -16,7 +16,7 @@ FTP with user and no password
  <command>
 -u user: ftp://%HOSTIP:%FTPPORT/136
 </command>
-</test>
+</client>
 
 # Verify data after the test has been "shot"
 <verify>
diff --git a/tests/data/test137 b/tests/data/test137
index 94b2d6723..d7475f843 100644
--- a/tests/data/test137
+++ b/tests/data/test137
@@ -19,7 +19,7 @@ ftp://%HOSTIP:%FTPPORT/blalbla/lululul/137
 <file name="log/ftpserver.cmd">
 RETRNOSIZE
 </file>
-</test>
+</client>
 
 # Verify data after the test has been "shot"
 <verify>
diff --git a/tests/data/test138 b/tests/data/test138
index 76c91120a..57577c2d7 100644
--- a/tests/data/test138
+++ b/tests/data/test138
@@ -22,7 +22,7 @@ ftp://%HOSTIP:%FTPPORT/blalbla/lululul/138
 <file name="log/ftpserver.cmd">
 RETRNOSIZE
 </file>
-</test>
+</client>
 
 # Verify data after the test has been "shot"
 <verify>
diff --git a/tests/data/test139 b/tests/data/test139
index 5990e7418..052d1f06b 100644
--- a/tests/data/test139
+++ b/tests/data/test139
@@ -19,7 +19,7 @@ FTP download a newer file with -z
  <command>
 ftp://%HOSTIP:%FTPPORT/blalbla/139 -z "1 jan 1989"
 </command>
-</test>
+</client>
 
 # Verify data after the test has been "shot"
 <verify>
diff --git a/tests/data/test14 b/tests/data/test14
index bbc4ba68d..97afba36d 100644
--- a/tests/data/test14
+++ b/tests/data/test14
@@ -19,7 +19,7 @@ HTTP HEAD with Connection: close
  <command>
 http://%HOSTIP:%HTTPPORT/want/14 -i --head
 </command>
-</test>
+</client>
 
 # Verify data after the test has been "shot"
 <verify>
diff --git a/tests/data/test140 b/tests/data/test140
index 5112dfa91..c030694ce 100644
--- a/tests/data/test140
+++ b/tests/data/test140
@@ -18,7 +18,7 @@ FTP download file with -z, expected to not transfer
  <command>
 ftp://%HOSTIP:%FTPPORT/blalbla/140 -z "1 jan 2004"
 </command>
-</test>
+</client>
 
 # Verify data after the test has been "shot"
 <verify>
diff --git a/tests/data/test141 b/tests/data/test141
index bbec45a19..65be0474b 100644
--- a/tests/data/test141
+++ b/tests/data/test141
@@ -18,7 +18,7 @@ FTP download info with -I
  <command>
 ftp://%HOSTIP:%FTPPORT/blalbla/141 -I
 </command>
-</test>
+</client>
 
 # Verify data after the test has been "shot"
 <verify>
diff --git a/tests/data/test142 b/tests/data/test142
index b69550bcc..2061c9200 100644
--- a/tests/data/test142
+++ b/tests/data/test142
@@ -16,7 +16,7 @@ FTP URL with 150 dir levels
  <command>
 ftp://%HOSTIP:%FTPPORT/part1/part2/part3/part4/part5/part6/part7/part8/part9/part10/part11/part12/part13/part14/part15/part16/part17/part18/part19/part20/part21/part22/part23/part24/part25/part26/part27/part28/part29/part30/part31/part32/part33/part34/part35/part36/part37/part38/part39/part40/part41/part42/part43/part44/part45/part46/part47/part48/part49/part50/part51/part52/part53/part54/part55/part56/part57/part58/part59/part60/part61/part62/part63/part64/part65/part66/part67/part68/part69/part70/part71/part72/part73/part74/part75/part76/part77/part78/part79/part80/part81/part82/part83/part84/part85/part86/part87/part88/part89/part90/part91/part92/part93/part94/part95/part96/part97/part98/part99/part100/part101/part102/part103/part104/part105/part106/part107/part108/part109/part110/part111/part112/part113/part114/part115/part116/part117/part118/part119/part120/part121/part122/part123/part124/part125/part126/part127/part128/part129/part130/part131/part132/part133/part134/part135/part136/part137/part138/part139/part140/part141/part142/part143/part144/part145/part146/part147/part148/part149/part150/142
 </command>
-</test>
+</client>
 
 # Verify data after the test has been "shot"
 <verify>
diff --git a/tests/data/test143 b/tests/data/test143
index c8a8cbbc3..157bdd9ea 100644
--- a/tests/data/test143
+++ b/tests/data/test143
@@ -16,7 +16,7 @@ FTP URL with type=a
  <command>
 "ftp://%HOSTIP:%FTPPORT/%2ftmp/moo/143;type=a"
 </command>
-</test>
+</client>
 
 # Verify data after the test has been "shot"
 <verify>
diff --git a/tests/data/test144 b/tests/data/test144
index 7afaf9433..e47baf209 100644
--- a/tests/data/test144
+++ b/tests/data/test144
@@ -18,7 +18,7 @@ ftp://%HOSTIP:%FTPPORT/ -P - -l
 <file name="log/ftpserver.cmd">
 REPLY NLST 450 No files found
 </file>
-</test>
+</client>
 
 # Verify data after the test has been "shot"
 <verify>
diff --git a/tests/data/test145 b/tests/data/test145
index 3747a98b5..b279bdaa4 100644
--- a/tests/data/test145
+++ b/tests/data/test145
@@ -18,7 +18,7 @@ ftp://%HOSTIP:%FTPPORT/ -P - -l
 <file name="log/ftpserver.cmd">
 REPLY NLST 550 Have a taste on this!
 </file>
-</test>
+</client>
 
 # Verify data after the test has been "shot"
 <verify>
diff --git a/tests/data/test146 b/tests/data/test146
index 1909b6b8c..1de7f38d4 100644
--- a/tests/data/test146
+++ b/tests/data/test146
@@ -16,7 +16,7 @@ persistant FTP with different paths
  <command>
 ftp://%HOSTIP:%FTPPORT/first/dir/here/146 ftp://%HOSTIP:%FTPPORT/146
 </command>
-</test>
+</client>
 
 # Verify data after the test has been "shot"
 <verify>
diff --git a/tests/data/test147 b/tests/data/test147
index 35f7f6676..b92c75106 100644
--- a/tests/data/test147
+++ b/tests/data/test147
@@ -16,7 +16,6 @@ FTP with --ftp-create-dirs (failing CWD)
  <command>
 ftp://%HOSTIP:%FTPPORT/first/dir/here/147 --ftp-create-dirs
 </command>
-</test>
 <file name="log/ftpserver.cmd">
 REPLY CWD 550 I won't allow this on my server
 COUNT CWD 1
diff --git a/tests/data/test148 b/tests/data/test148
index 454fee3ae..5e1f78a10 100644
--- a/tests/data/test148
+++ b/tests/data/test148
@@ -13,7 +13,6 @@ FTP with --ftp-create-dirs (failing MKD)
  <command>
 ftp://%HOSTIP:%FTPPORT/attempt/to/get/this/148 --ftp-create-dirs
 </command>
-</test>
 <file name="log/ftpserver.cmd">
 REPLY CWD 550 I won't allow this on my server
 REPLY MKD 550 We will have no such thing
diff --git a/tests/data/test15 b/tests/data/test15
index d42ab7b4f..325783b84 100644
--- a/tests/data/test15
+++ b/tests/data/test15
@@ -22,7 +22,7 @@ http
  <command>
 http://%HOSTIP:%HTTPPORT/want/15 --write-out '%{url_effective} %{http_code} %{size_download}\n'
 </command>
-</test>
+</client>
 
 # Verify data after the test has been "shot"
 <verify>
diff --git a/tests/data/test150 b/tests/data/test150
index 98648cd81..b9d92383d 100644
--- a/tests/data/test150
+++ b/tests/data/test150
@@ -56,7 +56,7 @@ HTTP with NTLM authorization and --fail
  <command>
 http://%HOSTIP:%HTTPPORT/150 -u testuser:testpass --ntlm --fail
 </command>
-</test>
+</client>
 
 # Verify data after the test has been "shot"
 <verify>
diff --git a/tests/data/test151 b/tests/data/test151
index c79ab40dd..c32d2d8a6 100644
--- a/tests/data/test151
+++ b/tests/data/test151
@@ -22,7 +22,7 @@ HTTP GET with an error code that might trick authentication
  <command>
 http://%HOSTIP:%HTTPPORT/151
 </command>
-</test>
+</client>
 
 # Verify data after the test has been "shot"
 <verify>
diff --git a/tests/data/test152 b/tests/data/test152
index 86ac68d24..aaee6a41b 100644
--- a/tests/data/test152
+++ b/tests/data/test152
@@ -22,7 +22,7 @@ HTTP GET with an error code that might trick authentication and --fail
  <command>
 http://%HOSTIP:%HTTPPORT/152 --fail
 </command>
-</test>
+</client>
 
 # Verify data after the test has been "shot"
 <verify>
diff --git a/tests/data/test153 b/tests/data/test153
index a2d15191a..8acde6011 100644
--- a/tests/data/test153
+++ b/tests/data/test153
@@ -58,7 +58,7 @@ HTTP with Digest authorization with stale=true
  <command>
 http://%HOSTIP:%HTTPPORT/1530001 -u testuser:testpass --digest http://%HOSTIP:%HTTPPORT/1530002
 </command>
-</test>
+</client>
 
 # Verify data after the test has been "shot"
 <verify>
diff --git a/tests/data/test159 b/tests/data/test159
index 7ad1c76a8..f8a2e4d03 100644
--- a/tests/data/test159
+++ b/tests/data/test159
@@ -56,7 +56,7 @@ HTTP with NTLM authorization when talking HTTP/1.0
  <command>
 http://%HOSTIP:%HTTPPORT/159 -u testuser:testpass --ntlm -0
 </command>
-</test>
+</client>
 
 # Verify data after the test has been "shot"
 <verify>
diff --git a/tests/data/test16 b/tests/data/test16
index a6c7d51f0..13da70578 100644
--- a/tests/data/test16
+++ b/tests/data/test16
@@ -23,7 +23,7 @@ HTTP with proxy athorization
  <command>
  -U fake@user:§§§looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong -x %HOSTIP:%HTTPPORT http://we.want.that.site.com/16
 </command>
-</test>
+</client>
 
 # Verify data after the test has been "shot"
 <verify>
diff --git a/tests/data/test160 b/tests/data/test160
index 26ef7ec72..18f3dece5 100644
--- a/tests/data/test160
+++ b/tests/data/test160
@@ -31,7 +31,7 @@ HTTP with delayed close, conn reuse, connection reset and retry
  <command>
 http://%HOSTIP:%HTTPPORT/want/160 http://%HOSTIP:%HTTPPORT/wantmore/1600001
 </command>
-</test>
+</client>
 
 # Verify data after the test has been "shot"
 <verify>
diff --git a/tests/data/test161 b/tests/data/test161
index c3bda556f..81804b00c 100644
--- a/tests/data/test161
+++ b/tests/data/test161
@@ -19,7 +19,7 @@ FTP RETR PASV
  <command>
 ftp://%HOSTIP:%FTPPORT/161
 </command>
-</test>
+</client>
 
 
 # Verify data after the test has been "shot"
diff --git a/tests/data/test162 b/tests/data/test162
index a8d55f326..1c9205965 100644
--- a/tests/data/test162
+++ b/tests/data/test162
@@ -27,7 +27,7 @@ HTTP GET asking for --proxy-ntlm when some other authentication is required
  <command>
 http://%HOSTIP:%HTTPPORT/162 --proxy http://%HOSTIP:%HTTPPORT --proxy-user foo:bar --proxy-ntlm --fail
 </command>
-</test>
+</client>
 
 # Verify data after the test has been "shot"
 <verify>
diff --git a/tests/data/test164 b/tests/data/test164
index 366ea4157..10d5fd657 100644
--- a/tests/data/test164
+++ b/tests/data/test164
@@ -41,7 +41,7 @@ HTTP range with multiple ranges
  <command>
 http://%HOSTIP:%HTTPPORT/want/164 -r 0-10,12-15
 </command>
-</test>
+</client>
 
 # Verify data after the test has been "shot"
 <verify>
diff --git a/tests/data/test165 b/tests/data/test165
index 0475b6903..4945dace5 100644
--- a/tests/data/test165
+++ b/tests/data/test165
@@ -29,7 +29,7 @@ HTTP over proxy with IDN host name
  <command>
 http://www.åäö.se/page/165 -x %HOSTIP:%HTTPPORT
 </command>
-</test>
+</client>
 
 #
 # Verify data after the test has been "shot"
diff --git a/tests/data/test167 b/tests/data/test167
index 4e57fab4a..58ced4061 100644
--- a/tests/data/test167
+++ b/tests/data/test167
@@ -35,7 +35,7 @@ HTTP with proxy-requiring-Basic to site-requiring-Digest
  <command>
 http://data.from.server.requiring.digest.hohoho.com/167 --proxy http://%HOSTIP:%HTTPPORT --proxy-user foo:bar --digest --user digest:alot
 </command>
-</test>
+</client>
 
 # Verify data after the test has been "shot"
 <verify>
diff --git a/tests/data/test168 b/tests/data/test168
index b740a3536..80f37ac25 100644
--- a/tests/data/test168
+++ b/tests/data/test168
@@ -49,7 +49,7 @@ HTTP with proxy-requiring-Digest to site-requiring-Digest
  <command>
 http://data.from.server.requiring.digest.hohoho.com/168 --proxy http://%HOSTIP:%HTTPPORT --proxy-user foo:bar --proxy-digest --digest --user digest:alot
 </command>
-</test>
+</client>
 
 # Verify data after the test has been "shot"
 <verify>
diff --git a/tests/data/test169 b/tests/data/test169
index ee3ce8c06..5cfc8b743 100644
--- a/tests/data/test169
+++ b/tests/data/test169
@@ -74,7 +74,7 @@ HTTP with proxy-requiring-NTLM to site-requiring-Digest
  <command>
 http://data.from.server.requiring.digest.hohoho.com/169 --proxy http://%HOSTIP:%HTTPPORT --proxy-user foo:bar --proxy-ntlm --digest --user digest:alot
 </command>
-</test>
+</client>
 
 # Verify data after the test has been "shot"
 <verify>
diff --git a/tests/data/test17 b/tests/data/test17
index de0e2d303..52e706345 100644
--- a/tests/data/test17
+++ b/tests/data/test17
@@ -31,7 +31,7 @@ request MOOO
  <command>
 -K - %HOSTIP:%HTTPPORT/that.site.com/17
 </command>
-</test>
+</client>
 
 # Verify data after the test has been "shot"
 <verify>
diff --git a/tests/data/test170 b/tests/data/test170
index 46012ad4e..1eb9c8be1 100644
--- a/tests/data/test170
+++ b/tests/data/test170
@@ -16,7 +16,7 @@ HTTP POST with --proxy-ntlm and no SSL with no response
  <command>
 http://a.galaxy.far.far.away/170 --proxy http://%HOSTIP:%HTTPPORT --proxy-user foo:bar --proxy-ntlm -F "dummy=value"
 </command>
-</test>
+</client>
 
 # Verify data after the test has been "shot"
 <verify>
diff --git a/tests/data/test174 b/tests/data/test174
index 6f19a7613..4b8795bab 100644
--- a/tests/data/test174
+++ b/tests/data/test174
@@ -22,7 +22,7 @@ HTTP POST --anyauth to server not requiring any auth at all
  <command>
 http://%HOSTIP:%HTTPPORT/174 -u testuser:testpass --anyauth -d "junkelijunk"
 </command>
-</test>
+</client>
 
 # Verify data after the test has been "shot"
 <verify>
diff --git a/tests/data/test175 b/tests/data/test175
index 1cf9ac481..e8891926a 100644
--- a/tests/data/test175
+++ b/tests/data/test175
@@ -44,7 +44,7 @@ HTTP POST --digest to server not requiring any auth at all
  <command>
 http://%HOSTIP:%HTTPPORT/175 -u auser:apasswd --digest -d "junkelijunk"
 </command>
-</test>
+</client>
 
 # Verify data after the test has been "shot"
 <verify>
diff --git a/tests/data/test176 b/tests/data/test176
index 5d9cbff44..0a35340d8 100644
--- a/tests/data/test176
+++ b/tests/data/test176
@@ -48,7 +48,7 @@ HTTP POST --ntlm to server not requiring any auth at all
  <command>
 http://%HOSTIP:%HTTPPORT/176 -u auser:apasswd --ntlm -d "junkelijunk"
 </command>
-</test>
+</client>
 
 # Verify data after the test has been "shot"
 <verify>
diff --git a/tests/data/test177 b/tests/data/test177
index 9188de045..2d7d04c80 100644
--- a/tests/data/test177
+++ b/tests/data/test177
@@ -21,7 +21,7 @@ HTTP POST --digest to server doing a 302-location response
  <command>
 http://%HOSTIP:%HTTPPORT/177 -u auser:apasswd --digest -d "junkelijunk"
 </command>
-</test>
+</client>
 
 # Verify data after the test has been "shot"
 <verify>
diff --git a/tests/data/test18 b/tests/data/test18
index 38519b46d..df1b70361 100644
--- a/tests/data/test18
+++ b/tests/data/test18
@@ -34,7 +34,7 @@ multiple requests using {} in URL
  <command>
 '%HOSTIP:%HTTPPORT/{18,180002,180003}'
 </command>
-</test>
+</client>
 
 # Verify data after the test has been "shot"
 <verify>
diff --git a/tests/data/test182 b/tests/data/test182
index 5eac8b708..9d13a6a24 100644
--- a/tests/data/test182
+++ b/tests/data/test182
@@ -18,7 +18,7 @@ FTP download an empty file
 <command>
 ftp://%HOSTIP:%FTPPORT/182
 </command>
-</test>
+</client>
 
 # Verify data after the test has been "shot"
 <verify>
diff --git a/tests/data/test183 b/tests/data/test183
index 1278e418d..149eeb447 100644
--- a/tests/data/test183
+++ b/tests/data/test183
@@ -23,7 +23,7 @@ HTTP GET two URLs over a single proxy with persistent connection
  <command>
 http://deathstar.another.galaxy/183 http://a.galaxy.far.far.away/183 --proxy http://%HOSTIP:%HTTPPORT
 </command>
-</test>
+</client>
 
 # Verify data after the test has been "shot"
 <verify>
diff --git a/tests/data/test184 b/tests/data/test184
index 547993f6a..3ce186162 100644
--- a/tests/data/test184
+++ b/tests/data/test184
@@ -43,7 +43,7 @@ HTTP replace Host: when following Location: to new host
  <command>
 http://deathstar.another.galaxy/184 -L -H "Host: another.visitor.stay.a.while.stay.foreeeeeever" --proxy http://%HOSTIP:%HTTPPORT
 </command>
-</test>
+</client>
 
 # Verify data after the test has been "shot"
 <verify>
diff --git a/tests/data/test185 b/tests/data/test185
index 2af7b1425..890a1abb6 100644
--- a/tests/data/test185
+++ b/tests/data/test185
@@ -43,7 +43,7 @@ HTTP replace Host: when following Location: on the same host
  <command>
 http://deathstar.another.galaxy/185 -L -H "Host: another.visitor.stay.a.while.stay.foreeeeeever" --proxy http://%HOSTIP:%HTTPPORT
 </command>
-</test>
+</client>
 
 # Verify data after the test has been "shot"
 <verify>
diff --git a/tests/data/test187 b/tests/data/test187
index dbb86023a..28405d2ad 100644
--- a/tests/data/test187
+++ b/tests/data/test187
@@ -45,7 +45,7 @@ HTTP redirect with bad host name separation and slash in parameters
  <command>
 http://%HOSTIP:%HTTPPORT?oh=what-weird=test/187 -L
 </command>
-</test>
+</client>
 
 # Verify data after the test has been "shot"
 <verify>
diff --git a/tests/data/test188 b/tests/data/test188
index 43724298f..e61cb9d98 100644
--- a/tests/data/test188
+++ b/tests/data/test188
@@ -42,7 +42,7 @@ HTTP GET with resume and redirect
  <command>
 http://%HOSTIP:%HTTPPORT/188 -C 50 -L
 </command>
-</test>
+</client>
 
 # Verify data after the test has been "shot"
 <verify>
diff --git a/tests/data/test189 b/tests/data/test189
index 33d9e406f..535882330 100644
--- a/tests/data/test189
+++ b/tests/data/test189
@@ -39,7 +39,7 @@ HTTP GET with resume and redirect (to a page that doesn't resume)
  <command>
 http://%HOSTIP:%HTTPPORT/189 -C 50 -L
 </command>
-</test>
+</client>
 
 # Verify data after the test has been "shot"
 <verify>
diff --git a/tests/data/test19 b/tests/data/test19
index 0313ec7de..8aaa2023f 100644
--- a/tests/data/test19
+++ b/tests/data/test19
@@ -15,7 +15,7 @@ attempt connect to non-listening socket
  <command>
 %HOSTIP:60000
 </command>
-</test>
+</client>
 
 # Verify data after the test has been "shot"
 <verify>
diff --git a/tests/data/test190 b/tests/data/test190
index 3420c9e67..d5c48fb6c 100644
--- a/tests/data/test190
+++ b/tests/data/test190
@@ -20,7 +20,7 @@ ftp://%HOSTIP:%FTPPORT/path/to/file/126 -m 3
 <file name="log/ftpserver.cmd">
 DELAY CWD 15
 </file>
-</test>
+</client>
 
 # Verify data after the test has been "shot"
 <verify>
diff --git a/tests/data/test191 b/tests/data/test191
index c3baf57bc..91bc24526 100644
--- a/tests/data/test191
+++ b/tests/data/test191
@@ -16,7 +16,7 @@ FTP URL with ?-letters in username and password
  <command>
 "ftp://use?r:pass?word@%HOSTIP:%FTPPORT/191"
 </command>
-</test>
+</client>
 
 # Verify data after the test has been "shot"
 <verify>
diff --git a/tests/data/test195 b/tests/data/test195
index c736e53b3..39b0744ed 100644
--- a/tests/data/test195
+++ b/tests/data/test195
@@ -16,7 +16,7 @@ ftp://%HOSTIP:%FTPPORT/195
 <file name="log/ftpserver.cmd">
 REPLY PASS 530 temporarily not available
 </file>
-</test>
+</client>
 
 # Verify data after the test has been "shot"
 <verify>
diff --git a/tests/data/test196 b/tests/data/test196
index 06eeeb5f9..ec43918b0 100644
--- a/tests/data/test196
+++ b/tests/data/test196
@@ -16,7 +16,7 @@ ftp://%HOSTIP:%FTPPORT/196 --retry 1
 <file name="log/ftpserver.cmd">
 REPLY PASS 530 temporarily not available
 </file>
-</test>
+</client>
 
 # Verify data after the test has been "shot"
 <verify>
diff --git a/tests/data/test2 b/tests/data/test2
index 5b7e85052..ecc996a6c 100644
--- a/tests/data/test2
+++ b/tests/data/test2
@@ -23,7 +23,7 @@ HTTP GET with user and password
  <command>
  -u fake:user http://%HOSTIP:%HTTPPORT/2
 </command>
-</test>
+</client>
 
 #
 # Verify data after the test has been "shot"
diff --git a/tests/data/test20 b/tests/data/test20
index 0b47595d7..5acd69a93 100644
--- a/tests/data/test20
+++ b/tests/data/test20
@@ -15,7 +15,7 @@ attempt connect to non-existing host name
  <command>
 non-existing-and-weeeeeeirdname
 </command>
-</test>
+</client>
 
 # Verify data after the test has been "shot"
 <verify>
diff --git a/tests/data/test200 b/tests/data/test200
index a8af499e3..bd9a448ae 100644
--- a/tests/data/test200
+++ b/tests/data/test200
@@ -27,7 +27,7 @@ bar
    foo
 moo
 </file>
-</test>
+</client>
 
 # Verify data after the test has been "shot"
 <verify>
diff --git a/tests/data/test201 b/tests/data/test201
index 3e6d93797..a2915923e 100644
--- a/tests/data/test201
+++ b/tests/data/test201
@@ -15,7 +15,7 @@ missing file:// file
  <command>
 file://localhost/%PWD/log/non-existant-file.txt
 </command>
-</test>
+</client>
 
 # Verify data after the test has been "shot"
 <verify>
diff --git a/tests/data/test202 b/tests/data/test202
index ef679e07a..937e0beb9 100644
--- a/tests/data/test202
+++ b/tests/data/test202
@@ -18,7 +18,7 @@ file://localhost/%PWD/log/test202.txt file://localhost/%PWD/log/test202.txt
 <file name="log/test202.txt">
 contents in a single file
 </file>
-</test>
+</client>
 
 # Verify data after the test has been "shot"
 <verify>
diff --git a/tests/data/test203 b/tests/data/test203
index 051c8a871..2cec4a69d 100644
--- a/tests/data/test203
+++ b/tests/data/test203
@@ -27,7 +27,7 @@ bar
    foo
 moo
 </file>
-</test>
+</client>
 
 # Verify data after the test has been "shot"
 <verify>
diff --git a/tests/data/test206 b/tests/data/test206
index 7e3c13b0d..7bcba288e 100644
--- a/tests/data/test206
+++ b/tests/data/test206
@@ -58,7 +58,7 @@ HTTP proxy CONNECT auth Digest
  <command>
 http://test.remote.server.com:206/path/2060002 --proxy http://%HOSTIP:%HTTPPORT --proxy-user silly:person --proxy-digest --proxytunnel
 </command>
-</test>
+</client>
 
 # Verify data after the test has been "shot"
 <verify>
diff --git a/tests/data/test207 b/tests/data/test207
index c151d9a78..f40ecf05c 100644
--- a/tests/data/test207
+++ b/tests/data/test207
@@ -33,7 +33,7 @@ HTTP GET with chunked Transfer-Encoding closed pre-maturely
  <command>
 http://%HOSTIP:%HTTPPORT/207
 </command>
-</test>
+</client>
 
 #
 # Verify data after the test has been "shot"
diff --git a/tests/data/test208 b/tests/data/test208
index 2f2c52cf0..2a4669c13 100644
--- a/tests/data/test208
+++ b/tests/data/test208
@@ -32,7 +32,7 @@ the
    PUT
       feature
 </file>
-</test>
+</client>
 
 # Verify data after the test has been "shot"
 <verify>
diff --git a/tests/data/test209 b/tests/data/test209
index 5458d64ae..5aa6e14aa 100644
--- a/tests/data/test209
+++ b/tests/data/test209
@@ -72,7 +72,7 @@ HTTP proxy CONNECT auth NTLM
  <command>
 http://test.remote.server.com:209/path/2090002 --proxy http://%HOSTIP:%HTTPPORT --proxy-user silly:person --proxy-ntlm --proxytunnel
 </command>
-</test>
+</client>
 
 # Verify data after the test has been "shot"
 <verify>
diff --git a/tests/data/test21 b/tests/data/test21
index cbd22947f..2fba375be 100644
--- a/tests/data/test21
+++ b/tests/data/test21
@@ -15,7 +15,7 @@ use curl with multiple request methods
  <command>
 -I -d FOOO -F moo=moo localhost
 </command>
-</test>
+</client>
 
 # Verify data after the test has been "shot"
 <verify>
diff --git a/tests/data/test213 b/tests/data/test213
index 1dc1e1747..64f52cfe4 100644
--- a/tests/data/test213
+++ b/tests/data/test213
@@ -72,7 +72,7 @@ HTTP proxy CONNECT auth NTLM and then POST
  <command>
 http://test.remote.server.com:213/path/2130002 --proxy http://%HOSTIP:%HTTPPORT --proxy-user silly:person --proxy-ntlm --proxytunnel -d "postit"
 </command>
-</test>
+</client>
 
 # Verify data after the test has been "shot"
 <verify>
diff --git a/tests/data/test217 b/tests/data/test217
index 1b0c6a57f..82c8b150b 100644
--- a/tests/data/test217
+++ b/tests/data/test217
@@ -21,7 +21,7 @@ HTTP proxy CONNECT to proxy returning 405
  <command>
 http://test.remote.server.com:217/path/2170002 --proxy http://%HOSTIP:%HTTPPORT --proxytunnel -w '%{http_code} %{http_connect}\n'
 </command>
-</test>
+</client>
 
 # Verify data after the test has been "shot"
 <verify>
diff --git a/tests/data/test22 b/tests/data/test22
index 3e0f21fde..2ffdbc59f 100644
--- a/tests/data/test22
+++ b/tests/data/test22
@@ -20,7 +20,7 @@ get HTTP with URL > 10000 bytes
  <command>
 %HOSTIP:%HTTPPORT/`perl -e 'print "a" x 10000;'`/22
 </command>
-</test>
+</client>
 
 # Verify data after the test has been "shot"
 <verify>
diff --git a/tests/data/test227 b/tests/data/test227
index 34331d4cf..bdfe29d75 100644
--- a/tests/data/test227
+++ b/tests/data/test227
@@ -21,11 +21,10 @@ FTP with quote ops
  <command>
 ftp://%HOSTIP:%FTPPORT/227 -Q "NOOP 1" -Q "+NOOP 2" -Q "-NOOP 3"
 </command>
-</test>
 <file name="log/ftpserver.cmd">
 REPLY EPSV 500 no such command
 </file>
-
+</client>
 
 # Verify data after the test has been "shot"
 <verify>
diff --git a/tests/data/test23 b/tests/data/test23
index f3d860b68..d09d9a71d 100644
--- a/tests/data/test23
+++ b/tests/data/test23
@@ -15,7 +15,7 @@ unsupported protocol:// URL
  <command>
 htfp://%HOSTIP:%HTTPPORT/none.htfml
 </command>
-</test>
+</client>
 
 # Verify data after the test has been "shot"
 <verify>
diff --git a/tests/data/test24 b/tests/data/test24
index b530a234d..046c0a672 100644
--- a/tests/data/test24
+++ b/tests/data/test24
@@ -19,7 +19,7 @@ HTTP GET fail silently on HTTP error return
  <command>
 http://%HOSTIP:%HTTPPORT/24 --fail
 </command>
-</test>
+</client>
 
 # Verify data after the test has been "shot"
 <verify>
diff --git a/tests/data/test25 b/tests/data/test25
index 6cf5dc2bd..71e79ac7d 100644
--- a/tests/data/test25
+++ b/tests/data/test25
@@ -60,7 +60,7 @@ looping HTTP Location: following with --max-redirs, no persistance
  <command>
 http://%HOSTIP:%HTTPPORT/want/25 -L --max-redirs 5
 </command>
-</test>
+</client>
 
 # Verify data after the test has been "shot"
 <verify>
diff --git a/tests/data/test26 b/tests/data/test26
index 818b2208a..0959342e5 100644
--- a/tests/data/test26
+++ b/tests/data/test26
@@ -20,7 +20,7 @@ specify more -o than URLs
  <command>
 http://%HOSTIP:%HTTPPORT/want/26 -o - -o -
 </command>
-</test>
+</client>
 
 # Verify data after the test has been "shot"
 <verify>
diff --git a/tests/data/test27 b/tests/data/test27
index 891b15876..06e26a8d0 100644
--- a/tests/data/test27
+++ b/tests/data/test27
@@ -20,7 +20,7 @@ Get same cookie page several times
  <command>
 'http://%HOSTIP:%HTTPPORT/want/{27,27,27}' -b none
 </command>
-</test>
+</client>
 
 # Verify data after the test has been "shot"
 <verify>
diff --git a/tests/data/test28 b/tests/data/test28
index 9f2923513..6506c10ae 100644
--- a/tests/data/test28
+++ b/tests/data/test28
@@ -45,7 +45,7 @@ HTTP Location: following with extra spaces in header
  <command>
 http://%HOSTIP:%HTTPPORT/want/28 -L
 </command>
-</test>
+</client>
 
 # Verify data after the test has been "shot"
 <verify>
diff --git a/tests/data/test29 b/tests/data/test29
index f5b71436c..9e47ac396 100644
--- a/tests/data/test29
+++ b/tests/data/test29
@@ -23,7 +23,7 @@ HTTP with 2 secs timeout
  <command>
 http://%HOSTIP:%HTTPPORT/want/29 -m 2
 </command>
-</test>
+</client>
 
 # Verify data after the test has been "shot"
 <verify>
diff --git a/tests/data/test3 b/tests/data/test3
index d0413bf06..bf3d01dd6 100644
--- a/tests/data/test3
+++ b/tests/data/test3
@@ -30,7 +30,7 @@ HTTP POST with auth and contents but with content-length set to 0
  <command>
  -d "fooo=mooo&pooo=clue&doo=%20%20%20++++" -u "fake:-user" http://%HOSTIP:%HTTPPORT/3
 </command>
-</test>
+</client>
 
 #
 # Verify data after the test has been "shot"
diff --git a/tests/data/test30 b/tests/data/test30
index 6fa623e92..80bacc50e 100644
--- a/tests/data/test30
+++ b/tests/data/test30
@@ -15,7 +15,7 @@ HTTP with no data in server reply
  <command>
 http://%HOSTIP:%HTTPPORT/want/30
 </command>
-</test>
+</client>
 
 # Verify data after the test has been "shot"
 <verify>
diff --git a/tests/data/test300 b/tests/data/test300
index 6ec21c2bd..4961b9a16 100644
--- a/tests/data/test300
+++ b/tests/data/test300
@@ -23,7 +23,7 @@ simple HTTPS GET
  <command>
 -k https://%HOSTIP:%HTTPSPORT/300
 </command>
-</test>
+</client>
 
 #
 # Verify data after the test has been "shot"
diff --git a/tests/data/test301 b/tests/data/test301
index 58c46ecb6..3f156626b 100644
--- a/tests/data/test301
+++ b/tests/data/test301
@@ -23,7 +23,7 @@ HTTPS GET with user and password
  <command>
 -k -u fake:user https://%HOSTIP:%HTTPSPORT/301
 </command>
-</test>
+</client>
 
 #
 # Verify data after the test has been "shot"
diff --git a/tests/data/test302 b/tests/data/test302
index e8d0413e6..aa3042e9f 100644
--- a/tests/data/test302
+++ b/tests/data/test302
@@ -16,7 +16,7 @@ HTTPS GET over HTTP proxy fails
  <command>
 -k -U fake:user -x %HOSTIP:%HTTPPORT https://bad.fakeurl-to.test/slash/302
 </command>
-</test>
+</client>
 
 #
 # Verify data after the test has been "shot"
diff --git a/tests/data/test303 b/tests/data/test303
index b2654a612..ba45255ff 100644
--- a/tests/data/test303
+++ b/tests/data/test303
@@ -23,7 +23,7 @@ HTTPS with 2 secs timeout
  <command>
 http://%HOSTIP:%HTTPPORT/want/303 -m 2
 </command>
-</test>
+</client>
 
 # Verify data after the test has been "shot"
 <verify>
diff --git a/tests/data/test304 b/tests/data/test304
index 8aaff245f..ed7519072 100644
--- a/tests/data/test304
+++ b/tests/data/test304
@@ -25,7 +25,7 @@ HTTPS multipart formpost
 <file name="log/test304.txt">
 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
 </file>
-</test>
+</client>
 
 # Verify data after the test has been "shot"
 <verify>
diff --git a/tests/data/test305 b/tests/data/test305
index 99e5400c8..a2b07f874 100644
--- a/tests/data/test305
+++ b/tests/data/test305
@@ -15,7 +15,7 @@ insecure HTTPS without permission
  <command>
 https://%HOSTIP:%HTTPPORT/want/305 --cacert moooo
 </command>
-</test>
+</client>
 
 # Verify data after the test has been "shot"
 <verify>
diff --git a/tests/data/test306 b/tests/data/test306
index 646eee4d2..81c524371 100644
--- a/tests/data/test306
+++ b/tests/data/test306
@@ -36,7 +36,7 @@ HTTPS GET, receive no headers only data!
  <command>
 -k https://%HOSTIP:%HTTPSPORT/306
 </command>
-</test>
+</client>
 
 #
 # Verify data after the test has been "shot"
diff --git a/tests/data/test31 b/tests/data/test31
index ac2e4e59e..2433ba34b 100644
--- a/tests/data/test31
+++ b/tests/data/test31
@@ -33,7 +33,7 @@ HTTP with weirdly formatted cookies and cookiejar storage
  <command>
 http://%HOSTIP:%HTTPPORT/we/want/31 -b none -c log/jar31.txt
 </command>
-</test>
+</client>
 
 # Verify data after the test has been "shot"
 <verify>
diff --git a/tests/data/test33 b/tests/data/test33
index bc8c9d93b..804e3c986 100644
--- a/tests/data/test33
+++ b/tests/data/test33
@@ -29,7 +29,7 @@ HTTP PUT with resume
  <command>
 http://%HOSTIP:%HTTPPORT/33 -Tlog/test33.txt -C 50
 </command>
-</test>
+</client>
 
 # Verify data after the test has been "shot"
 <verify>
diff --git a/tests/data/test34 b/tests/data/test34
index 4d646cdd2..9cef0bdec 100644
--- a/tests/data/test34
+++ b/tests/data/test34
@@ -39,7 +39,7 @@ HTTP GET with chunked Transfer-Encoding
  <command>
 http://%HOSTIP:%HTTPPORT/34
 </command>
-</test>
+</client>
 
 #
 # Verify data after the test has been "shot"
diff --git a/tests/data/test36 b/tests/data/test36
index 406b9218f..1ec85e6cf 100644
--- a/tests/data/test36
+++ b/tests/data/test36
@@ -35,7 +35,7 @@ HTTP GET with bad chunked Transfer-Encoding
  <command>
 http://%HOSTIP:%HTTPPORT/36
 </command>
-</test>
+</client>
 
 #
 # Verify data after the test has been "shot"
diff --git a/tests/data/test37 b/tests/data/test37
index 889d6aacb..a374eb162 100644
--- a/tests/data/test37
+++ b/tests/data/test37
@@ -17,7 +17,7 @@ HTTP GET with nothing returned from server
  <command>
 http://%HOSTIP:%HTTPPORT/37
 </command>
-</test>
+</client>
 
 #
 # Verify data after the test has been "shot"
diff --git a/tests/data/test39 b/tests/data/test39
index 15f9e9358..29f6cc398 100644
--- a/tests/data/test39
+++ b/tests/data/test39
@@ -28,7 +28,7 @@ This is a bar foo
 bar
 foo
 </file>
-</test>
+</client>
 
 # Verify data after the test has been "shot"
 <verify>
diff --git a/tests/data/test4 b/tests/data/test4
index 37b081f1c..65f3ba090 100644
--- a/tests/data/test4
+++ b/tests/data/test4
@@ -23,7 +23,7 @@ Replaced internal and added custom HTTP headers
  <command>
  -H "extra-header: here" -H "Accept: replaced" http://%HOSTIP:%HTTPPORT/4
 </command>
-</test>
+</client>
 
 #
 # Verify data after the test has been "shot"
diff --git a/tests/data/test41 b/tests/data/test41
index d8cb36da6..84cb2cff1 100644
--- a/tests/data/test41
+++ b/tests/data/test41
@@ -13,7 +13,7 @@ HTTP formpost with missing file
  <command>
 http://%HOSTIP:%HTTPPORT/want/41 -F moo=@boo
 </command>
-</test>
+</client>
 
 # Verify data after the test has been "shot"
 <verify>
diff --git a/tests/data/test43 b/tests/data/test43
index d03772fce..6d2ce7ddc 100644
--- a/tests/data/test43
+++ b/tests/data/test43
@@ -45,7 +45,7 @@ HTTP Location: following over HTTP proxy
  <command>
 http://%HOSTIP:%HTTPPORT/want/43 -L -x %HOSTIP:%HTTPPORT
 </command>
-</test>
+</client>
 
 # Verify data after the test has been "shot"
 <verify>
diff --git a/tests/data/test44 b/tests/data/test44
index e858786da..b4394182b 100644
--- a/tests/data/test44
+++ b/tests/data/test44
@@ -27,7 +27,7 @@ foo-
 This is a moo-
 bar
 </file>
-</test>
+</client>
 
 # Verify data after the test has been "shot"
 <verify>
diff --git a/tests/data/test45 b/tests/data/test45
index 30a1fea8a..7645bc77d 100644
--- a/tests/data/test45
+++ b/tests/data/test45
@@ -45,7 +45,7 @@ simple HTTP Location: without protocol in initial URL
  <command>
 %HOSTIP:%HTTPPORT/want/45 -L
 </command>
-</test>
+</client>
 
 # Verify data after the test has been "shot"
 <verify>
diff --git a/tests/data/test47 b/tests/data/test47
index a3e53cd14..5118ff6d5 100644
--- a/tests/data/test47
+++ b/tests/data/test47
@@ -22,7 +22,7 @@ simple HTTP 1.0 GET
  <command>
 http://%HOSTIP:%HTTPPORT/47 -0
 </command>
-</test>
+</client>
 
 #
 # Verify data after the test has been "shot"
diff --git a/tests/data/test5 b/tests/data/test5
index 2d2d76f7c..0a3d21f3a 100644
--- a/tests/data/test5
+++ b/tests/data/test5
@@ -23,7 +23,7 @@ HTTP over proxy
  <command>
 http://%HOSTIP:%HTTPPORT/we/want/that/page/5 -x %HOSTIP:%HTTPPORT
 </command>
-</test>
+</client>
 
 #
 # Verify data after the test has been "shot"
diff --git a/tests/data/test54 b/tests/data/test54
index 076311d74..1df072d06 100644
--- a/tests/data/test54
+++ b/tests/data/test54
@@ -20,7 +20,7 @@ HTTP with blank Location:
  <command>
 http://%HOSTIP:%HTTPPORT/want/54 -L
 </command>
-</test>
+</client>
 
 # Verify data after the test has been "shot"
 <verify>
diff --git a/tests/data/test56 b/tests/data/test56
index 098e1e10a..33c276f0c 100644
--- a/tests/data/test56
+++ b/tests/data/test56
@@ -30,7 +30,7 @@ header "Transfer-Encoding: chunked"
  <command>
 -K - %HOSTIP:%HTTPPORT/that.site.com/56
 </command>
-</test>
+</client>
 
 # Verify data after the test has been "shot"
 <verify>
diff --git a/tests/data/test6 b/tests/data/test6
index 910d41fcf..662b847a6 100644
--- a/tests/data/test6
+++ b/tests/data/test6
@@ -22,7 +22,7 @@ HTTP with simple cookie send
  <command>
 http://%HOSTIP:%HTTPPORT/we/want/that/page/6 -b "name=contents;name2=content2"
 </command>
-</test>
+</client>
 
 # Verify data after the test has been "shot"
 <verify>
diff --git a/tests/data/test63 b/tests/data/test63
index 0c2a78b2b..06a7289da 100644
--- a/tests/data/test63
+++ b/tests/data/test63
@@ -23,7 +23,7 @@ http_proxy=http://fake:user@%HOSTIP:%HTTPPORT/
  <command>
 http://we.want.that.site.com/63
 </command>
-</test>
+</client>
 
 # Verify data after the test has been "shot"
 <verify>
diff --git a/tests/data/test64 b/tests/data/test64
index 87acbb682..d596575d7 100644
--- a/tests/data/test64
+++ b/tests/data/test64
@@ -45,7 +45,7 @@ HTTP with Digest authorization
  <command>
 http://%HOSTIP:%HTTPPORT/64 -u testuser:testpass --digest
 </command>
-</test>
+</client>
 
 # Verify data after the test has been "shot"
 <verify>
diff --git a/tests/data/test65 b/tests/data/test65
index b32e77786..0b366f9bf 100644
--- a/tests/data/test65
+++ b/tests/data/test65
@@ -49,7 +49,7 @@ HTTP with Digest authorization with bad password
  <command>
 http://%HOSTIP:%HTTPPORT/65 -u testuser:test2pass --digest
 </command>
-</test>
+</client>
 
 # Verify data after the test has been "shot"
 <verify>
diff --git a/tests/data/test67 b/tests/data/test67
index e2fd51cf2..9462ca8bb 100644
--- a/tests/data/test67
+++ b/tests/data/test67
@@ -56,7 +56,7 @@ HTTP with NTLM authorization
  <command>
 http://%HOSTIP:%HTTPPORT/67 -u testuser:testpass --ntlm
 </command>
-</test>
+</client>
 
 # Verify data after the test has been "shot"
 <verify>
diff --git a/tests/data/test68 b/tests/data/test68
index c4f4eec39..e45b278a2 100644
--- a/tests/data/test68
+++ b/tests/data/test68
@@ -58,7 +58,7 @@ HTTP with NTLM authorization and wrong password
  <command>
 http://%HOSTIP:%HTTPPORT/68 -u testuser:testpass --ntlm
 </command>
-</test>
+</client>
 
 # Verify data after the test has been "shot"
 <verify>
diff --git a/tests/data/test69 b/tests/data/test69
index 5fe3625e1..2ea9c7fdb 100644
--- a/tests/data/test69
+++ b/tests/data/test69
@@ -71,7 +71,7 @@ HTTP with NTLM, Basic or Wild-and-crazy authorization
  <command>
 http://%HOSTIP:%HTTPPORT/69 -u testuser:testpass --anyauth
 </command>
-</test>
+</client>
 
 # Verify data after the test has been "shot"
 <verify>
diff --git a/tests/data/test7 b/tests/data/test7
index ad526e132..0cbeee6f3 100644
--- a/tests/data/test7
+++ b/tests/data/test7
@@ -24,7 +24,7 @@ HTTP with cookie parser and header recording
  <command>
 http://%HOSTIP:%HTTPPORT/we/want/7 -b none -D log/heads7.txt
 </command>
-</test>
+</client>
 
 # Verify data after the test has been "shot"
 <verify>
diff --git a/tests/data/test70 b/tests/data/test70
index 1b73d948f..9ca829c68 100644
--- a/tests/data/test70
+++ b/tests/data/test70
@@ -55,7 +55,7 @@ HTTP with Digest *OR* NTLM authorization
  <command>
 http://%HOSTIP:%HTTPPORT/70 -u testuser:testpass --anyauth
 </command>
-</test>
+</client>
 
 # Verify data after the test has been "shot"
 <verify>
diff --git a/tests/data/test71 b/tests/data/test71
index e18917b95..756fcabcb 100644
--- a/tests/data/test71
+++ b/tests/data/test71
@@ -32,7 +32,7 @@ foo-
 This is a moo-
 bar
 </file>
-</test>
+</client>
 
 # Verify data after the test has been "shot"
 <verify>
diff --git a/tests/data/test72 b/tests/data/test72
index f480840d6..9a649f726 100644
--- a/tests/data/test72
+++ b/tests/data/test72
@@ -51,7 +51,7 @@ HTTP with Digest *OR* Basic authorization
  <command>
 http://%HOSTIP:%HTTPPORT/72 -u testuser:testpass --anyauth
 </command>
-</test>
+</client>
 
 # Verify data after the test has been "shot"
 <verify>
diff --git a/tests/data/test79 b/tests/data/test79
index b13c1ed3b..cc449c4db 100644
--- a/tests/data/test79
+++ b/tests/data/test79
@@ -24,7 +24,7 @@ FTP over HTTP proxy
  <command>
 ftp://%HOSTIP:%HTTPPORT/we/want/that/page/79 -x %HOSTIP:%HTTPPORT
 </command>
-</test>
+</client>
 
 #
 # Verify data after the test has been "shot"
diff --git a/tests/data/test8 b/tests/data/test8
index 4ca750da7..422e36642 100644
--- a/tests/data/test8
+++ b/tests/data/test8
@@ -32,7 +32,7 @@ Set-Cookie: mismatch=this; domain=127.0.0.1; path="/silly/";
 Set-Cookie: partmatch=present; domain=.0.0.1; path=/;
 
 </file>
-</test>
+</client>
 
 # Verify data after the test has been "shot"
 <verify>
diff --git a/tests/data/test80 b/tests/data/test80
index 0f274b252..619d16d48 100644
--- a/tests/data/test80
+++ b/tests/data/test80
@@ -35,7 +35,7 @@ HTTP CONNECT with proxy and host Basic authentication
  <command>
 http://%HOSTIP:%HTTPPORT/we/want/that/page/80 -p -x %HOSTIP:%HTTPPORT --user iam:myself --proxy-user youare:yourself
 </command>
-</test>
+</client>
 
 #
 # Verify data after the test has been "shot"
diff --git a/tests/data/test81 b/tests/data/test81
index 69379b72f..7107392a4 100644
--- a/tests/data/test81
+++ b/tests/data/test81
@@ -54,7 +54,7 @@ HTTP with proxy using NTLM authorization
  <command>
 http://%HOSTIP:%HTTPPORT/81 --proxy-user testuser:testpass -x http://%HOSTIP:%HTTPPORT --proxy-ntlm
 </command>
-</test>
+</client>
 
 # Verify data after the test has been "shot"
 <verify>
diff --git a/tests/data/test82 b/tests/data/test82
index 12d10078c..f6e5e8625 100644
--- a/tests/data/test82
+++ b/tests/data/test82
@@ -26,7 +26,7 @@ HTTP with proxy requiring NTLM, but we send Basic
  <command>
 http://%HOSTIP:%HTTPPORT/82 --proxy-user testuser:testpass -x http://%HOSTIP:%HTTPPORT
 </command>
-</test>
+</client>
 
 # Verify data after the test has been "shot"
 <verify>
diff --git a/tests/data/test83 b/tests/data/test83
index 88b52d3f5..02979342d 100644
--- a/tests/data/test83
+++ b/tests/data/test83
@@ -35,7 +35,7 @@ HTTP over proxy-tunnel with site authentication
  <command>
 http://%HOSTIP:%HTTPPORT/we/want/that/page/83 -p -x %HOSTIP:%HTTPPORT --user iam:myself
 </command>
-</test>
+</client>
 
 #
 # Verify data after the test has been "shot"
diff --git a/tests/data/test84 b/tests/data/test84
index 89a6697a6..d62c5db46 100644
--- a/tests/data/test84
+++ b/tests/data/test84
@@ -24,7 +24,7 @@ HTTP over proxy with site authentication
  <command>
 http://%HOSTIP:%HTTPPORT/we/want/that/page/84 -x %HOSTIP:%HTTPPORT --user iam:myself
 </command>
-</test>
+</client>
 
 #
 # Verify data after the test has been "shot"
diff --git a/tests/data/test85 b/tests/data/test85
index 399b3a2ef..c775e802b 100644
--- a/tests/data/test85
+++ b/tests/data/test85
@@ -24,7 +24,7 @@ HTTP over proxy with site and proxy authentication
  <command>
 http://%HOSTIP:%HTTPPORT/we/want/that/page/85 -x %HOSTIP:%HTTPPORT --user iam:myself --proxy-user testing:this
 </command>
-</test>
+</client>
 
 #
 # Verify data after the test has been "shot"
diff --git a/tests/data/test89 b/tests/data/test89
index 5b5b3d27e..be965f710 100644
--- a/tests/data/test89
+++ b/tests/data/test89
@@ -88,7 +88,7 @@ HTTP with NTLM and follow-location
  <command>
 http://%HOSTIP:%HTTPPORT/89 -u testuser:testpass --ntlm -L
 </command>
-</test>
+</client>
 
 # Verify data after the test has been "shot"
 <verify>
diff --git a/tests/data/test90 b/tests/data/test90
index 6c3475a06..50e58b6cc 100644
--- a/tests/data/test90
+++ b/tests/data/test90
@@ -122,7 +122,7 @@ HTTP with NTLM via --anyauth, and then follow-location with NTLM again
  <command>
 http://%HOSTIP:%HTTPPORT/90 -u testuser:testpass --anyauth -L
 </command>
-</test>
+</client>
 
 # Verify data after the test has been "shot"
 <verify>
diff --git a/tests/data/test91 b/tests/data/test91
index f571e7c0d..3232744e8 100644
--- a/tests/data/test91
+++ b/tests/data/test91
@@ -74,7 +74,7 @@ HTTP with NTLM/Negotiate/Basic, anyauth and user with domain, with size 0
  <command>
 http://%HOSTIP:%HTTPPORT/91 --anyauth -u mydomain\\myself:secret
 </command>
-</test>
+</client>
 
 # Verify data after the test has been "shot"
 <verify>
diff --git a/tests/data/test95 b/tests/data/test95
index 22b4416be..334a21cb2 100644
--- a/tests/data/test95
+++ b/tests/data/test95
@@ -35,7 +35,7 @@ HTTP over proxytunnel using POST
  <command>
 http://%HOSTIP:%HTTPPORT/we/want/that/page/95 -p -x %HOSTIP:%HTTPPORT -d "datatopost=ohthatsfunyesyes"
 </command>
-</test>
+</client>
 
 #
 # Verify data after the test has been "shot"
diff --git a/tests/data/test97 b/tests/data/test97
index e3673b984..040462941 100644
--- a/tests/data/test97
+++ b/tests/data/test97
@@ -23,7 +23,7 @@ HTTP POST with custom content-type
  <command>
  -d "hejsanallabarn" -H "Content-Type: silly/type" http://%HOSTIP:%HTTPPORT/97
 </command>
-</test>
+</client>
 
 #
 # Verify data after the test has been "shot"
diff --git a/tests/ftpserver.pl b/tests/ftpserver.pl
index 866090888..422c43097 100644
--- a/tests/ftpserver.pl
+++ b/tests/ftpserver.pl
@@ -125,6 +125,7 @@ my %commandok = (
                  'STOR' => 'twosock',
                  'APPE' => 'twosock',
                  'REST' => 'twosock',
+                 'ACCT' => 'loggedin',
                  'CWD'  => 'loggedin|twosock',
                  'SYST' => 'loggedin',
                  'SIZE' => 'loggedin|twosock',