diff --git a/tests/data/test1335 b/tests/data/test1335
index 3f43c7a57..bb499e73f 100644
--- a/tests/data/test1335
+++ b/tests/data/test1335
@@ -9,13 +9,13 @@ HTTP GET
 #
 <reply>
 <data nocheck="yes">
-HTTP/1.1 200 OK
-Date: Thu, 09 Nov 2010 14:49:00 GMT
-Server: test-server/fake
-Content-Length: 6
-Connection: close
-Content-Type: text/html
-
+HTTP/1.1 200 OK
+Date: Thu, 09 Nov 2010 14:49:00 GMT
+Server: test-server/fake
+Content-Length: 6
+Connection: close
+Content-Type: text/html
+
 12345
 </data>
 </reply>
@@ -55,18 +55,18 @@ Accept: */*
 
 </protocol>
 
-<file1 name="log/1335" mode="text">
+<file1 name="log/1335">
 12345
 </file1>
 
-<file2 name="log/stdout1335" mode="text">
-HTTP/1.1 200 OK
-Date: Thu, 09 Nov 2010 14:49:00 GMT
-Server: test-server/fake
-Content-Length: 6
-Connection: close
-Content-Type: text/html
-
+<file2 name="log/stdout1335">
+HTTP/1.1 200 OK
+Date: Thu, 09 Nov 2010 14:49:00 GMT
+Server: test-server/fake
+Content-Length: 6
+Connection: close
+Content-Type: text/html
+
 </file2>
 
 </verify>
diff --git a/tests/data/test1337 b/tests/data/test1337
index 4044190e5..80a99facf 100644
--- a/tests/data/test1337
+++ b/tests/data/test1337
@@ -9,14 +9,14 @@ HTTP GET
 #
 <reply>
 <data nocheck="yes">
-HTTP/1.1 200 OK
-Date: Thu, 09 Nov 2010 14:49:00 GMT
-Server: test-server/fake
-Content-Length: 6
-Connection: close
-Content-Type: text/html
-Content-Disposition: filename=name1337; charset=funny; option=strange
-
+HTTP/1.1 200 OK
+Date: Thu, 09 Nov 2010 14:49:00 GMT
+Server: test-server/fake
+Content-Length: 6
+Connection: close
+Content-Type: text/html
+Content-Disposition: filename=name1337; charset=funny; option=strange
+
 12345
 </data>
 </reply>
@@ -59,19 +59,19 @@ Accept: */*
 
 </protocol>
 
-<file1 name="log/1337" mode="text">
+<file1 name="log/1337">
 12345
 </file1>
 
-<file2 name="log/stdout1337" mode="text">
-HTTP/1.1 200 OK
-Date: Thu, 09 Nov 2010 14:49:00 GMT
-Server: test-server/fake
-Content-Length: 6
-Connection: close
-Content-Type: text/html
-Content-Disposition: filename=name1337; charset=funny; option=strange
-
+<file2 name="log/stdout1337">
+HTTP/1.1 200 OK
+Date: Thu, 09 Nov 2010 14:49:00 GMT
+Server: test-server/fake
+Content-Length: 6
+Connection: close
+Content-Type: text/html
+Content-Disposition: filename=name1337; charset=funny; option=strange
+
 </file2>
 
 </verify>
diff --git a/tests/data/test1339 b/tests/data/test1339
index 06106ad4b..a3c1f0e54 100644
--- a/tests/data/test1339
+++ b/tests/data/test1339
@@ -10,13 +10,13 @@ HTTP GET
 #
 <reply>
 <data nocheck="yes">
-HTTP/1.1 200 OK
-Date: Thu, 09 Nov 2010 14:49:00 GMT
-Server: test-server/fake
-Content-Length: 6
-Connection: close
-Content-Type: text/html
-
+HTTP/1.1 200 OK
+Date: Thu, 09 Nov 2010 14:49:00 GMT
+Server: test-server/fake
+Content-Length: 6
+Connection: close
+Content-Type: text/html
+
 12345
 </data>
 </reply>
@@ -56,18 +56,18 @@ Accept: */*
 
 </protocol>
 
-<file1 name="log/1339" mode="text">
+<file1 name="log/1339">
 12345
 </file1>
 
-<file2 name="log/stdout1339" mode="text">
-HTTP/1.1 200 OK
-Date: Thu, 09 Nov 2010 14:49:00 GMT
-Server: test-server/fake
-Content-Length: 6
-Connection: close
-Content-Type: text/html
-
+<file2 name="log/stdout1339">
+HTTP/1.1 200 OK
+Date: Thu, 09 Nov 2010 14:49:00 GMT
+Server: test-server/fake
+Content-Length: 6
+Connection: close
+Content-Type: text/html
+
 </file2>
 
 </verify>
diff --git a/tests/data/test1341 b/tests/data/test1341
index 013a8884f..b364edeb1 100644
--- a/tests/data/test1341
+++ b/tests/data/test1341
@@ -10,14 +10,14 @@ HTTP GET
 #
 <reply>
 <data nocheck="yes">
-HTTP/1.1 200 OK
-Date: Thu, 09 Nov 2010 14:49:00 GMT
-Server: test-server/fake
-Content-Length: 6
-Connection: close
-Content-Type: text/html
-Content-Disposition: filename=name1341; charset=funny; option=strange
-
+HTTP/1.1 200 OK
+Date: Thu, 09 Nov 2010 14:49:00 GMT
+Server: test-server/fake
+Content-Length: 6
+Connection: close
+Content-Type: text/html
+Content-Disposition: filename=name1341; charset=funny; option=strange
+
 12345
 </data>
 </reply>
@@ -57,19 +57,19 @@ Accept: */*
 
 </protocol>
 
-<file1 name="log/name1341" mode="text">
+<file1 name="log/name1341">
 12345
 </file1>
 
-<file2 name="log/stdout1341" mode="text">
-HTTP/1.1 200 OK
-Date: Thu, 09 Nov 2010 14:49:00 GMT
-Server: test-server/fake
-Content-Length: 6
-Connection: close
-Content-Type: text/html
-Content-Disposition: filename=name1341; charset=funny; option=strange
-
+<file2 name="log/stdout1341">
+HTTP/1.1 200 OK
+Date: Thu, 09 Nov 2010 14:49:00 GMT
+Server: test-server/fake
+Content-Length: 6
+Connection: close
+Content-Type: text/html
+Content-Disposition: filename=name1341; charset=funny; option=strange
+
 curl: Saved to filename '%PWD/log/name1341'
 </file2>
 
diff --git a/tests/data/test1343 b/tests/data/test1343
index 904a3791c..a05cab04c 100644
--- a/tests/data/test1343
+++ b/tests/data/test1343
@@ -9,13 +9,13 @@ HTTP GET
 #
 <reply>
 <data nocheck="yes">
-HTTP/1.1 200 OK
-Date: Thu, 09 Nov 2010 14:49:00 GMT
-Server: test-server/fake
-Content-Length: 6
-Connection: close
-Content-Type: text/html
-
+HTTP/1.1 200 OK
+Date: Thu, 09 Nov 2010 14:49:00 GMT
+Server: test-server/fake
+Content-Length: 6
+Connection: close
+Content-Type: text/html
+
 12345
 </data>
 </reply>
@@ -55,25 +55,25 @@ Accept: */*
 
 </protocol>
 
-<file1 name="log/1343" mode="text">
-HTTP/1.1 200 OK
-Date: Thu, 09 Nov 2010 14:49:00 GMT
-Server: test-server/fake
-Content-Length: 6
-Connection: close
-Content-Type: text/html
-
+<file1 name="log/1343">
+HTTP/1.1 200 OK
+Date: Thu, 09 Nov 2010 14:49:00 GMT
+Server: test-server/fake
+Content-Length: 6
+Connection: close
+Content-Type: text/html
+
 12345
 </file1>
 
-<file2 name="log/stdout1343" mode="text">
-HTTP/1.1 200 OK
-Date: Thu, 09 Nov 2010 14:49:00 GMT
-Server: test-server/fake
-Content-Length: 6
-Connection: close
-Content-Type: text/html
-
+<file2 name="log/stdout1343">
+HTTP/1.1 200 OK
+Date: Thu, 09 Nov 2010 14:49:00 GMT
+Server: test-server/fake
+Content-Length: 6
+Connection: close
+Content-Type: text/html
+
 </file2>
 
 </verify>
diff --git a/tests/data/test1345 b/tests/data/test1345
index 7d5372809..6d1201e16 100644
--- a/tests/data/test1345
+++ b/tests/data/test1345
@@ -9,14 +9,14 @@ HTTP GET
 #
 <reply>
 <data nocheck="yes">
-HTTP/1.1 200 OK
-Date: Thu, 09 Nov 2010 14:49:00 GMT
-Server: test-server/fake
-Content-Length: 6
-Connection: close
-Content-Type: text/html
-Content-Disposition: filename=name1345; charset=funny; option=strange
-
+HTTP/1.1 200 OK
+Date: Thu, 09 Nov 2010 14:49:00 GMT
+Server: test-server/fake
+Content-Length: 6
+Connection: close
+Content-Type: text/html
+Content-Disposition: filename=name1345; charset=funny; option=strange
+
 12345
 </data>
 </reply>
@@ -59,27 +59,27 @@ Accept: */*
 
 </protocol>
 
-<file1 name="log/1345" mode="text">
-HTTP/1.1 200 OK
-Date: Thu, 09 Nov 2010 14:49:00 GMT
-Server: test-server/fake
-Content-Length: 6
-Connection: close
-Content-Type: text/html
-Content-Disposition: filename=name1345; charset=funny; option=strange
-
+<file1 name="log/1345">
+HTTP/1.1 200 OK
+Date: Thu, 09 Nov 2010 14:49:00 GMT
+Server: test-server/fake
+Content-Length: 6
+Connection: close
+Content-Type: text/html
+Content-Disposition: filename=name1345; charset=funny; option=strange
+
 12345
 </file1>
 
-<file2 name="log/stdout1345" mode="text">
-HTTP/1.1 200 OK
-Date: Thu, 09 Nov 2010 14:49:00 GMT
-Server: test-server/fake
-Content-Length: 6
-Connection: close
-Content-Type: text/html
-Content-Disposition: filename=name1345; charset=funny; option=strange
-
+<file2 name="log/stdout1345">
+HTTP/1.1 200 OK
+Date: Thu, 09 Nov 2010 14:49:00 GMT
+Server: test-server/fake
+Content-Length: 6
+Connection: close
+Content-Type: text/html
+Content-Disposition: filename=name1345; charset=funny; option=strange
+
 </file2>
 
 </verify>
diff --git a/tests/data/test1346 b/tests/data/test1346
index eda9a2c29..347214e69 100644
--- a/tests/data/test1346
+++ b/tests/data/test1346
@@ -9,13 +9,13 @@ HTTP GET
 #
 <reply>
 <data nocheck="yes">
-HTTP/1.1 200 OK
-Date: Thu, 09 Nov 2010 14:49:00 GMT
-Server: test-server/fake
-Content-Length: 6
-Connection: close
-Content-Type: text/html
-
+HTTP/1.1 200 OK
+Date: Thu, 09 Nov 2010 14:49:00 GMT
+Server: test-server/fake
+Content-Length: 6
+Connection: close
+Content-Type: text/html
+
 12345
 </data>
 </reply>
@@ -55,18 +55,18 @@ Accept: */*
 
 </protocol>
 
-<file1 name="log/1346" mode="text">
-HTTP/1.1 200 OK
-Date: Thu, 09 Nov 2010 14:49:00 GMT
-Server: test-server/fake
-Content-Length: 6
-Connection: close
-Content-Type: text/html
-
+<file1 name="log/1346">
+HTTP/1.1 200 OK
+Date: Thu, 09 Nov 2010 14:49:00 GMT
+Server: test-server/fake
+Content-Length: 6
+Connection: close
+Content-Type: text/html
+
 12345
 </file1>
 
-<file2 name="log/stdout1346" mode="text">
+<file2 name="log/stdout1346">
 </file2>
 
 </verify>
diff --git a/tests/data/test1347 b/tests/data/test1347
index b2218467b..8eac42cb2 100644
--- a/tests/data/test1347
+++ b/tests/data/test1347
@@ -9,14 +9,14 @@ HTTP GET
 #
 <reply>
 <data nocheck="yes">
-HTTP/1.1 200 OK
-Date: Thu, 09 Nov 2010 14:49:00 GMT
-Server: test-server/fake
-Content-Length: 6
-Connection: close
-Content-Type: text/html
-Content-Disposition: filename=name1347; charset=funny; option=strange
-
+HTTP/1.1 200 OK
+Date: Thu, 09 Nov 2010 14:49:00 GMT
+Server: test-server/fake
+Content-Length: 6
+Connection: close
+Content-Type: text/html
+Content-Disposition: filename=name1347; charset=funny; option=strange
+
 12345
 </data>
 </reply>
@@ -59,19 +59,19 @@ Accept: */*
 
 </protocol>
 
-<file1 name="log/1347" mode="text">
-HTTP/1.1 200 OK
-Date: Thu, 09 Nov 2010 14:49:00 GMT
-Server: test-server/fake
-Content-Length: 6
-Connection: close
-Content-Type: text/html
-Content-Disposition: filename=name1347; charset=funny; option=strange
-
+<file1 name="log/1347">
+HTTP/1.1 200 OK
+Date: Thu, 09 Nov 2010 14:49:00 GMT
+Server: test-server/fake
+Content-Length: 6
+Connection: close
+Content-Type: text/html
+Content-Disposition: filename=name1347; charset=funny; option=strange
+
 12345
 </file1>
 
-<file2 name="log/stdout1347" mode="text">
+<file2 name="log/stdout1347">
 </file2>
 
 </verify>
diff --git a/tests/data/test1356 b/tests/data/test1356
index adc734640..ea610a565 100644
--- a/tests/data/test1356
+++ b/tests/data/test1356
@@ -10,14 +10,14 @@ RETR
 <reply>
 # file1356 contents...
 <data nocheck="yes">
-HTTP/1.1 200 OK
-Date: Thu, 09 Nov 2010 14:49:00 GMT
-Server: test-server/fake
-Content-Length: 6
-Connection: close
-Content-Type: text/html
-Content-Disposition: filename=name1356; charset=funny; option=strange
-
+HTTP/1.1 200 OK
+Date: Thu, 09 Nov 2010 14:49:00 GMT
+Server: test-server/fake
+Content-Length: 6
+Connection: close
+Content-Type: text/html
+Content-Disposition: filename=name1356; charset=funny; option=strange
+
 MOOOO
 </data>
 </reply>
@@ -60,19 +60,19 @@ RETR file1356
 QUIT
 </protocol>
 
-<file1 name="log/file1356" mode="text">
-HTTP/1.1 200 OK
-Date: Thu, 09 Nov 2010 14:49:00 GMT
-Server: test-server/fake
-Content-Length: 6
-Connection: close
-Content-Type: text/html
-Content-Disposition: filename=name1356; charset=funny; option=strange
-
+<file1 name="log/file1356">
+HTTP/1.1 200 OK
+Date: Thu, 09 Nov 2010 14:49:00 GMT
+Server: test-server/fake
+Content-Length: 6
+Connection: close
+Content-Type: text/html
+Content-Disposition: filename=name1356; charset=funny; option=strange
+
 MOOOO
 </file1>
 
-<file2 name="log/stdout1356" mode="text">
+<file2 name="log/stdout1356">
 </file2>
 
 </verify>
diff --git a/tests/data/test1363 b/tests/data/test1363
index fedc6fcc7..c34f05a0e 100644
--- a/tests/data/test1363
+++ b/tests/data/test1363
@@ -10,14 +10,14 @@ RETR
 <reply>
 # file1363 contents...
 <data nocheck="yes">
-HTTP/1.1 200 OK
-Date: Thu, 09 Nov 2010 14:49:00 GMT
-Server: test-server/fake
-Content-Length: 6
-Connection: close
-Content-Type: text/html
-Content-Disposition: filename=name1363; charset=funny; option=strange
-
+HTTP/1.1 200 OK
+Date: Thu, 09 Nov 2010 14:49:00 GMT
+Server: test-server/fake
+Content-Length: 6
+Connection: close
+Content-Type: text/html
+Content-Disposition: filename=name1363; charset=funny; option=strange
+
 MOOOO
 </data>
 </reply>
@@ -60,19 +60,19 @@ RETR file1363
 QUIT
 </protocol>
 
-<file1 name="log/file1363" mode="text">
-HTTP/1.1 200 OK
-Date: Thu, 09 Nov 2010 14:49:00 GMT
-Server: test-server/fake
-Content-Length: 6
-Connection: close
-Content-Type: text/html
-Content-Disposition: filename=name1363; charset=funny; option=strange
-
+<file1 name="log/file1363">
+HTTP/1.1 200 OK
+Date: Thu, 09 Nov 2010 14:49:00 GMT
+Server: test-server/fake
+Content-Length: 6
+Connection: close
+Content-Type: text/html
+Content-Disposition: filename=name1363; charset=funny; option=strange
+
 MOOOO
 </file1>
 
-<file2 name="log/stdout1363" mode="text">
+<file2 name="log/stdout1363">
 </file2>
 
 </verify>
diff --git a/tests/data/test1365 b/tests/data/test1365
index f5e95e8eb..4a09cfd6a 100644
--- a/tests/data/test1365
+++ b/tests/data/test1365
@@ -9,13 +9,13 @@ HTTP GET
 #
 <reply>
 <data nocheck="yes">
-HTTP/1.1 200 OK
-Date: Thu, 09 Nov 2010 14:49:00 GMT
-Server: test-server/fake
-Content-Length: 6
-Connection: close
-Content-Type: text/html
-
+HTTP/1.1 200 OK
+Date: Thu, 09 Nov 2010 14:49:00 GMT
+Server: test-server/fake
+Content-Length: 6
+Connection: close
+Content-Type: text/html
+
 12345
 </data>
 </reply>
@@ -50,18 +50,18 @@ Accept: */*
 
 </protocol>
 
-<file1 name="log/outfile1365" mode="text">
+<file1 name="log/outfile1365">
 12345
 </file1>
 
-<file2 name="log/stdout1365" mode="text">
-HTTP/1.1 200 OK
-Date: Thu, 09 Nov 2010 14:49:00 GMT
-Server: test-server/fake
-Content-Length: 6
-Connection: close
-Content-Type: text/html
-
+<file2 name="log/stdout1365">
+HTTP/1.1 200 OK
+Date: Thu, 09 Nov 2010 14:49:00 GMT
+Server: test-server/fake
+Content-Length: 6
+Connection: close
+Content-Type: text/html
+
 </file2>
 
 </verify>
diff --git a/tests/data/test1367 b/tests/data/test1367
index 6b576b73f..d4bd3d777 100644
--- a/tests/data/test1367
+++ b/tests/data/test1367
@@ -9,14 +9,14 @@ HTTP GET
 #
 <reply>
 <data nocheck="yes">
-HTTP/1.1 200 OK
-Date: Thu, 09 Nov 2010 14:49:00 GMT
-Server: test-server/fake
-Content-Length: 6
-Connection: close
-Content-Type: text/html
-Content-Disposition: filename=name1367; charset=funny; option=strange
-
+HTTP/1.1 200 OK
+Date: Thu, 09 Nov 2010 14:49:00 GMT
+Server: test-server/fake
+Content-Length: 6
+Connection: close
+Content-Type: text/html
+Content-Disposition: filename=name1367; charset=funny; option=strange
+
 12345
 </data>
 </reply>
@@ -51,19 +51,19 @@ Accept: */*
 
 </protocol>
 
-<file1 name="log/outfile1367" mode="text">
+<file1 name="log/outfile1367">
 12345
 </file1>
 
-<file2 name="log/stdout1367" mode="text">
-HTTP/1.1 200 OK
-Date: Thu, 09 Nov 2010 14:49:00 GMT
-Server: test-server/fake
-Content-Length: 6
-Connection: close
-Content-Type: text/html
-Content-Disposition: filename=name1367; charset=funny; option=strange
-
+<file2 name="log/stdout1367">
+HTTP/1.1 200 OK
+Date: Thu, 09 Nov 2010 14:49:00 GMT
+Server: test-server/fake
+Content-Length: 6
+Connection: close
+Content-Type: text/html
+Content-Disposition: filename=name1367; charset=funny; option=strange
+
 </file2>
 
 </verify>
diff --git a/tests/data/test1369 b/tests/data/test1369
index a24665a88..5176ed0b0 100644
--- a/tests/data/test1369
+++ b/tests/data/test1369
@@ -10,13 +10,13 @@ HTTP GET
 #
 <reply>
 <data nocheck="yes">
-HTTP/1.1 200 OK
-Date: Thu, 09 Nov 2010 14:49:00 GMT
-Server: test-server/fake
-Content-Length: 6
-Connection: close
-Content-Type: text/html
-
+HTTP/1.1 200 OK
+Date: Thu, 09 Nov 2010 14:49:00 GMT
+Server: test-server/fake
+Content-Length: 6
+Connection: close
+Content-Type: text/html
+
 12345
 </data>
 </reply>
@@ -51,18 +51,18 @@ Accept: */*
 
 </protocol>
 
-<file1 name="log/outfile1369" mode="text">
+<file1 name="log/outfile1369">
 12345
 </file1>
 
-<file2 name="log/stdout1369" mode="text">
-HTTP/1.1 200 OK
-Date: Thu, 09 Nov 2010 14:49:00 GMT
-Server: test-server/fake
-Content-Length: 6
-Connection: close
-Content-Type: text/html
-
+<file2 name="log/stdout1369">
+HTTP/1.1 200 OK
+Date: Thu, 09 Nov 2010 14:49:00 GMT
+Server: test-server/fake
+Content-Length: 6
+Connection: close
+Content-Type: text/html
+
 </file2>
 
 </verify>
diff --git a/tests/data/test1371 b/tests/data/test1371
index 31a64a31e..fe3977fae 100644
--- a/tests/data/test1371
+++ b/tests/data/test1371
@@ -10,14 +10,14 @@ HTTP GET
 #
 <reply>
 <data nocheck="yes">
-HTTP/1.1 200 OK
-Date: Thu, 09 Nov 2010 14:49:00 GMT
-Server: test-server/fake
-Content-Length: 6
-Connection: close
-Content-Type: text/html
-Content-Disposition: filename=name1371; charset=funny; option=strange
-
+HTTP/1.1 200 OK
+Date: Thu, 09 Nov 2010 14:49:00 GMT
+Server: test-server/fake
+Content-Length: 6
+Connection: close
+Content-Type: text/html
+Content-Disposition: filename=name1371; charset=funny; option=strange
+
 12345
 </data>
 </reply>
@@ -52,19 +52,19 @@ Accept: */*
 
 </protocol>
 
-<file1 name="log/outfile1371" mode="text">
+<file1 name="log/outfile1371">
 12345
 </file1>
 
-<file2 name="log/stdout1371" mode="text">
-HTTP/1.1 200 OK
-Date: Thu, 09 Nov 2010 14:49:00 GMT
-Server: test-server/fake
-Content-Length: 6
-Connection: close
-Content-Type: text/html
-Content-Disposition: filename=name1371; charset=funny; option=strange
-
+<file2 name="log/stdout1371">
+HTTP/1.1 200 OK
+Date: Thu, 09 Nov 2010 14:49:00 GMT
+Server: test-server/fake
+Content-Length: 6
+Connection: close
+Content-Type: text/html
+Content-Disposition: filename=name1371; charset=funny; option=strange
+
 </file2>
 
 </verify>
diff --git a/tests/data/test1373 b/tests/data/test1373
index 2f6e3bdb4..ae906d7bd 100644
--- a/tests/data/test1373
+++ b/tests/data/test1373
@@ -9,13 +9,13 @@ HTTP GET
 #
 <reply>
 <data nocheck="yes">
-HTTP/1.1 200 OK
-Date: Thu, 09 Nov 2010 14:49:00 GMT
-Server: test-server/fake
-Content-Length: 6
-Connection: close
-Content-Type: text/html
-
+HTTP/1.1 200 OK
+Date: Thu, 09 Nov 2010 14:49:00 GMT
+Server: test-server/fake
+Content-Length: 6
+Connection: close
+Content-Type: text/html
+
 12345
 </data>
 </reply>
@@ -50,25 +50,25 @@ Accept: */*
 
 </protocol>
 
-<file1 name="log/outfile1373" mode="text">
-HTTP/1.1 200 OK
-Date: Thu, 09 Nov 2010 14:49:00 GMT
-Server: test-server/fake
-Content-Length: 6
-Connection: close
-Content-Type: text/html
-
+<file1 name="log/outfile1373">
+HTTP/1.1 200 OK
+Date: Thu, 09 Nov 2010 14:49:00 GMT
+Server: test-server/fake
+Content-Length: 6
+Connection: close
+Content-Type: text/html
+
 12345
 </file1>
 
-<file2 name="log/stdout1373" mode="text">
-HTTP/1.1 200 OK
-Date: Thu, 09 Nov 2010 14:49:00 GMT
-Server: test-server/fake
-Content-Length: 6
-Connection: close
-Content-Type: text/html
-
+<file2 name="log/stdout1373">
+HTTP/1.1 200 OK
+Date: Thu, 09 Nov 2010 14:49:00 GMT
+Server: test-server/fake
+Content-Length: 6
+Connection: close
+Content-Type: text/html
+
 </file2>
 
 </verify>
diff --git a/tests/data/test1375 b/tests/data/test1375
index 717b645fb..595f03ac1 100644
--- a/tests/data/test1375
+++ b/tests/data/test1375
@@ -9,14 +9,14 @@ HTTP GET
 #
 <reply>
 <data nocheck="yes">
-HTTP/1.1 200 OK
-Date: Thu, 09 Nov 2010 14:49:00 GMT
-Server: test-server/fake
-Content-Length: 6
-Connection: close
-Content-Type: text/html
-Content-Disposition: filename=name1375; charset=funny; option=strange
-
+HTTP/1.1 200 OK
+Date: Thu, 09 Nov 2010 14:49:00 GMT
+Server: test-server/fake
+Content-Length: 6
+Connection: close
+Content-Type: text/html
+Content-Disposition: filename=name1375; charset=funny; option=strange
+
 12345
 </data>
 </reply>
@@ -51,27 +51,27 @@ Accept: */*
 
 </protocol>
 
-<file1 name="log/outfile1375" mode="text">
-HTTP/1.1 200 OK
-Date: Thu, 09 Nov 2010 14:49:00 GMT
-Server: test-server/fake
-Content-Length: 6
-Connection: close
-Content-Type: text/html
-Content-Disposition: filename=name1375; charset=funny; option=strange
-
+<file1 name="log/outfile1375">
+HTTP/1.1 200 OK
+Date: Thu, 09 Nov 2010 14:49:00 GMT
+Server: test-server/fake
+Content-Length: 6
+Connection: close
+Content-Type: text/html
+Content-Disposition: filename=name1375; charset=funny; option=strange
+
 12345
 </file1>
 
-<file2 name="log/stdout1375" mode="text">
-HTTP/1.1 200 OK
-Date: Thu, 09 Nov 2010 14:49:00 GMT
-Server: test-server/fake
-Content-Length: 6
-Connection: close
-Content-Type: text/html
-Content-Disposition: filename=name1375; charset=funny; option=strange
-
+<file2 name="log/stdout1375">
+HTTP/1.1 200 OK
+Date: Thu, 09 Nov 2010 14:49:00 GMT
+Server: test-server/fake
+Content-Length: 6
+Connection: close
+Content-Type: text/html
+Content-Disposition: filename=name1375; charset=funny; option=strange
+
 </file2>
 
 </verify>
diff --git a/tests/data/test1376 b/tests/data/test1376
index 02068db0d..f34c27745 100644
--- a/tests/data/test1376
+++ b/tests/data/test1376
@@ -9,13 +9,13 @@ HTTP GET
 #
 <reply>
 <data nocheck="yes">
-HTTP/1.1 200 OK
-Date: Thu, 09 Nov 2010 14:49:00 GMT
-Server: test-server/fake
-Content-Length: 6
-Connection: close
-Content-Type: text/html
-
+HTTP/1.1 200 OK
+Date: Thu, 09 Nov 2010 14:49:00 GMT
+Server: test-server/fake
+Content-Length: 6
+Connection: close
+Content-Type: text/html
+
 12345
 </data>
 </reply>
@@ -50,18 +50,18 @@ Accept: */*
 
 </protocol>
 
-<file1 name="log/outfile1376" mode="text">
-HTTP/1.1 200 OK
-Date: Thu, 09 Nov 2010 14:49:00 GMT
-Server: test-server/fake
-Content-Length: 6
-Connection: close
-Content-Type: text/html
-
+<file1 name="log/outfile1376">
+HTTP/1.1 200 OK
+Date: Thu, 09 Nov 2010 14:49:00 GMT
+Server: test-server/fake
+Content-Length: 6
+Connection: close
+Content-Type: text/html
+
 12345
 </file1>
 
-<file2 name="log/stdout1376" mode="text">
+<file2 name="log/stdout1376">
 </file2>
 
 </verify>
diff --git a/tests/data/test1377 b/tests/data/test1377
index fede100c9..f542b11c7 100644
--- a/tests/data/test1377
+++ b/tests/data/test1377
@@ -9,14 +9,14 @@ HTTP GET
 #
 <reply>
 <data nocheck="yes">
-HTTP/1.1 200 OK
-Date: Thu, 09 Nov 2010 14:49:00 GMT
-Server: test-server/fake
-Content-Length: 6
-Connection: close
-Content-Type: text/html
-Content-Disposition: filename=name1377; charset=funny; option=strange
-
+HTTP/1.1 200 OK
+Date: Thu, 09 Nov 2010 14:49:00 GMT
+Server: test-server/fake
+Content-Length: 6
+Connection: close
+Content-Type: text/html
+Content-Disposition: filename=name1377; charset=funny; option=strange
+
 12345
 </data>
 </reply>
@@ -51,19 +51,19 @@ Accept: */*
 
 </protocol>
 
-<file1 name="log/outfile1377" mode="text">
-HTTP/1.1 200 OK
-Date: Thu, 09 Nov 2010 14:49:00 GMT
-Server: test-server/fake
-Content-Length: 6
-Connection: close
-Content-Type: text/html
-Content-Disposition: filename=name1377; charset=funny; option=strange
-
+<file1 name="log/outfile1377">
+HTTP/1.1 200 OK
+Date: Thu, 09 Nov 2010 14:49:00 GMT
+Server: test-server/fake
+Content-Length: 6
+Connection: close
+Content-Type: text/html
+Content-Disposition: filename=name1377; charset=funny; option=strange
+
 12345
 </file1>
 
-<file2 name="log/stdout1377" mode="text">
+<file2 name="log/stdout1377">
 </file2>
 
 </verify>
diff --git a/tests/data/test1386 b/tests/data/test1386
index da47d5b85..c7f5d8ae9 100644
--- a/tests/data/test1386
+++ b/tests/data/test1386
@@ -10,14 +10,14 @@ RETR
 <reply>
 # file1386 contents...
 <data nocheck="yes">
-HTTP/1.1 200 OK
-Date: Thu, 09 Nov 2010 14:49:00 GMT
-Server: test-server/fake
-Content-Length: 6
-Connection: close
-Content-Type: text/html
-Content-Disposition: filename=name1386; charset=funny; option=strange
-
+HTTP/1.1 200 OK
+Date: Thu, 09 Nov 2010 14:49:00 GMT
+Server: test-server/fake
+Content-Length: 6
+Connection: close
+Content-Type: text/html
+Content-Disposition: filename=name1386; charset=funny; option=strange
+
 MOOOO
 </data>
 </reply>
@@ -52,19 +52,19 @@ RETR file1386
 QUIT
 </protocol>
 
-<file1 name="log/download1386" mode="text">
-HTTP/1.1 200 OK
-Date: Thu, 09 Nov 2010 14:49:00 GMT
-Server: test-server/fake
-Content-Length: 6
-Connection: close
-Content-Type: text/html
-Content-Disposition: filename=name1386; charset=funny; option=strange
-
+<file1 name="log/download1386">
+HTTP/1.1 200 OK
+Date: Thu, 09 Nov 2010 14:49:00 GMT
+Server: test-server/fake
+Content-Length: 6
+Connection: close
+Content-Type: text/html
+Content-Disposition: filename=name1386; charset=funny; option=strange
+
 MOOOO
 </file1>
 
-<file2 name="log/stdout1386" mode="text">
+<file2 name="log/stdout1386">
 </file2>
 
 </verify>
diff --git a/tests/data/test1388 b/tests/data/test1388
index 5f5cc0cff..3d2c59a2e 100644
--- a/tests/data/test1388
+++ b/tests/data/test1388
@@ -10,14 +10,14 @@ RETR
 <reply>
 # file1388 contents...
 <data nocheck="yes">
-HTTP/1.1 200 OK
-Date: Thu, 09 Nov 2010 14:49:00 GMT
-Server: test-server/fake
-Content-Length: 6
-Connection: close
-Content-Type: text/html
-Content-Disposition: filename=name1388; charset=funny; option=strange
-
+HTTP/1.1 200 OK
+Date: Thu, 09 Nov 2010 14:49:00 GMT
+Server: test-server/fake
+Content-Length: 6
+Connection: close
+Content-Type: text/html
+Content-Disposition: filename=name1388; charset=funny; option=strange
+
 MOOOO
 </data>
 </reply>
@@ -53,14 +53,14 @@ QUIT
 </protocol>
 
 <file1 name="log/download1388">
-HTTP/1.1 200 OK
-Date: Thu, 09 Nov 2010 14:49:00 GMT
-Server: test-server/fake
-Content-Length: 6
-Connection: close
-Content-Type: text/html
-Content-Disposition: filename=name1388; charset=funny; option=strange
-
+HTTP/1.1 200 OK
+Date: Thu, 09 Nov 2010 14:49:00 GMT
+Server: test-server/fake
+Content-Length: 6
+Connection: close
+Content-Type: text/html
+Content-Disposition: filename=name1388; charset=funny; option=strange
+
 MOOOO
 </file1>
 
@@ -76,8 +76,8 @@ MOOOO
 250 CWD command successful.
 229 Entering Passive Mode (stripped)
 200 I modify TYPE as you wanted
-213 214
-150 Binary data connection for 1388 () (214 bytes).
+213 222
+150 Binary data connection for 1388 () (222 bytes).
 226 File transfer complete
 </file2>
 <stripfile2>
diff --git a/tests/data/test1390 b/tests/data/test1390
index 53eac5b95..0668cf7b0 100644
--- a/tests/data/test1390
+++ b/tests/data/test1390
@@ -11,14 +11,14 @@ RETR
 <reply>
 # file1390 contents...
 <data nocheck="yes">
-HTTP/1.1 200 OK
-Date: Thu, 09 Nov 2010 14:49:00 GMT
-Server: test-server/fake
-Content-Length: 6
-Connection: close
-Content-Type: text/html
-Content-Disposition: filename=name1390; charset=funny; option=strange
-
+HTTP/1.1 200 OK
+Date: Thu, 09 Nov 2010 14:49:00 GMT
+Server: test-server/fake
+Content-Length: 6
+Connection: close
+Content-Type: text/html
+Content-Disposition: filename=name1390; charset=funny; option=strange
+
 MOOOO
 </data>
 </reply>
@@ -54,14 +54,14 @@ QUIT
 </protocol>
 
 <file1 name="log/download1390">
-HTTP/1.1 200 OK
-Date: Thu, 09 Nov 2010 14:49:00 GMT
-Server: test-server/fake
-Content-Length: 6
-Connection: close
-Content-Type: text/html
-Content-Disposition: filename=name1390; charset=funny; option=strange
-
+HTTP/1.1 200 OK
+Date: Thu, 09 Nov 2010 14:49:00 GMT
+Server: test-server/fake
+Content-Length: 6
+Connection: close
+Content-Type: text/html
+Content-Disposition: filename=name1390; charset=funny; option=strange
+
 MOOOO
 </file1>
 
@@ -77,8 +77,8 @@ MOOOO
 250 CWD command successful.
 229 Entering Passive Mode (stripped)
 200 I modify TYPE as you wanted
-213 214
-150 Binary data connection for 1390 () (214 bytes).
+213 222
+150 Binary data connection for 1390 () (222 bytes).
 226 File transfer complete
 </file2>
 <stripfile2>
diff --git a/tests/data/test1392 b/tests/data/test1392
index 4c8f0b190..994c881d5 100644
--- a/tests/data/test1392
+++ b/tests/data/test1392
@@ -10,14 +10,14 @@ RETR
 <reply>
 # file1392 contents...
 <data nocheck="yes">
-HTTP/1.1 200 OK
-Date: Thu, 09 Nov 2010 14:49:00 GMT
-Server: test-server/fake
-Content-Length: 6
-Connection: close
-Content-Type: text/html
-Content-Disposition: filename=name1392; charset=funny; option=strange
-
+HTTP/1.1 200 OK
+Date: Thu, 09 Nov 2010 14:49:00 GMT
+Server: test-server/fake
+Content-Length: 6
+Connection: close
+Content-Type: text/html
+Content-Disposition: filename=name1392; charset=funny; option=strange
+
 MOOOO
 </data>
 </reply>
@@ -53,14 +53,14 @@ QUIT
 </protocol>
 
 <file1 name="log/download1392">
-HTTP/1.1 200 OK
-Date: Thu, 09 Nov 2010 14:49:00 GMT
-Server: test-server/fake
-Content-Length: 6
-Connection: close
-Content-Type: text/html
-Content-Disposition: filename=name1392; charset=funny; option=strange
-
+HTTP/1.1 200 OK
+Date: Thu, 09 Nov 2010 14:49:00 GMT
+Server: test-server/fake
+Content-Length: 6
+Connection: close
+Content-Type: text/html
+Content-Disposition: filename=name1392; charset=funny; option=strange
+
 MOOOO
 </file1>
 
@@ -76,8 +76,8 @@ MOOOO
 250 CWD command successful.
 229 Entering Passive Mode (stripped)
 200 I modify TYPE as you wanted
-213 214
-150 Binary data connection for 1392 () (214 bytes).
+213 222
+150 Binary data connection for 1392 () (222 bytes).
 226 File transfer complete
 </file2>
 <stripfile2>
diff --git a/tests/data/test1393 b/tests/data/test1393
index ebb8151d8..12f928476 100644
--- a/tests/data/test1393
+++ b/tests/data/test1393
@@ -10,14 +10,14 @@ RETR
 <reply>
 # file1393 contents...
 <data nocheck="yes">
-HTTP/1.1 200 OK
-Date: Thu, 09 Nov 2010 14:49:00 GMT
-Server: test-server/fake
-Content-Length: 6
-Connection: close
-Content-Type: text/html
-Content-Disposition: filename=name1393; charset=funny; option=strange
-
+HTTP/1.1 200 OK
+Date: Thu, 09 Nov 2010 14:49:00 GMT
+Server: test-server/fake
+Content-Length: 6
+Connection: close
+Content-Type: text/html
+Content-Disposition: filename=name1393; charset=funny; option=strange
+
 MOOOO
 </data>
 </reply>
@@ -52,19 +52,19 @@ RETR file1393
 QUIT
 </protocol>
 
-<file1 name="log/download1393" mode="text">
-HTTP/1.1 200 OK
-Date: Thu, 09 Nov 2010 14:49:00 GMT
-Server: test-server/fake
-Content-Length: 6
-Connection: close
-Content-Type: text/html
-Content-Disposition: filename=name1393; charset=funny; option=strange
-
+<file1 name="log/download1393">
+HTTP/1.1 200 OK
+Date: Thu, 09 Nov 2010 14:49:00 GMT
+Server: test-server/fake
+Content-Length: 6
+Connection: close
+Content-Type: text/html
+Content-Disposition: filename=name1393; charset=funny; option=strange
+
 MOOOO
 </file1>
 
-<file2 name="log/stdout1393" mode="text">
+<file2 name="log/stdout1393">
 </file2>
 
 </verify>