diff --git a/tests/data/command1.txt b/tests/data/command1.txt
deleted file mode 100644
index 388089e4be33047994535aabd62980abaefd8ab9..0000000000000000000000000000000000000000
--- a/tests/data/command1.txt
+++ /dev/null
@@ -1 +0,0 @@
-http://%HOSTIP:%HOSTPORT/1
diff --git a/tests/data/command10.txt b/tests/data/command10.txt
deleted file mode 100644
index ed5a31241abc57a966c786ab780e228d1b02885e..0000000000000000000000000000000000000000
--- a/tests/data/command10.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-http://%HOSTIP:%HOSTPORT/we/want/10 -T data/command10.txt
-
-
diff --git a/tests/data/command100.txt b/tests/data/command100.txt
deleted file mode 100644
index a3a4452cce37611d179386ad09174380f72a0b0e..0000000000000000000000000000000000000000
--- a/tests/data/command100.txt
+++ /dev/null
@@ -1 +0,0 @@
-ftp://%HOSTIP:%FTPPORT/
diff --git a/tests/data/command101.txt b/tests/data/command101.txt
deleted file mode 100644
index 83e26f27ff961dd02fb79e47046dfc44b581e42a..0000000000000000000000000000000000000000
--- a/tests/data/command101.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-ftp://%HOSTIP:%FTPPORT/ -P %HOSTIP
-
-
diff --git a/tests/data/command102.txt b/tests/data/command102.txt
deleted file mode 100644
index f3e870e6ec21a991addc9fe7ba22056c667a3bb7..0000000000000000000000000000000000000000
--- a/tests/data/command102.txt
+++ /dev/null
@@ -1 +0,0 @@
-ftp://%HOSTIP:%FTPPORT/102
diff --git a/tests/data/command103.txt b/tests/data/command103.txt
deleted file mode 100644
index 3f327fd9ddcb704745eed9ee7fd7713a287d71ec..0000000000000000000000000000000000000000
--- a/tests/data/command103.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-ftp://%HOSTIP:%FTPPORT/a/path/103 -P -
-
-
-
diff --git a/tests/data/command104.txt b/tests/data/command104.txt
deleted file mode 100644
index a217c69eba3416d16ec8f9b41da1e4b831cbce83..0000000000000000000000000000000000000000
--- a/tests/data/command104.txt
+++ /dev/null
@@ -1 +0,0 @@
-ftp://%HOSTIP:%FTPPORT/a/path/103 --head
diff --git a/tests/data/command105.txt b/tests/data/command105.txt
deleted file mode 100644
index 094bb54bb822da4dd33c53554f3a5076cd057f72..0000000000000000000000000000000000000000
--- a/tests/data/command105.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-ftp://userdude:passfellow@%HOSTIP:%FTPPORT/103 --use-ascii
-
diff --git a/tests/data/command106.txt b/tests/data/command106.txt
deleted file mode 100644
index 00abeb251dad1cfec54c89f2f6cc8201169ef44a..0000000000000000000000000000000000000000
--- a/tests/data/command106.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-"ftp://%HOSTIP:%FTPPORT//path%20with%20%20spaces/and%20things2/106;type=A"
-
diff --git a/tests/data/command107.txt b/tests/data/command107.txt
deleted file mode 100644
index 11c82ad965280923f2427cfccce02387200b85da..0000000000000000000000000000000000000000
--- a/tests/data/command107.txt
+++ /dev/null
@@ -1 +0,0 @@
-ftp://%HOSTIP:%FTPPORT/107 -T data/reply106.txt
diff --git a/tests/data/command108.txt b/tests/data/command108.txt
deleted file mode 100644
index e3306f267591db100aea84e5a171da8fffdbf48e..0000000000000000000000000000000000000000
--- a/tests/data/command108.txt
+++ /dev/null
@@ -1 +0,0 @@
-ftp://%HOSTIP:%FTPPORT/CWD/STOR/RETR/108 -T data/reply106.txt -P -
diff --git a/tests/data/command109.txt b/tests/data/command109.txt
deleted file mode 100644
index 118f2603bf137a24bdb04e24087ca5648aa1da43..0000000000000000000000000000000000000000
--- a/tests/data/command109.txt
+++ /dev/null
@@ -1 +0,0 @@
-ftp://%HOSTIP:%FTPPORT/109 -T data/reply106.txt --append
diff --git a/tests/data/command11.txt b/tests/data/command11.txt
deleted file mode 100644
index 69b1a92bd21f13e5290f188977b59d1bfbda51aa..0000000000000000000000000000000000000000
--- a/tests/data/command11.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-http://%HOSTIP:%HOSTPORT/want/11 -L
-
-
diff --git a/tests/data/command110.txt b/tests/data/command110.txt
deleted file mode 100644
index 90ea561a457d8161746e5532a956a26585dd17ce..0000000000000000000000000000000000000000
--- a/tests/data/command110.txt
+++ /dev/null
@@ -1 +0,0 @@
-ftp://%HOSTIP:%FTPPORT/110 -C 20
diff --git a/tests/data/command111.txt b/tests/data/command111.txt
deleted file mode 100644
index af0e8c2a5341c60306e594b05c0386321590a11e..0000000000000000000000000000000000000000
--- a/tests/data/command111.txt
+++ /dev/null
@@ -1 +0,0 @@
-ftp://%HOSTIP:%FTPPORT/110 -C 2000
diff --git a/tests/data/command112.txt b/tests/data/command112.txt
deleted file mode 100644
index 53e5ca988c55deb822dd0f1a7d96ca9799f3aa62..0000000000000000000000000000000000000000
--- a/tests/data/command112.txt
+++ /dev/null
@@ -1 +0,0 @@
-ftp://%HOSTIP:%FTPPORT/112 -T data/reply106.txt -C 40
diff --git a/tests/data/command113.txt b/tests/data/command113.txt
deleted file mode 100644
index e05b40f717f611476ef7d2a68e4cb74c7b4cafd8..0000000000000000000000000000000000000000
--- a/tests/data/command113.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-ftp://%HOSTIP:%FTPPORT/113
-
diff --git a/tests/data/command114.txt b/tests/data/command114.txt
deleted file mode 100644
index e5d0a39759894fdef8a1c713bbe3dd629db7fd7c..0000000000000000000000000000000000000000
--- a/tests/data/command114.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-ftp://%HOSTIP:%FTPPORT/114
-
diff --git a/tests/data/command115.txt b/tests/data/command115.txt
deleted file mode 100644
index c5bf53cd4b683b798ab2b366f064a458766ce0dd..0000000000000000000000000000000000000000
--- a/tests/data/command115.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-ftp://%HOSTIP:%FTPPORT/115
-
diff --git a/tests/data/command116.txt b/tests/data/command116.txt
deleted file mode 100644
index 515420314c8fd6b06b59dc07dd4fad86b70a1df9..0000000000000000000000000000000000000000
--- a/tests/data/command116.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-ftp://%HOSTIP:%FTPPORT/116 -P -
-
diff --git a/tests/data/command117.txt b/tests/data/command117.txt
deleted file mode 100644
index 8d9f56900bbf9e76720d68901be418f32d33bcf2..0000000000000000000000000000000000000000
--- a/tests/data/command117.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-ftp://%HOSTIP:%FTPPORT/117
-
-
diff --git a/tests/data/command118.txt b/tests/data/command118.txt
deleted file mode 100644
index e4484f7f0796af78cb91cb31fe886e6a9de38b41..0000000000000000000000000000000000000000
--- a/tests/data/command118.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-ftp://%HOSTIP:%FTPPORT/118
-
-
diff --git a/tests/data/command119.txt b/tests/data/command119.txt
deleted file mode 100644
index a4bba0802b7559864333299be8dac6b9a4fa0f1d..0000000000000000000000000000000000000000
--- a/tests/data/command119.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-ftp://%HOSTIP:%FTPPORT/119 -P -
-
-
diff --git a/tests/data/command12.txt b/tests/data/command12.txt
deleted file mode 100644
index 4f22997e63f1548878338b97c0aa1a34d6788bd2..0000000000000000000000000000000000000000
--- a/tests/data/command12.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-http://%HOSTIP:%HOSTPORT/want/12 -r 100-200
-
-
diff --git a/tests/data/command120.txt b/tests/data/command120.txt
deleted file mode 100644
index e35c13d68a7aef24cdf7c8becf8bc2954a8065b8..0000000000000000000000000000000000000000
--- a/tests/data/command120.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-ftp://%HOSTIP:%FTPPORT/106 -Q "-DELE file"
-
-
diff --git a/tests/data/command121.txt b/tests/data/command121.txt
deleted file mode 100644
index b2c6e0909ba6ebc451821d69a4f03312c7a3ae48..0000000000000000000000000000000000000000
--- a/tests/data/command121.txt
+++ /dev/null
@@ -1 +0,0 @@
-ftp://%HOSTIP:%FTPPORT/106 -Q "-DELE after_transfer" -Q "DELE before_transfer"
diff --git a/tests/data/command122.txt b/tests/data/command122.txt
deleted file mode 100644
index dc51f2e681dcf5587ab2e5522f48fcbc5777b708..0000000000000000000000000000000000000000
--- a/tests/data/command122.txt
+++ /dev/null
@@ -1 +0,0 @@
-ftp://%HOSTIP:%FTPPORT/122 -C 5
diff --git a/tests/data/command123.txt b/tests/data/command123.txt
deleted file mode 100644
index fedf82f06a9691766def9cac40366ef45a3e2a2a..0000000000000000000000000000000000000000
--- a/tests/data/command123.txt
+++ /dev/null
@@ -1 +0,0 @@
-ftp://%HOSTIP:%FTPPORT/107 -T data/reply106.txt -C 51
diff --git a/tests/data/command13.txt b/tests/data/command13.txt
deleted file mode 100644
index 97f66a583af1b5ac9c9c9bf013b8637d2afbc8dd..0000000000000000000000000000000000000000
--- a/tests/data/command13.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-http://%HOSTIP:%HOSTPORT/want/13 -X DELETE
-
-
diff --git a/tests/data/command14.txt b/tests/data/command14.txt
deleted file mode 100644
index d383690fe3b9c6ec0316e5400f98dd6990a846ca..0000000000000000000000000000000000000000
--- a/tests/data/command14.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-http://%HOSTIP:%HOSTPORT/want/14 -i --head
-
-
diff --git a/tests/data/command15.txt b/tests/data/command15.txt
deleted file mode 100644
index c4a037804761ec41c396e1698d553a629635ba2b..0000000000000000000000000000000000000000
--- a/tests/data/command15.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-http://%HOSTIP:%HOSTPORT/want/15 --write-out '%{url_effective} %{http_code} %{size_download}\n'
-
-
-
diff --git a/tests/data/command16.txt b/tests/data/command16.txt
deleted file mode 100644
index f55d084ff684ee12dfd0a0ac9a323558d5a1aef0..0000000000000000000000000000000000000000
--- a/tests/data/command16.txt
+++ /dev/null
@@ -1 +0,0 @@
- -U fake@user:壯吸ooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong -x %HOSTIP:%HOSTPORT http://we.want.that.site.com/2
diff --git a/tests/data/command17.txt b/tests/data/command17.txt
deleted file mode 100644
index 96e8d47f8a36b46e64939d460cc202ef43cac02a..0000000000000000000000000000000000000000
--- a/tests/data/command17.txt
+++ /dev/null
@@ -1 +0,0 @@
--K - %HOSTIP:%HOSTPORT/that.site.com/17
diff --git a/tests/data/command18.txt b/tests/data/command18.txt
deleted file mode 100644
index 1cbb3d3a43af301990e6529e5c1db41f8b3da4a6..0000000000000000000000000000000000000000
--- a/tests/data/command18.txt
+++ /dev/null
@@ -1 +0,0 @@
-'%HOSTIP:%HOSTPORT/{3,10,11}'
diff --git a/tests/data/command19.txt b/tests/data/command19.txt
deleted file mode 100644
index a6b8aa3758db64ec7c3ca41300cb147d1ded7d92..0000000000000000000000000000000000000000
--- a/tests/data/command19.txt
+++ /dev/null
@@ -1 +0,0 @@
-%HOSTIP:60000
diff --git a/tests/data/command2.txt b/tests/data/command2.txt
deleted file mode 100644
index 2a0a9c0443c0af4de828bd58c5b552c4345e62c3..0000000000000000000000000000000000000000
--- a/tests/data/command2.txt
+++ /dev/null
@@ -1 +0,0 @@
- -u fake:user http://%HOSTIP:%HOSTPORT/2
diff --git a/tests/data/command20.txt b/tests/data/command20.txt
deleted file mode 100644
index 8ebc7bac8eee6ccccb4d49800583187fc0889b0a..0000000000000000000000000000000000000000
--- a/tests/data/command20.txt
+++ /dev/null
@@ -1 +0,0 @@
-weeeeeeirdname
diff --git a/tests/data/command200.txt b/tests/data/command200.txt
deleted file mode 100644
index 8069c547d288fd5b2709e89496f5bfbd7b5c09cd..0000000000000000000000000000000000000000
--- a/tests/data/command200.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-file://data/reply200.txt
-
diff --git a/tests/data/command201.txt b/tests/data/command201.txt
deleted file mode 100644
index 4112fa2df1c007a06f2b0e150dd1e73a28960fcc..0000000000000000000000000000000000000000
--- a/tests/data/command201.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-file://data/fooobar-reply201.txt
-
diff --git a/tests/data/command21.txt b/tests/data/command21.txt
deleted file mode 100644
index 2a33bd375e600f36b303e1eff58692c19379cd3a..0000000000000000000000000000000000000000
--- a/tests/data/command21.txt
+++ /dev/null
@@ -1 +0,0 @@
--I -X FOOO
diff --git a/tests/data/command22.txt b/tests/data/command22.txt
deleted file mode 100644
index 8fa2df8c5cd56de9c838414e713c030c7c75e3d7..0000000000000000000000000000000000000000
--- a/tests/data/command22.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-%HOSTIP:%HOSTPORT/`perl -e 'print "a" x 10000;'`/17
-
diff --git a/tests/data/command23.txt b/tests/data/command23.txt
deleted file mode 100644
index babf125880725cfc090577863cb33dbd7f82c50c..0000000000000000000000000000000000000000
--- a/tests/data/command23.txt
+++ /dev/null
@@ -1 +0,0 @@
-htfp://%HOSTIP:%HOSTPORT/none.htfml
diff --git a/tests/data/command24.txt b/tests/data/command24.txt
deleted file mode 100644
index 075f22244ed620285b334ddec86becdb42c2f425..0000000000000000000000000000000000000000
--- a/tests/data/command24.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-http://%HOSTIP:%HOSTPORT/24 --fail
-
diff --git a/tests/data/command25.txt b/tests/data/command25.txt
deleted file mode 100644
index eeb344562aaf8b6ed611411037796fc524fe20d3..0000000000000000000000000000000000000000
--- a/tests/data/command25.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-http://%HOSTIP:%HOSTPORT/want/25 -L --max-redirs 5
-
-
-
diff --git a/tests/data/command26.txt b/tests/data/command26.txt
deleted file mode 100644
index 11c47f7a189a1b9ac3e338313ce1060e6677faea..0000000000000000000000000000000000000000
--- a/tests/data/command26.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-http://%HOSTIP:%HOSTPORT/want/26 -o - -o -
-
-
-
diff --git a/tests/data/command27.txt b/tests/data/command27.txt
deleted file mode 100644
index 21e2a9c9786ab7acfd0d1b4837e5302cf290015e..0000000000000000000000000000000000000000
--- a/tests/data/command27.txt
+++ /dev/null
@@ -1 +0,0 @@
-http://%HOSTIP:%HOSTPORT/want/25 http://%HOSTIP:%HOSTPORT/want/24 http://%HOSTIP:%HOSTPORT/want/22
diff --git a/tests/data/command28.txt b/tests/data/command28.txt
deleted file mode 100644
index 74a7a6b8517408ced5f265555763e78638e90683..0000000000000000000000000000000000000000
--- a/tests/data/command28.txt
+++ /dev/null
@@ -1 +0,0 @@
---globoff http://%HOSTIP:%HOSTPORT/wantit/{}[]/28
diff --git a/tests/data/command29.txt b/tests/data/command29.txt
deleted file mode 100644
index 4e2dc3c5808abb9c63a2edfd7cdfaf9410e48034..0000000000000000000000000000000000000000
--- a/tests/data/command29.txt
+++ /dev/null
@@ -1 +0,0 @@
--C 200 http://%HOSTIP:%HOSTPORT/29
diff --git a/tests/data/command3.txt b/tests/data/command3.txt
deleted file mode 100644
index 70fe96315b2c7c46930bfc51763eb4a8966bb153..0000000000000000000000000000000000000000
--- a/tests/data/command3.txt
+++ /dev/null
@@ -1 +0,0 @@
- -d "fooo=mooo&pooo=clue&doo=%20%20%20++++" -u "fake:-user" http://%HOSTIP:%HOSTPORT/3
diff --git a/tests/data/command30.txt b/tests/data/command30.txt
deleted file mode 100644
index c0140914b1820783e1a8ffd0e0021b858dfd72fe..0000000000000000000000000000000000000000
--- a/tests/data/command30.txt
+++ /dev/null
@@ -1 +0,0 @@
-http://%HOSTIP:%HOSTPORT/30
diff --git a/tests/data/command300.txt b/tests/data/command300.txt
deleted file mode 100644
index 7531ad7d7dfee0c15d71eb20eabb9930e08fc0e4..0000000000000000000000000000000000000000
--- a/tests/data/command300.txt
+++ /dev/null
@@ -1 +0,0 @@
-https://%HOSTIP:%HTTPSPORT/300
diff --git a/tests/data/command31.txt b/tests/data/command31.txt
deleted file mode 100644
index dbffab3ebc9b1b44ca46d437f0de963914865398..0000000000000000000000000000000000000000
--- a/tests/data/command31.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-http://%HOSTIP:%HOSTPORT/31 -d mooo=fooo -L
-
diff --git a/tests/data/command32.txt b/tests/data/command32.txt
deleted file mode 100644
index d7fb1ae14af18a2287e2fc9e52619e81db1545e7..0000000000000000000000000000000000000000
--- a/tests/data/command32.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-http://%HOSTIP:%HOSTPORT/32 -d mooo=fooo -L
-
diff --git a/tests/data/command33.txt b/tests/data/command33.txt
deleted file mode 100644
index b56a0eaa326587e0f9343528a8deb1581e3543c5..0000000000000000000000000000000000000000
--- a/tests/data/command33.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-http://%HOSTIP:%HOSTPORT/33 -Tdata/extra33.txt -C 50
-
-
diff --git a/tests/data/command34.txt b/tests/data/command34.txt
deleted file mode 100644
index 50bcee1cbf016c898931b9040cd12d635603f1ca..0000000000000000000000000000000000000000
--- a/tests/data/command34.txt
+++ /dev/null
@@ -1 +0,0 @@
-http://%HOSTIP:%HOSTPORT/34
diff --git a/tests/data/command35.txt b/tests/data/command35.txt
deleted file mode 100644
index 5fd2c4ada7028e4e5793aed6bdac4c3757194665..0000000000000000000000000000000000000000
--- a/tests/data/command35.txt
+++ /dev/null
@@ -1 +0,0 @@
-http://%HOSTIP:%HOSTPORT/want/35 --include --head
diff --git a/tests/data/command36.txt b/tests/data/command36.txt
deleted file mode 100644
index 34379734fe9e8f08da6b98f8215eca7f5b4189cf..0000000000000000000000000000000000000000
--- a/tests/data/command36.txt
+++ /dev/null
@@ -1 +0,0 @@
-http://%HOSTIP:%HOSTPORT/36
diff --git a/tests/data/command37.txt b/tests/data/command37.txt
deleted file mode 100644
index c37cf423dec93e5dbff1c07c2df40aac05043619..0000000000000000000000000000000000000000
--- a/tests/data/command37.txt
+++ /dev/null
@@ -1 +0,0 @@
-http://uUsSeErrr:pppasswrd@%HOSTIP:%HOSTPORT/37
diff --git a/tests/data/command38.txt b/tests/data/command38.txt
deleted file mode 100644
index 3841e975bc4d7cfbb85dee6487879e3a4dd55940..0000000000000000000000000000000000000000
--- a/tests/data/command38.txt
+++ /dev/null
@@ -1 +0,0 @@
-http://user:pwd@%HOSTIP:%HOSTPORT/38 -L
diff --git a/tests/data/command39.txt b/tests/data/command39.txt
deleted file mode 100644
index 7311566ee80ae4031efddb82c0eaf040d9c384ce..0000000000000000000000000000000000000000
--- a/tests/data/command39.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-http://%HOSTIP:%HOSTPORT/want/39 -L -C 20
-
-
diff --git a/tests/data/command4.txt b/tests/data/command4.txt
deleted file mode 100644
index c94a43cf5c748cdea0f0829c837a126830734cbb..0000000000000000000000000000000000000000
--- a/tests/data/command4.txt
+++ /dev/null
@@ -1 +0,0 @@
- -H "extra-header: here" -H "Accept: replaced" http://%HOSTIP:%HOSTPORT/4
diff --git a/tests/data/command40.txt b/tests/data/command40.txt
deleted file mode 100644
index e2b781c9722fa058898d772aaa29a56578ffeee1..0000000000000000000000000000000000000000
--- a/tests/data/command40.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-http://%HOSTIP:%HOSTPORT/want/40
-
-
diff --git a/tests/data/command400.txt b/tests/data/command400.txt
deleted file mode 100644
index 9ff4b69924f31ea7a55f0b60c995fba55396074a..0000000000000000000000000000000000000000
--- a/tests/data/command400.txt
+++ /dev/null
@@ -1 +0,0 @@
-ftps://%HOSTIP:%FTPSPORT/
diff --git a/tests/data/command41.txt b/tests/data/command41.txt
deleted file mode 100644
index 79136e5833139113a82811a8e3a79d24e17dfc1b..0000000000000000000000000000000000000000
--- a/tests/data/command41.txt
+++ /dev/null
@@ -1,2 +0,0 @@
- -U proxy:pppp -u site:moooo -x %HOSTIP:%HOSTPORT http://weeird.site.com/YES/boo/2
-
diff --git a/tests/data/command5.txt b/tests/data/command5.txt
deleted file mode 100644
index f0fb2677d74e5a7226edd9803e3a8432e21b331b..0000000000000000000000000000000000000000
--- a/tests/data/command5.txt
+++ /dev/null
@@ -1 +0,0 @@
-http://%HOSTIP:%HOSTPORT/we/want/that/page/5 -x %HOSTIP:%HOSTPORT
diff --git a/tests/data/command6.txt b/tests/data/command6.txt
deleted file mode 100644
index a0b979842d3f48fd96417b74ce964f837c395826..0000000000000000000000000000000000000000
--- a/tests/data/command6.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-http://%HOSTIP:%HOSTPORT/we/want/that/page/6 -b "name=contents;name2=content2"
-
diff --git a/tests/data/command7.txt b/tests/data/command7.txt
deleted file mode 100644
index 0f7f85e7b5888904e38f6a18f71977bcee50ec10..0000000000000000000000000000000000000000
--- a/tests/data/command7.txt
+++ /dev/null
@@ -1 +0,0 @@
-http://%HOSTIP:%HOSTPORT/we/want/7 -b none -D log/heads7.txt
diff --git a/tests/data/command8.txt b/tests/data/command8.txt
deleted file mode 100644
index b7437cf2a19dbceb7ab326311d5f9072191c189e..0000000000000000000000000000000000000000
--- a/tests/data/command8.txt
+++ /dev/null
@@ -1 +0,0 @@
-http://%HOSTIP:%HOSTPORT/we/want/8 -b log/heads7.txt
diff --git a/tests/data/command9.txt b/tests/data/command9.txt
deleted file mode 100644
index b0846bb2f8830d68dbe7c97ee8aa7266e798bb7b..0000000000000000000000000000000000000000
--- a/tests/data/command9.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-http://%HOSTIP:%HOSTPORT/we/want/9 -F name=daniel -F tool=curl -F file=@data/command9.txt
-
diff --git a/tests/data/error111.txt b/tests/data/error111.txt
deleted file mode 100644
index 7facc89938bbc5635e3d36ffa56b4c85e9b07db8..0000000000000000000000000000000000000000
--- a/tests/data/error111.txt
+++ /dev/null
@@ -1 +0,0 @@
-36
diff --git a/tests/data/error113.txt b/tests/data/error113.txt
deleted file mode 100644
index 48082f72f087ce7e6fa75b9c41d7387daecd447b..0000000000000000000000000000000000000000
--- a/tests/data/error113.txt
+++ /dev/null
@@ -1 +0,0 @@
-12
diff --git a/tests/data/error114.txt b/tests/data/error114.txt
deleted file mode 100644
index b4de3947675361a7770d29b8982c407b0ec6b2a0..0000000000000000000000000000000000000000
--- a/tests/data/error114.txt
+++ /dev/null
@@ -1 +0,0 @@
-11
diff --git a/tests/data/error115.txt b/tests/data/error115.txt
deleted file mode 100644
index b1bd38b62a0800a4f6a80c34e21c5acffae52c7e..0000000000000000000000000000000000000000
--- a/tests/data/error115.txt
+++ /dev/null
@@ -1 +0,0 @@
-13
diff --git a/tests/data/error116.txt b/tests/data/error116.txt
deleted file mode 100644
index 64bb6b746dceaf12b0ba8c08f310b0426babde44..0000000000000000000000000000000000000000
--- a/tests/data/error116.txt
+++ /dev/null
@@ -1 +0,0 @@
-30
diff --git a/tests/data/error117.txt b/tests/data/error117.txt
deleted file mode 100644
index 98d9bcb75a685dfbfd60f611c309410152935b3d..0000000000000000000000000000000000000000
--- a/tests/data/error117.txt
+++ /dev/null
@@ -1 +0,0 @@
-17
diff --git a/tests/data/error118.txt b/tests/data/error118.txt
deleted file mode 100644
index d6b24041cf04154f8f902651969675021f4d93a5..0000000000000000000000000000000000000000
--- a/tests/data/error118.txt
+++ /dev/null
@@ -1 +0,0 @@
-19
diff --git a/tests/data/error119.txt b/tests/data/error119.txt
deleted file mode 100644
index d6b24041cf04154f8f902651969675021f4d93a5..0000000000000000000000000000000000000000
--- a/tests/data/error119.txt
+++ /dev/null
@@ -1 +0,0 @@
-19
diff --git a/tests/data/error19.txt b/tests/data/error19.txt
deleted file mode 100644
index 7f8f011eb73d6043d2e6db9d2c101195ae2801f2..0000000000000000000000000000000000000000
--- a/tests/data/error19.txt
+++ /dev/null
@@ -1 +0,0 @@
-7
diff --git a/tests/data/error20.txt b/tests/data/error20.txt
deleted file mode 100644
index 1e8b314962144c26d5e0e50fd29d2ca327864913..0000000000000000000000000000000000000000
--- a/tests/data/error20.txt
+++ /dev/null
@@ -1 +0,0 @@
-6
diff --git a/tests/data/error201.txt b/tests/data/error201.txt
deleted file mode 100644
index 81b5c5d06cc0b8290c264b408abb32cc0986e8f2..0000000000000000000000000000000000000000
--- a/tests/data/error201.txt
+++ /dev/null
@@ -1 +0,0 @@
-37
diff --git a/tests/data/error21.txt b/tests/data/error21.txt
deleted file mode 100644
index 0cfbf08886fca9a91cb753ec8734c84fcbe52c9f..0000000000000000000000000000000000000000
--- a/tests/data/error21.txt
+++ /dev/null
@@ -1 +0,0 @@
-2
diff --git a/tests/data/error23.txt b/tests/data/error23.txt
deleted file mode 100644
index d00491fd7e5bb6fa28c517a0bb32b8b506539d4d..0000000000000000000000000000000000000000
--- a/tests/data/error23.txt
+++ /dev/null
@@ -1 +0,0 @@
-1
diff --git a/tests/data/error24.txt b/tests/data/error24.txt
deleted file mode 100644
index 2bd5a0a98a36cc08ada88b804d3be047e6aa5b8a..0000000000000000000000000000000000000000
--- a/tests/data/error24.txt
+++ /dev/null
@@ -1 +0,0 @@
-22
diff --git a/tests/data/error25.txt b/tests/data/error25.txt
deleted file mode 100644
index abac1ea7b759d8258c9ad9e5b450f782aaa33374..0000000000000000000000000000000000000000
--- a/tests/data/error25.txt
+++ /dev/null
@@ -1 +0,0 @@
-47
diff --git a/tests/data/error30.txt b/tests/data/error30.txt
deleted file mode 100644
index 3c032078a4a21c5c51d3c93d91717c1dabbb8cd0..0000000000000000000000000000000000000000
--- a/tests/data/error30.txt
+++ /dev/null
@@ -1 +0,0 @@
-18
diff --git a/tests/data/error36.txt b/tests/data/error36.txt
deleted file mode 100644
index 6f4247a6255c99f420d1df558d68745592862ff7..0000000000000000000000000000000000000000
--- a/tests/data/error36.txt
+++ /dev/null
@@ -1 +0,0 @@
-26
diff --git a/tests/data/extra33.txt b/tests/data/extra33.txt
deleted file mode 100644
index ca4205b2a9b4244782083bbb8619995a088c867a..0000000000000000000000000000000000000000
--- a/tests/data/extra33.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-012345678
-012345678
-012345678
-012345678
-012345678
-012345678
-012345678
-012345678
-012345678
-012345678
-012345678
-012345678
-012345678
-012345678
-012345678
diff --git a/tests/data/ftpd113.txt b/tests/data/ftpd113.txt
deleted file mode 100644
index fae041d82123e47ee233585aacdae5781e94d9c6..0000000000000000000000000000000000000000
--- a/tests/data/ftpd113.txt
+++ /dev/null
@@ -1 +0,0 @@
-REPLY USER 314 bluah you fewl!
diff --git a/tests/data/ftpd114.txt b/tests/data/ftpd114.txt
deleted file mode 100644
index ce23059aaacfa28b6161a09edf6c97b7b2be7f7a..0000000000000000000000000000000000000000
--- a/tests/data/ftpd114.txt
+++ /dev/null
@@ -1 +0,0 @@
-REPLY PASS 314 bluah you fewl!
diff --git a/tests/data/ftpd115.txt b/tests/data/ftpd115.txt
deleted file mode 100644
index b8034dd5b425bc52faae1e28ccf4c2a10bddf985..0000000000000000000000000000000000000000
--- a/tests/data/ftpd115.txt
+++ /dev/null
@@ -1 +0,0 @@
-REPLY PASV 314 bluah you fewl!
diff --git a/tests/data/ftpd116.txt b/tests/data/ftpd116.txt
deleted file mode 100644
index 83d10d5fa678c31c43e35dfa45633e358a38c30b..0000000000000000000000000000000000000000
--- a/tests/data/ftpd116.txt
+++ /dev/null
@@ -1 +0,0 @@
-REPLY PORT 314 bluah you fewl!
diff --git a/tests/data/ftpd117.txt b/tests/data/ftpd117.txt
deleted file mode 100644
index 28bca4f9fcb3c09501e34026a9f0fc97e2aaf334..0000000000000000000000000000000000000000
--- a/tests/data/ftpd117.txt
+++ /dev/null
@@ -1 +0,0 @@
-REPLY TYPE 314 bluah you fewl!
diff --git a/tests/data/ftpd118.txt b/tests/data/ftpd118.txt
deleted file mode 100644
index 422e871c883cefe90c792be5c68e8d1c896fe8ea..0000000000000000000000000000000000000000
--- a/tests/data/ftpd118.txt
+++ /dev/null
@@ -1 +0,0 @@
-REPLY RETR 314 bluah you fewl!
diff --git a/tests/data/name1.txt b/tests/data/name1.txt
deleted file mode 100644
index c3cde869bb9873d24da99e1d055386f7565df974..0000000000000000000000000000000000000000
--- a/tests/data/name1.txt
+++ /dev/null
@@ -1 +0,0 @@
-simple HTTP GET
diff --git a/tests/data/name10.txt b/tests/data/name10.txt
deleted file mode 100644
index f4ffc31ee22f95c2236b6a36b27e0923a6cf4c93..0000000000000000000000000000000000000000
--- a/tests/data/name10.txt
+++ /dev/null
@@ -1 +0,0 @@
-simple HTTP PUT from file
diff --git a/tests/data/name100.txt b/tests/data/name100.txt
deleted file mode 100644
index 148cedd73445b890f3e25cbcf31766eae4ff26c6..0000000000000000000000000000000000000000
--- a/tests/data/name100.txt
+++ /dev/null
@@ -1 +0,0 @@
-FTP dir list PASV
diff --git a/tests/data/name101.txt b/tests/data/name101.txt
deleted file mode 100644
index 13ccd9bb074a15fc113bb2340bd806c7947db895..0000000000000000000000000000000000000000
--- a/tests/data/name101.txt
+++ /dev/null
@@ -1 +0,0 @@
-FTP dir list, PORT with specified IP
diff --git a/tests/data/name102.txt b/tests/data/name102.txt
deleted file mode 100644
index 87c1fe763c7a64f8987770a687ad3b451ae9814f..0000000000000000000000000000000000000000
--- a/tests/data/name102.txt
+++ /dev/null
@@ -1 +0,0 @@
-FTP RETR PASV
diff --git a/tests/data/name103.txt b/tests/data/name103.txt
deleted file mode 100644
index b6dff0fb4f74dcdd50f14e5d002229d3f797c12a..0000000000000000000000000000000000000000
--- a/tests/data/name103.txt
+++ /dev/null
@@ -1 +0,0 @@
-FTP RETR PORT with CWD
diff --git a/tests/data/name104.txt b/tests/data/name104.txt
deleted file mode 100644
index 898b1c5649016f5aaa4fdc2054a79cb9a57bf43f..0000000000000000000000000000000000000000
--- a/tests/data/name104.txt
+++ /dev/null
@@ -1 +0,0 @@
-FTP --head to get file size only
diff --git a/tests/data/name105.txt b/tests/data/name105.txt
deleted file mode 100644
index c8d5cc6ebdc25602866f9ad32b586feff6a1deeb..0000000000000000000000000000000000000000
--- a/tests/data/name105.txt
+++ /dev/null
@@ -1 +0,0 @@
-FTP user+password in URL and ASCII transfer
diff --git a/tests/data/name106.txt b/tests/data/name106.txt
deleted file mode 100644
index c7da9f30a7b50c3c0007e377de76037aa97e4b27..0000000000000000000000000000000000000000
--- a/tests/data/name106.txt
+++ /dev/null
@@ -1 +0,0 @@
-FTP GET with type=A style ASCII URL using %20 codes
diff --git a/tests/data/name107.txt b/tests/data/name107.txt
deleted file mode 100644
index 7a04a0d7d838515b3a43c6588ff6638794fbbc9c..0000000000000000000000000000000000000000
--- a/tests/data/name107.txt
+++ /dev/null
@@ -1 +0,0 @@
-FTP PASV upload file
diff --git a/tests/data/name108.txt b/tests/data/name108.txt
deleted file mode 100644
index 48f75b5f7af19495d340cb1abf39d1f7341e1920..0000000000000000000000000000000000000000
--- a/tests/data/name108.txt
+++ /dev/null
@@ -1 +0,0 @@
-FTP PORT upload with CWD
diff --git a/tests/data/name109.txt b/tests/data/name109.txt
deleted file mode 100644
index 10fd5b955f99eefc0d9b26758061eb42c8664e71..0000000000000000000000000000000000000000
--- a/tests/data/name109.txt
+++ /dev/null
@@ -1 +0,0 @@
-FTP PASV upload append
diff --git a/tests/data/name11.txt b/tests/data/name11.txt
deleted file mode 100644
index fa15490583cb5df0105a86f23e71d1f06e467af5..0000000000000000000000000000000000000000
--- a/tests/data/name11.txt
+++ /dev/null
@@ -1 +0,0 @@
-simple HTTP Location: following
diff --git a/tests/data/name110.txt b/tests/data/name110.txt
deleted file mode 100644
index 7761f4b1c87a219a17a4f7989ac54e0b598a8ee5..0000000000000000000000000000000000000000
--- a/tests/data/name110.txt
+++ /dev/null
@@ -1 +0,0 @@
-FTP download resume with set limit
diff --git a/tests/data/name111.txt b/tests/data/name111.txt
deleted file mode 100644
index 4ef5452b2f0c5167026091b27c164c99941e3dd7..0000000000000000000000000000000000000000
--- a/tests/data/name111.txt
+++ /dev/null
@@ -1 +0,0 @@
-FTP download resume beyond file size
diff --git a/tests/data/name112.txt b/tests/data/name112.txt
deleted file mode 100644
index 1d310a848306363b45844ab5ff1a4247950fd5a5..0000000000000000000000000000000000000000
--- a/tests/data/name112.txt
+++ /dev/null
@@ -1 +0,0 @@
-FTP PASV upload resume
diff --git a/tests/data/name113.txt b/tests/data/name113.txt
deleted file mode 100644
index 69ed5a8f4843a79d0b0fe712aaf94a6cddc337a4..0000000000000000000000000000000000000000
--- a/tests/data/name113.txt
+++ /dev/null
@@ -1 +0,0 @@
-FTP download, failed login
diff --git a/tests/data/name114.txt b/tests/data/name114.txt
deleted file mode 100644
index 71b8f97ccdce2a8f73a5ce5c9971c59ed98399ae..0000000000000000000000000000000000000000
--- a/tests/data/name114.txt
+++ /dev/null
@@ -1 +0,0 @@
-FTP download, failed PASS
diff --git a/tests/data/name115.txt b/tests/data/name115.txt
deleted file mode 100644
index d65a8a3935c4b13eec31ed2e8dc2990c0c65a503..0000000000000000000000000000000000000000
--- a/tests/data/name115.txt
+++ /dev/null
@@ -1 +0,0 @@
-FTP download, failed PASV
diff --git a/tests/data/name116.txt b/tests/data/name116.txt
deleted file mode 100644
index 7bf987bb97481c5ceac9fd2119541d6eb9899663..0000000000000000000000000000000000000000
--- a/tests/data/name116.txt
+++ /dev/null
@@ -1 +0,0 @@
-FTP download, failed PORT
diff --git a/tests/data/name117.txt b/tests/data/name117.txt
deleted file mode 100644
index 1ef7cf9b0cc560e32bd2765b23316ef5382ba0f6..0000000000000000000000000000000000000000
--- a/tests/data/name117.txt
+++ /dev/null
@@ -1 +0,0 @@
-FTP download, failed TYPE
diff --git a/tests/data/name118.txt b/tests/data/name118.txt
deleted file mode 100644
index 3540f40d002d6b9cb1eb8ef66b1176b4cba8b942..0000000000000000000000000000000000000000
--- a/tests/data/name118.txt
+++ /dev/null
@@ -1 +0,0 @@
-FTP download, failed RETR
diff --git a/tests/data/name119.txt b/tests/data/name119.txt
deleted file mode 100644
index 55bc99b5161b01ca05c1f09c9ce75c682fda3ad7..0000000000000000000000000000000000000000
--- a/tests/data/name119.txt
+++ /dev/null
@@ -1 +0,0 @@
-FTP download, failed RETR with PORT
diff --git a/tests/data/name12.txt b/tests/data/name12.txt
deleted file mode 100644
index c4268d3066ec3fa91a71cf24319cddfb3689e5e2..0000000000000000000000000000000000000000
--- a/tests/data/name12.txt
+++ /dev/null
@@ -1 +0,0 @@
-HTTP range support
diff --git a/tests/data/name120.txt b/tests/data/name120.txt
deleted file mode 100644
index 83b565d0024a57798cc55298893c34465b267633..0000000000000000000000000000000000000000
--- a/tests/data/name120.txt
+++ /dev/null
@@ -1 +0,0 @@
-ftp download with post-quote delete operation
diff --git a/tests/data/name121.txt b/tests/data/name121.txt
deleted file mode 100644
index ae17f9d44c3ec8347692c6a61b4dbc1d51fcc823..0000000000000000000000000000000000000000
--- a/tests/data/name121.txt
+++ /dev/null
@@ -1 +0,0 @@
-ftp download with post- and pre-transfer delete operations
diff --git a/tests/data/name122.txt b/tests/data/name122.txt
deleted file mode 100644
index d7bc58f0a96bede99df29941d53f15e7f23632c3..0000000000000000000000000000000000000000
--- a/tests/data/name122.txt
+++ /dev/null
@@ -1 +0,0 @@
-FTP download resume with whole file already downloaded
diff --git a/tests/data/name123.txt b/tests/data/name123.txt
deleted file mode 100644
index c198dd71f602dc33f9d58f63d59b13109a6cc5a1..0000000000000000000000000000000000000000
--- a/tests/data/name123.txt
+++ /dev/null
@@ -1 +0,0 @@
-FTP upload resume with whole file already uploaded
diff --git a/tests/data/name13.txt b/tests/data/name13.txt
deleted file mode 100644
index 9c36e43b5fd4f9b0039b443e929bb41664c1e161..0000000000000000000000000000000000000000
--- a/tests/data/name13.txt
+++ /dev/null
@@ -1 +0,0 @@
-HTTP custom request 'DELETE'
\ No newline at end of file
diff --git a/tests/data/name14.txt b/tests/data/name14.txt
deleted file mode 100644
index 12bbf972d81e4057bd45c9c19ac0f8859dbdfe02..0000000000000000000000000000000000000000
--- a/tests/data/name14.txt
+++ /dev/null
@@ -1 +0,0 @@
-HTTP HEAD with Connection: close
diff --git a/tests/data/name15.txt b/tests/data/name15.txt
deleted file mode 100644
index a14aa7d31898b5a1a294d950c2b27a5c26ba024c..0000000000000000000000000000000000000000
--- a/tests/data/name15.txt
+++ /dev/null
@@ -1 +0,0 @@
---write-out test
diff --git a/tests/data/name16.txt b/tests/data/name16.txt
deleted file mode 100644
index e00da9d4a80ee343a94dca8e9a47785c467e282b..0000000000000000000000000000000000000000
--- a/tests/data/name16.txt
+++ /dev/null
@@ -1 +0,0 @@
-HTTP with proxy athorization
diff --git a/tests/data/name17.txt b/tests/data/name17.txt
deleted file mode 100644
index f9f4ec3086cb185085c17744d83a314b14e296b2..0000000000000000000000000000000000000000
--- a/tests/data/name17.txt
+++ /dev/null
@@ -1 +0,0 @@
-HTTP with config file on stdin
diff --git a/tests/data/name18.txt b/tests/data/name18.txt
deleted file mode 100644
index ef15d086b62de77a07c0ee68a29688b2bb70f080..0000000000000000000000000000000000000000
--- a/tests/data/name18.txt
+++ /dev/null
@@ -1 +0,0 @@
-multiple requests using {} in URL
diff --git a/tests/data/name19.txt b/tests/data/name19.txt
deleted file mode 100644
index d98a99dd552f1a590638f7d2da61b9fdece241e0..0000000000000000000000000000000000000000
--- a/tests/data/name19.txt
+++ /dev/null
@@ -1 +0,0 @@
-connect to non-listening socket
diff --git a/tests/data/name2.txt b/tests/data/name2.txt
deleted file mode 100644
index 670500639e4030d10d8a31ce29bfba84ddeba324..0000000000000000000000000000000000000000
--- a/tests/data/name2.txt
+++ /dev/null
@@ -1 +0,0 @@
-HTTP GET with user and password
diff --git a/tests/data/name20.txt b/tests/data/name20.txt
deleted file mode 100644
index 33b75044b913092ac1835e83166852148dd266c1..0000000000000000000000000000000000000000
--- a/tests/data/name20.txt
+++ /dev/null
@@ -1 +0,0 @@
-connect to non-existing host name
diff --git a/tests/data/name200.txt b/tests/data/name200.txt
deleted file mode 100644
index 0defc8cd0080ac1f5446f83c58a1750dc7ae24c2..0000000000000000000000000000000000000000
--- a/tests/data/name200.txt
+++ /dev/null
@@ -1 +0,0 @@
-file:// with relative path
diff --git a/tests/data/name201.txt b/tests/data/name201.txt
deleted file mode 100644
index fd357f57591ec74b403987a8754a579ed4680026..0000000000000000000000000000000000000000
--- a/tests/data/name201.txt
+++ /dev/null
@@ -1 +0,0 @@
-file:// with non-existing file
diff --git a/tests/data/name21.txt b/tests/data/name21.txt
deleted file mode 100644
index 301b2b55260eb0655418acec9bc189154b108536..0000000000000000000000000000000000000000
--- a/tests/data/name21.txt
+++ /dev/null
@@ -1 +0,0 @@
-use curl with multiple request methods
diff --git a/tests/data/name22.txt b/tests/data/name22.txt
deleted file mode 100644
index 85f06d97dcdd2a9b03e8d268d84b0b458d36fe17..0000000000000000000000000000000000000000
--- a/tests/data/name22.txt
+++ /dev/null
@@ -1 +0,0 @@
-HTTP with URL > 10000 bytes
diff --git a/tests/data/name23.txt b/tests/data/name23.txt
deleted file mode 100644
index c44ad8502e29aabbe3814f78f5ebde84f8290922..0000000000000000000000000000000000000000
--- a/tests/data/name23.txt
+++ /dev/null
@@ -1 +0,0 @@
-bad protocol://
diff --git a/tests/data/name24.txt b/tests/data/name24.txt
deleted file mode 100644
index b55014ef922f1e50cfe01d1dc7243728729d6973..0000000000000000000000000000000000000000
--- a/tests/data/name24.txt
+++ /dev/null
@@ -1 +0,0 @@
-HTTP GET fail silently on HTTP error return
diff --git a/tests/data/name25.txt b/tests/data/name25.txt
deleted file mode 100644
index b02c8e7e51a49925f201a78a208e38b89de0a525..0000000000000000000000000000000000000000
--- a/tests/data/name25.txt
+++ /dev/null
@@ -1 +0,0 @@
-looping HTTP Location: following with --max-redirs, no persistance
diff --git a/tests/data/name26.txt b/tests/data/name26.txt
deleted file mode 100644
index 4c300b24834915a40fa0b22dbd3da10902478594..0000000000000000000000000000000000000000
--- a/tests/data/name26.txt
+++ /dev/null
@@ -1 +0,0 @@
-specify more -o than URLs
diff --git a/tests/data/name27.txt b/tests/data/name27.txt
deleted file mode 100644
index 90a851fe9d2fb18606c2541f4c4048a76eea0d62..0000000000000000000000000000000000000000
--- a/tests/data/name27.txt
+++ /dev/null
@@ -1 +0,0 @@
-getting three URLs in one command line (to stdout)
diff --git a/tests/data/name28.txt b/tests/data/name28.txt
deleted file mode 100644
index 07ea09c0e18e6b9060b823a213a5569f743bd75b..0000000000000000000000000000000000000000
--- a/tests/data/name28.txt
+++ /dev/null
@@ -1 +0,0 @@
---globoff with {][} in URL
diff --git a/tests/data/name29.txt b/tests/data/name29.txt
deleted file mode 100644
index 10084f4b0ea6539f1f375f5fb37909023e9cf579..0000000000000000000000000000000000000000
--- a/tests/data/name29.txt
+++ /dev/null
@@ -1 +0,0 @@
-HTTP download resume with Content-Length validity
diff --git a/tests/data/name3.txt b/tests/data/name3.txt
deleted file mode 100644
index 581a4267a59de2c98e5a41fc293659f65322a045..0000000000000000000000000000000000000000
--- a/tests/data/name3.txt
+++ /dev/null
@@ -1 +0,0 @@
-HTTP POST with user and password
diff --git a/tests/data/name30.txt b/tests/data/name30.txt
deleted file mode 100644
index 4945ee27527d393e694fe9c00b34c80bc3e0c173..0000000000000000000000000000000000000000
--- a/tests/data/name30.txt
+++ /dev/null
@@ -1 +0,0 @@
-HTTP GET uncomplete document
\ No newline at end of file
diff --git a/tests/data/name300.txt b/tests/data/name300.txt
deleted file mode 100644
index c6cddb2194f62e05f93ba6a095e62edb23a7e833..0000000000000000000000000000000000000000
--- a/tests/data/name300.txt
+++ /dev/null
@@ -1 +0,0 @@
-simple HTTPS GET
diff --git a/tests/data/name31.txt b/tests/data/name31.txt
deleted file mode 100644
index 7e3df9febc9d329a9a80ccab29c1aed138860abc..0000000000000000000000000000000000000000
--- a/tests/data/name31.txt
+++ /dev/null
@@ -1 +0,0 @@
-HTTP POST and follow Location: (error 301)
diff --git a/tests/data/name32.txt b/tests/data/name32.txt
deleted file mode 100644
index ba04e8fff54dbb0908606abc302d42df60956898..0000000000000000000000000000000000000000
--- a/tests/data/name32.txt
+++ /dev/null
@@ -1 +0,0 @@
-HTTP POST and follow Location: (error 303)
diff --git a/tests/data/name33.txt b/tests/data/name33.txt
deleted file mode 100644
index 5e6fcaddb95558b269724f18b5433d3703cbb381..0000000000000000000000000000000000000000
--- a/tests/data/name33.txt
+++ /dev/null
@@ -1 +0,0 @@
-HTTP PUT resume
diff --git a/tests/data/name34.txt b/tests/data/name34.txt
deleted file mode 100644
index 0c91ed354a12ad5e75624a8d9d00d6f202ac4fcb..0000000000000000000000000000000000000000
--- a/tests/data/name34.txt
+++ /dev/null
@@ -1 +0,0 @@
-HTTP GET with chunked Transfer-Encoding
diff --git a/tests/data/name35.txt b/tests/data/name35.txt
deleted file mode 100644
index d6c399325f88edbddd37ee0cc8e6793af87ac8b5..0000000000000000000000000000000000000000
--- a/tests/data/name35.txt
+++ /dev/null
@@ -1 +0,0 @@
-HTTP HEAD without Connection: close
diff --git a/tests/data/name36.txt b/tests/data/name36.txt
deleted file mode 100644
index 786f1ad8ae1be40e4393c13ca85dbfb0928b2c0a..0000000000000000000000000000000000000000
--- a/tests/data/name36.txt
+++ /dev/null
@@ -1 +0,0 @@
-HTTP GET with badly formatted chunked Transfer-Encoding
diff --git a/tests/data/name37.txt b/tests/data/name37.txt
deleted file mode 100644
index fef9ec17160e59e07bc596082dd5f3b4cf1ce6cd..0000000000000000000000000000000000000000
--- a/tests/data/name37.txt
+++ /dev/null
@@ -1 +0,0 @@
-HTTP GET with name+password in the URL
diff --git a/tests/data/name38.txt b/tests/data/name38.txt
deleted file mode 100644
index 80a8b962e177ed4c8c8b41e3a0183215324c1dd8..0000000000000000000000000000000000000000
--- a/tests/data/name38.txt
+++ /dev/null
@@ -1 +0,0 @@
-HTTP GET with user+password in URL and Location: and --include
diff --git a/tests/data/name39.txt b/tests/data/name39.txt
deleted file mode 100644
index aae5ce653eecfb640e92e90801fe5924a9ff894b..0000000000000000000000000000000000000000
--- a/tests/data/name39.txt
+++ /dev/null
@@ -1 +0,0 @@
-HTTP GET with location following and -C
diff --git a/tests/data/name4.txt b/tests/data/name4.txt
deleted file mode 100644
index df748d37516a4c193c8b54ff1ce1a78211b3d547..0000000000000000000000000000000000000000
--- a/tests/data/name4.txt
+++ /dev/null
@@ -1 +0,0 @@
-Replaced internal and added custom HTTP headers
diff --git a/tests/data/name40.txt b/tests/data/name40.txt
deleted file mode 100644
index 456ffc92d43a929e5a0513d9c9df74e654a7e8c9..0000000000000000000000000000000000000000
--- a/tests/data/name40.txt
+++ /dev/null
@@ -1 +0,0 @@
-HTTP GET returns content-length 0 on persitent connection
diff --git a/tests/data/name400.txt b/tests/data/name400.txt
deleted file mode 100644
index 148cedd73445b890f3e25cbcf31766eae4ff26c6..0000000000000000000000000000000000000000
--- a/tests/data/name400.txt
+++ /dev/null
@@ -1 +0,0 @@
-FTP dir list PASV
diff --git a/tests/data/name41.txt b/tests/data/name41.txt
deleted file mode 100644
index affeb5dc467f1b9b5cf606326050fb3b57a1a215..0000000000000000000000000000000000000000
--- a/tests/data/name41.txt
+++ /dev/null
@@ -1 +0,0 @@
-HTTP with proxy AND web page athorization
diff --git a/tests/data/name5.txt b/tests/data/name5.txt
deleted file mode 100644
index de72604102976e10a90b14f7e80c55e31cb2136a..0000000000000000000000000000000000000000
--- a/tests/data/name5.txt
+++ /dev/null
@@ -1 +0,0 @@
-HTTP over proxy
diff --git a/tests/data/name6.txt b/tests/data/name6.txt
deleted file mode 100644
index 5cfcf871918c9c1353a1c9356a3090ab827ba94b..0000000000000000000000000000000000000000
--- a/tests/data/name6.txt
+++ /dev/null
@@ -1 +0,0 @@
-HTTP with simple cookie send
diff --git a/tests/data/name7.txt b/tests/data/name7.txt
deleted file mode 100644
index 8dd34dee3b91a4429b95336c23866b39ae4d1e6d..0000000000000000000000000000000000000000
--- a/tests/data/name7.txt
+++ /dev/null
@@ -1 +0,0 @@
-HTTP with cookie parser and header recording
diff --git a/tests/data/name8.txt b/tests/data/name8.txt
deleted file mode 100644
index d3571f47135f289e1334e42a1741c23e585ddd55..0000000000000000000000000000000000000000
--- a/tests/data/name8.txt
+++ /dev/null
@@ -1 +0,0 @@
-HTTP with cookie parsing from header file, must follow test 7
diff --git a/tests/data/name9.txt b/tests/data/name9.txt
deleted file mode 100644
index 82d7b5899af2394a5a27037537129a1a02751461..0000000000000000000000000000000000000000
--- a/tests/data/name9.txt
+++ /dev/null
@@ -1 +0,0 @@
-HTTP RFC1867-type formposting
diff --git a/tests/data/prot1.txt b/tests/data/prot1.txt
deleted file mode 100644
index d5f8c7dfdb67bc958d1a64fe06c57814e1027c6d..0000000000000000000000000000000000000000
--- a/tests/data/prot1.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-GET /1 HTTP/1.1
-User-Agent: curl/7.4.2-pre3 (sparc-sun-solaris2.7) libcurl 7.4.2-pre3 (SSL 0.9.6)
-Host: 127.0.0.1:8999
-Pragma: no-cache
-Accept: image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, */*
-
diff --git a/tests/data/prot10.txt b/tests/data/prot10.txt
deleted file mode 100644
index 6bc00c241cf98c9f139e8095225ebec0b9c77a9d..0000000000000000000000000000000000000000
--- a/tests/data/prot10.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-PUT /we/want/10 HTTP/1.1
-Host: 127.0.0.1:8999
-Pragma: no-cache
-Accept: image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, */*
-Content-Length: 60
-
-http://%HOSTIP:%HOSTPORT/we/want/10 -T data/command10.txt
-
-
diff --git a/tests/data/prot100.txt b/tests/data/prot100.txt
deleted file mode 100644
index 7cce3a214eb10865b10e9377f632135e8fdabd9a..0000000000000000000000000000000000000000
--- a/tests/data/prot100.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-USER anonymous
-PASS curl_by_daniel@haxx.se
-PWD
-PASV
-TYPE A
-LIST
diff --git a/tests/data/prot101.txt b/tests/data/prot101.txt
deleted file mode 100644
index ad297aa15f66149a2bce80a5a492add3b555f3ba..0000000000000000000000000000000000000000
--- a/tests/data/prot101.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-USER anonymous
-PASS curl_by_daniel@haxx.se
-PWD
-PORT 127,0,0,1,243,212
-TYPE A
-LIST
diff --git a/tests/data/prot102.txt b/tests/data/prot102.txt
deleted file mode 100644
index ddab1e2d2ee70f140996c34fc4a34626e058985d..0000000000000000000000000000000000000000
--- a/tests/data/prot102.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-USER anonymous
-PASS curl_by_daniel@haxx.se
-PWD
-PASV
-TYPE I
-RETR 102
diff --git a/tests/data/prot103.txt b/tests/data/prot103.txt
deleted file mode 100644
index eddd6c291877fe475e7749321f72accb24c5deb6..0000000000000000000000000000000000000000
--- a/tests/data/prot103.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-USER anonymous
-PASS curl_by_daniel@haxx.se
-PWD
-CWD a/path
-PORT 127,0,0,1,246,33
-TYPE I
-RETR 103
diff --git a/tests/data/prot104.txt b/tests/data/prot104.txt
deleted file mode 100644
index 265ea0dba4d2587864b475400c34cee3bebca2ac..0000000000000000000000000000000000000000
--- a/tests/data/prot104.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-USER anonymous
-PASS curl_by_daniel@haxx.se
-PWD
-CWD a/path
-MDTM 103
-TYPE I
-SIZE 103
diff --git a/tests/data/prot105.txt b/tests/data/prot105.txt
deleted file mode 100644
index 273dd64051ea1b59cc20669b55a3f6e451862ea3..0000000000000000000000000000000000000000
--- a/tests/data/prot105.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-USER userdude
-PASS passfellow
-PWD
-PASV
-TYPE A
-RETR 103
diff --git a/tests/data/prot106.txt b/tests/data/prot106.txt
deleted file mode 100644
index cd8b81a11b664e5fa34fdbf3234d96ec86a5fbfb..0000000000000000000000000000000000000000
--- a/tests/data/prot106.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-USER anonymous
-PASS curl_by_daniel@haxx.se
-PWD
-CWD /path with  spaces/and things2
-PASV
-TYPE A
-RETR 106
diff --git a/tests/data/prot107.txt b/tests/data/prot107.txt
deleted file mode 100644
index 23b32cfd3e4f5438041a513e97121b0649801fbc..0000000000000000000000000000000000000000
--- a/tests/data/prot107.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-USER anonymous
-PASS curl_by_daniel@haxx.se
-PWD
-PASV
-TYPE I
-STOR 107
diff --git a/tests/data/prot108.txt b/tests/data/prot108.txt
deleted file mode 100644
index 7828bca8642de0beab5cb83834d075fd143a5bb9..0000000000000000000000000000000000000000
--- a/tests/data/prot108.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-USER anonymous
-PASS curl_by_daniel@haxx.se
-PWD
-CWD CWD/STOR/RETR
-PORT 127,0,0,1,5,109
-TYPE I
-STOR 108
diff --git a/tests/data/prot109.txt b/tests/data/prot109.txt
deleted file mode 100644
index abe7d0c537c105040e54a332b710a5ad0e906583..0000000000000000000000000000000000000000
--- a/tests/data/prot109.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-USER anonymous
-PASS curl_by_daniel@haxx.se
-PWD
-PASV
-TYPE I
-APPE 109
diff --git a/tests/data/prot11.txt b/tests/data/prot11.txt
deleted file mode 100644
index b40ac52689570f14c26daff448f8e8e13483703b..0000000000000000000000000000000000000000
--- a/tests/data/prot11.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-GET /want/11 HTTP/1.1
-Host: 127.0.0.1:8999
-Pragma: no-cache
-Accept: image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, */*
-
-GET /want/data/110002.txt?coolsite=yes HTTP/1.1
-Host: 127.0.0.1:8999
-Pragma: no-cache
-Accept: image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, */*
-
diff --git a/tests/data/prot110.txt b/tests/data/prot110.txt
deleted file mode 100644
index b1fcf470a05508d24e41b104858292e6ae89cba5..0000000000000000000000000000000000000000
--- a/tests/data/prot110.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-USER anonymous
-PASS curl_by_daniel@haxx.se
-PWD
-PASV
-TYPE I
-SIZE 110
-REST 20
-RETR 110
diff --git a/tests/data/prot112.txt b/tests/data/prot112.txt
deleted file mode 100644
index 3c75c013a37221315b34147f8b1f99fc22158dd8..0000000000000000000000000000000000000000
--- a/tests/data/prot112.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-USER anonymous
-PASS curl_by_daniel@haxx.se
-PWD
-PASV
-TYPE I
-APPE 112
diff --git a/tests/data/prot12.txt b/tests/data/prot12.txt
deleted file mode 100644
index cc15876314a488ead265dfeb1648446bfa4d406d..0000000000000000000000000000000000000000
--- a/tests/data/prot12.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-GET /want/12 HTTP/1.1
-Range: bytes=100-200
-Host: 127.0.0.1:8999
-Pragma: no-cache
-Accept: image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, */*
-
diff --git a/tests/data/prot120.txt b/tests/data/prot120.txt
deleted file mode 100644
index 6f5a0d2c8123e92bdc048459dcf2310068d0a8d0..0000000000000000000000000000000000000000
--- a/tests/data/prot120.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-USER anonymous
-PASS curl_by_daniel@haxx.se
-PWD
-PASV
-TYPE I
-RETR 106
-DELE file
diff --git a/tests/data/prot121.txt b/tests/data/prot121.txt
deleted file mode 100644
index bc0a25f2d37577e5e0d73f2a4b71760766ef892a..0000000000000000000000000000000000000000
--- a/tests/data/prot121.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-USER anonymous
-PASS curl_by_daniel@haxx.se
-PWD
-DELE before_transfer
-PASV
-TYPE I
-RETR 106
-DELE after_transfer
diff --git a/tests/data/prot122.txt b/tests/data/prot122.txt
deleted file mode 100644
index b74f26b4baee5182bf9420b178b2cdfa2c1f600e..0000000000000000000000000000000000000000
--- a/tests/data/prot122.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-USER anonymous
-PASS curl_by_daniel@haxx.se
-PWD
-PASV
-TYPE I
-SIZE 122
diff --git a/tests/data/prot123.txt b/tests/data/prot123.txt
deleted file mode 100644
index 7673491d4794cd73605b9966b865e14c51b14705..0000000000000000000000000000000000000000
--- a/tests/data/prot123.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-USER anonymous
-PASS curl_by_daniel@haxx.se
-PWD
-PASV
-TYPE I
diff --git a/tests/data/prot13.txt b/tests/data/prot13.txt
deleted file mode 100644
index 7de050931ce9ef11376f6bed3abd39af56f45a89..0000000000000000000000000000000000000000
--- a/tests/data/prot13.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-DELETE /want/13 HTTP/1.1
-Host: 127.0.0.1:8999
-Pragma: no-cache
-Accept: image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, */*
-
diff --git a/tests/data/prot14.txt b/tests/data/prot14.txt
deleted file mode 100644
index f503270fc868476a934d90f1bd456d6fa07fc52a..0000000000000000000000000000000000000000
--- a/tests/data/prot14.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-HEAD /want/14 HTTP/1.1
-User-Agent: curl/7.4.2-pre4 (sparc-sun-solaris2.7) libcurl 7.4.2-pre4
-Host: 127.0.0.1:8999
-Pragma: no-cache
-Accept: image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, */*
-
diff --git a/tests/data/prot15.txt b/tests/data/prot15.txt
deleted file mode 100644
index 0c79de8b0053bdb4ca7c0aaa3894de9456c9687f..0000000000000000000000000000000000000000
--- a/tests/data/prot15.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-GET /want/15 HTTP/1.1
-Host: 127.0.0.1:8999
-Pragma: no-cache
-Accept: image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, */*
-
diff --git a/tests/data/prot16.txt b/tests/data/prot16.txt
deleted file mode 100644
index 5858e5874d2951ff86b09c45b8a6d782770501a9..0000000000000000000000000000000000000000
--- a/tests/data/prot16.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-GET http://we.want.that.site.com/2 HTTP/1.1
-Proxy-authorization: Basic ZmFrZUB1c2VyOqenp2xvb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb28=
-Host: we.want.that.site.com
-Pragma: no-cache
-Accept: image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, */*
-
diff --git a/tests/data/prot17.txt b/tests/data/prot17.txt
deleted file mode 100644
index 1b945e2430366018b3e9822339073ec1cb037e4d..0000000000000000000000000000000000000000
--- a/tests/data/prot17.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-MOOO /that.site.com/17 HTTP/1.1
-User-Agent: agent007 license to drill
-Host: 127.0.0.1:8999
-Pragma: no-cache
-Accept: image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, */*
-
diff --git a/tests/data/prot18.txt b/tests/data/prot18.txt
deleted file mode 100644
index fd0e3e2fef0fa86c03347537f1e4d2e9d57c2940..0000000000000000000000000000000000000000
--- a/tests/data/prot18.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-GET /3 HTTP/1.1
-Host: 127.0.0.1:8999
-Pragma: no-cache
-Accept: image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, */*
-
-GET /10 HTTP/1.1
-Host: 127.0.0.1:8999
-Pragma: no-cache
-Accept: image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, */*
-
-GET /11 HTTP/1.1
-Host: 127.0.0.1:8999
-Pragma: no-cache
-Accept: image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, */*
-
diff --git a/tests/data/prot2.txt b/tests/data/prot2.txt
deleted file mode 100644
index 23074c4166a930cfed8236db581b24098af60342..0000000000000000000000000000000000000000
--- a/tests/data/prot2.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-GET /2 HTTP/1.1
-Authorization: Basic ZmFrZTp1c2Vy
-Host: 127.0.0.1:8999
-Pragma: no-cache
-Accept: image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, */*
-
diff --git a/tests/data/prot22.txt b/tests/data/prot22.txt
deleted file mode 100644
index 12082ba96d70f3420abceb791b92b3b09fc3762a..0000000000000000000000000000000000000000
--- a/tests/data/prot22.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-GET /aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/17 HTTP/1.1
-User-Agent: curl/7.4.2 (sparc-sun-solaris2.7) libcurl 7.4.2 (SSL 0.9.6)
-Host: 127.0.0.1:8999
-Pragma: no-cache
-Accept: image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, */*
-
diff --git a/tests/data/prot26.txt b/tests/data/prot26.txt
deleted file mode 100644
index be38e7dd78f9dc5f26fc36b30e1f25e89eb78ff0..0000000000000000000000000000000000000000
--- a/tests/data/prot26.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-GET /want/26 HTTP/1.1
-User-Agent: curl/7.6-pre1 (sparc-sun-solaris2.7) libcurl 7.5.2 (SSL 0.9.6) (krb4 enabled)
-Host: 127.0.0.1:8999
-Pragma: no-cache
-Accept: image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, */*
-
diff --git a/tests/data/prot27.txt b/tests/data/prot27.txt
deleted file mode 100644
index 682127e29b07ec5f0271e0580caa964e2970d6ab..0000000000000000000000000000000000000000
--- a/tests/data/prot27.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-GET /want/25 HTTP/1.1
-Host: 127.0.0.1:8999
-Pragma: no-cache
-Accept: image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, */*
-
-GET /want/24 HTTP/1.1
-Host: 127.0.0.1:8999
-Pragma: no-cache
-Accept: image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, */*
-
-GET /want/22 HTTP/1.1
-Host: 127.0.0.1:8999
-Pragma: no-cache
-Accept: image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, */*
-
diff --git a/tests/data/prot28.txt b/tests/data/prot28.txt
deleted file mode 100644
index 29b9adaaf652352dcd935d272fd1f27d105fc74a..0000000000000000000000000000000000000000
--- a/tests/data/prot28.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-GET /wantit/{}[]/28 HTTP/1.1
-Host: 127.0.0.1:8999
-Pragma: no-cache
-Accept: image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, */*
-
diff --git a/tests/data/prot29.txt b/tests/data/prot29.txt
deleted file mode 100644
index d111df4ddf307712825897156c765fe013cbfaf3..0000000000000000000000000000000000000000
--- a/tests/data/prot29.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-GET /29 HTTP/1.1
-Range: bytes=200-
-User-Agent: curl/7.6 (i686-pc-linux-gnu) libcurl 7.6 (SSL 0.9.5) (ipv6 enabled)
-Host: 127.0.0.1:8999
-Pragma: no-cache
-Accept: image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, */*
-
diff --git a/tests/data/prot3.txt b/tests/data/prot3.txt
deleted file mode 100644
index c4b232eefbd389a682097f9c872c6373d9b1d40a..0000000000000000000000000000000000000000
--- a/tests/data/prot3.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-POST /3 HTTP/1.1
-Authorization: Basic ZmFrZTotdXNlcg==
-Host: 127.0.0.1:8999
-Pragma: no-cache
-Accept: image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, */*
-Content-Length: 37
-Content-Type: application/x-www-form-urlencoded
-
-fooo=mooo&pooo=clue&doo=%20%20%20++++
diff --git a/tests/data/prot30.txt b/tests/data/prot30.txt
deleted file mode 100644
index c244a65203fc47a681fcc81f6f6254ebe6307aa3..0000000000000000000000000000000000000000
--- a/tests/data/prot30.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-GET /30 HTTP/1.1
-User-Agent: curl/7.6 (i686-pc-linux-gnu) libcurl 7.6 (SSL 0.9.5) (ipv6 enabled)
-Host: 127.0.0.1:8999
-Pragma: no-cache
-Accept: image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, */*
-
diff --git a/tests/data/prot300.txt b/tests/data/prot300.txt
deleted file mode 100644
index b5e6dc1bfc3ea8d90b8c9878a76a06a73b236c87..0000000000000000000000000000000000000000
--- a/tests/data/prot300.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-GET /300 HTTP/1.1
-User-Agent: curl/7.7 (i686-pc-linux-gnu) libcurl 7.7.1 (SSL 0.9.5) (ipv6 enabled)
-Host: 127.0.0.1:8433
-Pragma: no-cache
-Accept: image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, */*
-
diff --git a/tests/data/prot31.txt b/tests/data/prot31.txt
deleted file mode 100644
index 094c9f3f5728983ccb07cba60ad40488a0ce8d5f..0000000000000000000000000000000000000000
--- a/tests/data/prot31.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-POST /31 HTTP/1.1
-Host: 127.0.0.1:8999
-Pragma: no-cache
-Accept: image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, */*
-Content-Length: 9
-Content-Type: application/x-www-form-urlencoded
-
-mooo=fooo
-POST /moo/moo/moo/310002 HTTP/1.1
-Host: 127.0.0.1:8999
-Pragma: no-cache
-Accept: image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, */*
-Content-Length: 9
-Content-Type: application/x-www-form-urlencoded
-
-mooo=fooo
diff --git a/tests/data/prot32.txt b/tests/data/prot32.txt
deleted file mode 100644
index e8efcce0e44c1887ab26d0421e73cc919487dca7..0000000000000000000000000000000000000000
--- a/tests/data/prot32.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-POST /32 HTTP/1.1
-Host: 127.0.0.1:8999
-Pragma: no-cache
-Accept: image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, */*
-Content-Length: 9
-Content-Type: application/x-www-form-urlencoded
-
-mooo=fooo
-GET /moo/moo/moo/320002 HTTP/1.1
-Host: 127.0.0.1:8999
-Pragma: no-cache
-Accept: image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, */*
-
diff --git a/tests/data/prot33.txt b/tests/data/prot33.txt
deleted file mode 100644
index 5463f27076c4c10a2da4506818c861e07900c7bd..0000000000000000000000000000000000000000
--- a/tests/data/prot33.txt
+++ /dev/null
@@ -1,18 +0,0 @@
-PUT /33 HTTP/1.1
-Content-Range: bytes 50-149/150
-User-Agent: curl/7.6 (sparc-sun-solaris2.7) libcurl 7.6-pre4 (SSL 0.9.6) (krb4 enabled)
-Host: 127.0.0.1:8999
-Pragma: no-cache
-Accept: image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, */*
-Content-Length: 100
-
-012345678
-012345678
-012345678
-012345678
-012345678
-012345678
-012345678
-012345678
-012345678
-012345678
diff --git a/tests/data/prot34.txt b/tests/data/prot34.txt
deleted file mode 100644
index cbc25212fc6117f213b6c507b7d0aaf7e7807e7a..0000000000000000000000000000000000000000
--- a/tests/data/prot34.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-GET /34 HTTP/1.1
-User-Agent: curl/7.7-alpha2 (sparc-sun-solaris2.7) libcurl 7.7-alpha2 (SSL 0.9.6) (krb4 enabled)
-Host: 127.0.0.1:8999
-Pragma: no-cache
-Accept: image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, */*
-
diff --git a/tests/data/prot35.txt b/tests/data/prot35.txt
deleted file mode 100644
index 5a6f32ccbbf0da740e9324778befb6e2164ba4b9..0000000000000000000000000000000000000000
--- a/tests/data/prot35.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-HEAD /want/35 HTTP/1.1
-User-Agent: curl/7.7-alpha2 (sparc-sun-solaris2.7) libcurl 7.7-alpha2 (SSL 0.9.6) (krb4 enabled)
-Host: 127.0.0.1:8999
-Pragma: no-cache
-Accept: image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, */*
-
diff --git a/tests/data/prot37.txt b/tests/data/prot37.txt
deleted file mode 100644
index 59a06d214eb655003f0ea3c7c0f417146adc2a9d..0000000000000000000000000000000000000000
--- a/tests/data/prot37.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-GET /37 HTTP/1.1
-Authorization: Basic dVVzU2VFcnJyOnBwcGFzc3dyZA==
-User-Agent: curl/7.7-beta1 (i686-pc-linux-gnu) libcurl 7.7-beta1 (SSL 0.9.5)
-Host: 127.0.0.1:8999
-Pragma: no-cache
-Accept: image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, */*
-
diff --git a/tests/data/prot38.txt b/tests/data/prot38.txt
deleted file mode 100644
index aa661355ebd0ec1efe05c369bc3c0b044f0ebddf..0000000000000000000000000000000000000000
--- a/tests/data/prot38.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-GET /38 HTTP/1.1
-Authorization: Basic dXNlcjpwd2Q=
-Host: 127.0.0.1:8999
-Pragma: no-cache
-Accept: image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, */*
-
-GET /ffffooooooooooooooooooooooooooooooooooooooooooooooooooo/37?fake HTTP/1.1
-Host: 127.0.0.1:8999
-Pragma: no-cache
-Accept: image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, */*
-
diff --git a/tests/data/prot39.txt b/tests/data/prot39.txt
deleted file mode 100644
index 93640677d68b473a392bf8cf3806b0da7612c4dd..0000000000000000000000000000000000000000
--- a/tests/data/prot39.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-GET /want/39 HTTP/1.1
-Range: bytes=20-
-User-Agent: curl/7.7-beta4 (sparc-sun-solaris2.7) libcurl 7.7-beta4 (SSL 0.9.6) (krb4 enabled)
-Host: 127.0.0.1:8999
-Pragma: no-cache
-Accept: image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, */*
-
-GET /want/data/390002.txt?coolsite=yes HTTP/1.1
-Range: bytes=20-
-User-Agent: curl/7.7-beta4 (sparc-sun-solaris2.7) libcurl 7.7-beta4 (SSL 0.9.6) (krb4 enabled)
-Host: 127.0.0.1:8999
-Pragma: no-cache
-Accept: image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, */*
-
diff --git a/tests/data/prot4.txt b/tests/data/prot4.txt
deleted file mode 100644
index a651bbef7c62cf31373bb2c834a3607fe957b89d..0000000000000000000000000000000000000000
--- a/tests/data/prot4.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-GET /4 HTTP/1.1
-Host: 127.0.0.1:8999
-Pragma: no-cache
-extra-header: here
-Accept: replaced
-
diff --git a/tests/data/prot40.txt b/tests/data/prot40.txt
deleted file mode 100644
index 65ef8ee3aaaae92dad9a1a9035edf78defa08822..0000000000000000000000000000000000000000
--- a/tests/data/prot40.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-GET /want/40 HTTP/1.1
-User-Agent: curl/7.7.2 (sparc-sun-solaris2.7) libcurl 7.7.2 (OpenSSL 0.9.6a) (krb4 enabled)
-Host: 127.0.0.1:8999
-Pragma: no-cache
-Accept: image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, */*
-
diff --git a/tests/data/prot400.txt b/tests/data/prot400.txt
deleted file mode 100644
index 7cce3a214eb10865b10e9377f632135e8fdabd9a..0000000000000000000000000000000000000000
--- a/tests/data/prot400.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-USER anonymous
-PASS curl_by_daniel@haxx.se
-PWD
-PASV
-TYPE A
-LIST
diff --git a/tests/data/prot41.txt b/tests/data/prot41.txt
deleted file mode 100644
index 2a2e7b4443ca3a37f89568172f7932a8b7b05b3a..0000000000000000000000000000000000000000
--- a/tests/data/prot41.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-GET http://weeird.site.com/YES/boo/2 HTTP/1.1
-Proxy-authorization: Basic cHJveHk6cHBwcA==
-Authorization: Basic c2l0ZTptb29vbw==
-User-Agent: curl/7.7.2 (sparc-sun-solaris2.7) libcurl 7.7.2 (OpenSSL 0.9.6a) (krb4 enabled)
-Host: weeird.site.com
-Pragma: no-cache
-Accept: image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, */*
-
diff --git a/tests/data/prot5.txt b/tests/data/prot5.txt
deleted file mode 100644
index dd5b3e6a688b5812a94fe60ff0d001a1f57a705a..0000000000000000000000000000000000000000
--- a/tests/data/prot5.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-GET http://127.0.0.1:8999/we/want/that/page/5 HTTP/1.1
-Host: 127.0.0.1:8999
-Pragma: no-cache
-Accept: image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, */*
-
diff --git a/tests/data/prot6.txt b/tests/data/prot6.txt
deleted file mode 100644
index 809c337d4cd5ecf9b1a2cf16d5df6a98472ae5c0..0000000000000000000000000000000000000000
--- a/tests/data/prot6.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-GET /we/want/that/page/6 HTTP/1.1
-Cookie: name=contents;name2=content2
-Host: 127.0.0.1:8999
-Pragma: no-cache
-Accept: image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, */*
-
diff --git a/tests/data/prot7.txt b/tests/data/prot7.txt
deleted file mode 100644
index 3d0b9eee2f6ae2e06378f169c1c32b518de2e09b..0000000000000000000000000000000000000000
--- a/tests/data/prot7.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-GET /we/want/7 HTTP/1.1
-Host: 127.0.0.1:8999
-Pragma: no-cache
-Accept: image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, */*
-
diff --git a/tests/data/prot8.txt b/tests/data/prot8.txt
deleted file mode 100644
index 0ace2ad54c4cce4ae3ff28f5c3abf413ccb96b5f..0000000000000000000000000000000000000000
--- a/tests/data/prot8.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-GET /we/want/8 HTTP/1.1
-Host: 127.0.0.1:8999
-Pragma: no-cache
-Accept: image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, */*
-Cookie: foobar=name; partmatch=present
-
diff --git a/tests/data/prot9.txt b/tests/data/prot9.txt
deleted file mode 100644
index 2614b71ab323b29bdea8d131bf7c01feb8c83fd6..0000000000000000000000000000000000000000
--- a/tests/data/prot9.txt
+++ /dev/null
@@ -1,23 +0,0 @@
-POST /we/want/9 HTTP/1.1
-Host: 127.0.0.1:8999
-Pragma: no-cache
-Accept: image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, */*
-Content-Length: 446
-Content-Type: multipart/form-data; boundary=curluczemxkcWWsxptLlAImrFQHwQ3W
-
---curluczemxkcWWsxptLlAImrFQHwQ3W
-Content-Disposition: form-data; name="name"
-
-daniel
---curluczemxkcWWsxptLlAImrFQHwQ3W
-Content-Disposition: form-data; name="tool"
-
-curl
---curluczemxkcWWsxptLlAImrFQHwQ3W
-Content-Disposition: form-data; name="file"; filename="data/command9.txt"
-Content-Type: text/plain
-
-http://%HOSTIP:%HOSTPORT/we/want/9 -F name=daniel -F tool=curl -F file=@data/command9.txt
-
-
---curluczemxkcWWsxptLlAImrFQHwQ3W--
diff --git a/tests/data/reply1.txt b/tests/data/reply1.txt
deleted file mode 100644
index 65221c000dee880a106254beb8cb0fdb19f3ada2..0000000000000000000000000000000000000000
--- a/tests/data/reply1.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-HTTP/1.1 200 OK
-Date: Thu, 09 Nov 2010 14:49:00 GMT
-Server: test-server/fake
-Last-Modified: Tue, 13 Jun 2000 12:10:00 GMT
-ETag: "21025-dc7-39462498"
-Accept-Ranges: bytes
-Content-Length: 6
-Connection: close
-Content-Type: text/html
-Funny-head: yesyes
-
-<foo>
diff --git a/tests/data/reply10.txt b/tests/data/reply10.txt
deleted file mode 100644
index a36ffa4a58e8009c9262a22b6f026b50b867d38a..0000000000000000000000000000000000000000
--- a/tests/data/reply10.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-HTTP/1.0 200 OK
-Date: Thu, 09 Nov 2010 14:49:00 GMT
-Server: test-server/fake
-
-blablabla
diff --git a/tests/data/reply101.txt b/tests/data/reply101.txt
deleted file mode 100644
index 1baaf9385e317ae18cade32bc49446e824fa2f65..0000000000000000000000000000000000000000
--- a/tests/data/reply101.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-total 20
-drwxr-xr-x   8 98       98           512 Oct 22 13:06 .
-drwxr-xr-x   8 98       98           512 Oct 22 13:06 ..
-drwxr-xr-x   2 98       98           512 May  2  1996 .NeXT
--r--r--r--   1 0        1             35 Jul 16  1996 README
-lrwxrwxrwx   1 0        1              7 Dec  9  1999 bin -> usr/bin
-dr-xr-xr-x   2 0        1            512 Oct  1  1997 dev
-drwxrwxrwx   2 98       98           512 May 29 16:04 download.html
-dr-xr-xr-x   2 0        1            512 Nov 30  1995 etc
-drwxrwxrwx   2 98       1            512 Oct 30 14:33 pub
-dr-xr-xr-x   5 0        1            512 Oct  1  1997 usr
diff --git a/tests/data/reply102.txt b/tests/data/reply102.txt
deleted file mode 100644
index 0cfa203ddcc2fc5644dec65050aadd6cdef85738..0000000000000000000000000000000000000000
--- a/tests/data/reply102.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-data
-    to
-      see
-that FTP
-works
-  so does it?
diff --git a/tests/data/reply103.txt b/tests/data/reply103.txt
deleted file mode 100644
index 0cfa203ddcc2fc5644dec65050aadd6cdef85738..0000000000000000000000000000000000000000
--- a/tests/data/reply103.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-data
-    to
-      see
-that FTP
-works
-  so does it?
diff --git a/tests/data/reply104.txt b/tests/data/reply104.txt
deleted file mode 100644
index 9ac4637a2dae8c7d95820b33c56ab643ce2a8989..0000000000000000000000000000000000000000
--- a/tests/data/reply104.txt
+++ /dev/null
@@ -1 +0,0 @@
-Content-Length: 51
diff --git a/tests/data/reply105.txt b/tests/data/reply105.txt
deleted file mode 100644
index 0cfa203ddcc2fc5644dec65050aadd6cdef85738..0000000000000000000000000000000000000000
--- a/tests/data/reply105.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-data
-    to
-      see
-that FTP
-works
-  so does it?
diff --git a/tests/data/reply106.txt b/tests/data/reply106.txt
deleted file mode 100644
index 0cfa203ddcc2fc5644dec65050aadd6cdef85738..0000000000000000000000000000000000000000
--- a/tests/data/reply106.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-data
-    to
-      see
-that FTP
-works
-  so does it?
diff --git a/tests/data/reply11.txt b/tests/data/reply11.txt
deleted file mode 100644
index 5973e7320f7af4fd12d560b34c750d50c01215a4..0000000000000000000000000000000000000000
--- a/tests/data/reply11.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-HTTP/1.1 301 This is a weirdo text message
-Date: Thu, 09 Nov 2010 14:49:00 GMT
-Server: test-server/fake
-Location: data/110002.txt?coolsite=yes
-Connection: close
-
-This server reply is for testing a simple Location: following
diff --git a/tests/data/reply110.txt b/tests/data/reply110.txt
deleted file mode 100644
index 9b1c181c7d2f5048381221823a4cee9c4a47e0ca..0000000000000000000000000000000000000000
--- a/tests/data/reply110.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-expected to be a file without the first part
-but we emulate that
diff --git a/tests/data/reply110001.txt b/tests/data/reply110001.txt
deleted file mode 100644
index 79bd0450334493ef3fb244b3eb995ab19450b899..0000000000000000000000000000000000000000
--- a/tests/data/reply110001.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-HTTP/1.1 301 This is a weirdo text message
-Date: Thu, 09 Nov 2010 14:49:00 GMT
-Server: test-server/fake
-Location: data/110002.txt?coolsite=yes
-Connection: close
-
-HTTP/1.1 200 Followed here fine
-Date: Thu, 09 Nov 2010 14:49:00 GMT
-Server: test-server/fake
-
-If this is received, the location following worked
diff --git a/tests/data/reply110002.txt b/tests/data/reply110002.txt
deleted file mode 100644
index 280a45bfa224a6965b9d18d84f6eaa57c175de5f..0000000000000000000000000000000000000000
--- a/tests/data/reply110002.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-HTTP/1.1 200 Followed here fine
-Date: Thu, 09 Nov 2010 14:49:00 GMT
-Server: test-server/fake
-
-If this is received, the location following worked
diff --git a/tests/data/reply12.txt b/tests/data/reply12.txt
deleted file mode 100644
index 3cc88a191cab0dd07d0a0494bdd7948f624024e1..0000000000000000000000000000000000000000
--- a/tests/data/reply12.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-HTTP/1.1 206 Partial Content
-Date: Mon, 13 Nov 2000 13:41:09 GMT
-Server: Apache/1.3.11 (Unix) PHP/3.0.14
-Last-Modified: Tue, 13 Jun 2000 12:10:00 GMT
-ETag: "21025-dc7-39462498"
-Accept-Ranges: bytes
-Content-Length: 101
-Content-Range: bytes 100-200/3527
-Connection: close
-Content-Type: text/html
-
-ink="#ffffff" vlink="#cccccc">
-<table width=100% cellspacing=0 cellpadding=0 border=0>
- <tr>
-  <td co
\ No newline at end of file
diff --git a/tests/data/reply120.txt b/tests/data/reply120.txt
deleted file mode 100644
index 0cfa203ddcc2fc5644dec65050aadd6cdef85738..0000000000000000000000000000000000000000
--- a/tests/data/reply120.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-data
-    to
-      see
-that FTP
-works
-  so does it?
diff --git a/tests/data/reply121.txt b/tests/data/reply121.txt
deleted file mode 100644
index 0cfa203ddcc2fc5644dec65050aadd6cdef85738..0000000000000000000000000000000000000000
--- a/tests/data/reply121.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-data
-    to
-      see
-that FTP
-works
-  so does it?
diff --git a/tests/data/reply122.txt b/tests/data/reply122.txt
deleted file mode 100644
index 01d5cf22556ba09e292e9ffe52d320aba0716683..0000000000000000000000000000000000000000
--- a/tests/data/reply122.txt
+++ /dev/null
@@ -1 +0,0 @@
-MOOO
diff --git a/tests/data/reply1220001.txt b/tests/data/reply1220001.txt
deleted file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000
diff --git a/tests/data/reply123.txt b/tests/data/reply123.txt
deleted file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000
diff --git a/tests/data/reply13.txt b/tests/data/reply13.txt
deleted file mode 100644
index 5a7e385ab8635a22608db0dfef7cc5d47fdfd090..0000000000000000000000000000000000000000
--- a/tests/data/reply13.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-HTTP/1.1 200 Read you
-Deleted: suppose we got a header like this! ;-)
-
-blabla custom request result
-
diff --git a/tests/data/reply14.txt b/tests/data/reply14.txt
deleted file mode 100644
index 4caf40793d373a193eb893ae2b4cd839aeb6c721..0000000000000000000000000000000000000000
--- a/tests/data/reply14.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-HTTP/1.1 200 OK
-Server: thebest/1.0
-Connection: close
-
diff --git a/tests/data/reply15.txt b/tests/data/reply15.txt
deleted file mode 100644
index 334b21446d0a37d97d5962b4330f2e5228453929..0000000000000000000000000000000000000000
--- a/tests/data/reply15.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-HTTP/1.4 200 OK
-Fake: yes
-Fake: yes
-Fake: yes
-
-Repeated nonsense-headers
diff --git a/tests/data/reply16.txt b/tests/data/reply16.txt
deleted file mode 100644
index 57d8bf96ac21349028a771a916f1712a6e23f0bc..0000000000000000000000000000000000000000
--- a/tests/data/reply16.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-HTTP/1.1 200 OK
-Date: Thu, 09 Nov 2010 14:49:00 GMT
-Server: test-server/fake
-Content-Type: text/html
-Funny-head: yesyes
-
-
diff --git a/tests/data/reply17.txt b/tests/data/reply17.txt
deleted file mode 100644
index 4632d161234bc0ead364d5e10daef352967fdcb7..0000000000000000000000000000000000000000
--- a/tests/data/reply17.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-HTTP/1.1 200 OK
-Funny-head: yesyes
-
-This is the proof it works
diff --git a/tests/data/reply2.txt b/tests/data/reply2.txt
deleted file mode 100644
index 57d8bf96ac21349028a771a916f1712a6e23f0bc..0000000000000000000000000000000000000000
--- a/tests/data/reply2.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-HTTP/1.1 200 OK
-Date: Thu, 09 Nov 2010 14:49:00 GMT
-Server: test-server/fake
-Content-Type: text/html
-Funny-head: yesyes
-
-
diff --git a/tests/data/reply200.txt b/tests/data/reply200.txt
deleted file mode 100644
index 40ab2006945d19ee983fb637517e144f45f2aa7a..0000000000000000000000000000000000000000
--- a/tests/data/reply200.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-foo
-   bar
-bar
-   foo
-moo
diff --git a/tests/data/reply22.txt b/tests/data/reply22.txt
deleted file mode 100644
index 4632d161234bc0ead364d5e10daef352967fdcb7..0000000000000000000000000000000000000000
--- a/tests/data/reply22.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-HTTP/1.1 200 OK
-Funny-head: yesyes
-
-This is the proof it works
diff --git a/tests/data/reply24.txt b/tests/data/reply24.txt
deleted file mode 100644
index 250e4eed503e0b32ac54913a154786c568165f6c..0000000000000000000000000000000000000000
--- a/tests/data/reply24.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-HTTP/1.0 404 BAD BOY
-Content-Type: text/html
-
-This silly page doesn't reaaaaaly exist so you should not get it.
-
diff --git a/tests/data/reply25.txt b/tests/data/reply25.txt
deleted file mode 100644
index 6a816bf4b8a5233393760b37741b172fa8ab6167..0000000000000000000000000000000000000000
--- a/tests/data/reply25.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-HTTP/1.1 301 This is a weirdo text message
-Server: test-server/fake
-Location: data/reply/25
-Content-Length: 32
-Connection: close
-
-Redirect to the same URL again!
diff --git a/tests/data/reply26.txt b/tests/data/reply26.txt
deleted file mode 100644
index f065ac3746d6470099ee908e6ff7ab329f348b7f..0000000000000000000000000000000000000000
--- a/tests/data/reply26.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-HTTP/1.1 301 This is a weirdo text message
-Server: test-server/fake
-Location: data/reply/25
-Connection: close
-
-Redirect to the same URL again!
diff --git a/tests/data/reply28.txt b/tests/data/reply28.txt
deleted file mode 100644
index a732a0d22567377b08aace51883e0f24d7fafa34..0000000000000000000000000000000000000000
--- a/tests/data/reply28.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-HTTP/1.1 200 OK
-Server: fake
-
-{}[] in the URL is not legal
-
diff --git a/tests/data/reply29.txt b/tests/data/reply29.txt
deleted file mode 100644
index dd35000af612afa77fbf7832014f380a5e4b3fd5..0000000000000000000000000000000000000000
--- a/tests/data/reply29.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-HTTP/1.1 200 OK
-Server: fake
-Content-Range: bytes 200-3526/3527
-Content-Length: 84
-
-
-The Content-Range header's contents above aren't really genuine for this
-content.
-
diff --git a/tests/data/reply3.txt b/tests/data/reply3.txt
deleted file mode 100644
index 95ae56276a4e5d4ce43336b01499767c56909af9..0000000000000000000000000000000000000000
--- a/tests/data/reply3.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-HTTP/1.0 200 OK
-Server: test-server/fake
-Content-Type: text/html
-Content-Length: 0
-
-this is data even though Content-Length is set to zero
-
-
diff --git a/tests/data/reply30.txt b/tests/data/reply30.txt
deleted file mode 100644
index abe711d938a4ca4ea23442f4eee96c7d93b4abbf..0000000000000000000000000000000000000000
--- a/tests/data/reply30.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-HTTP/1.1 200 OK
-Server: fake
-Content-Length: 8400
-
-This file is a lot smaller than 8400 and thus curl should return an error
-for this.
-
diff --git a/tests/data/reply31.txt b/tests/data/reply31.txt
deleted file mode 100644
index 50e03a4e7644088cf02c3412ba6b2e1e87c2ba44..0000000000000000000000000000000000000000
--- a/tests/data/reply31.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-HTTP/1.1 301 Moved Permanently
-Server: fake
-Location: /moo/moo/moo/310002
-Connection: close
-
-No contents
-
diff --git a/tests/data/reply310001.txt b/tests/data/reply310001.txt
deleted file mode 100644
index 6e17b66b1a2fcf2186c6de952b2a107693cf5ce1..0000000000000000000000000000000000000000
--- a/tests/data/reply310001.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-HTTP/1.1 301 Moved Permanently
-Server: fake
-Location: /moo/moo/moo/310002
-Connection: close
-
-HTTP/1.1 200 Followed here fine
-Date: Thu, 09 Nov 2010 14:49:00 GMT
-Server: test-server/fake
-
-If this is received, the location following worked
diff --git a/tests/data/reply310002.txt b/tests/data/reply310002.txt
deleted file mode 100644
index 280a45bfa224a6965b9d18d84f6eaa57c175de5f..0000000000000000000000000000000000000000
--- a/tests/data/reply310002.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-HTTP/1.1 200 Followed here fine
-Date: Thu, 09 Nov 2010 14:49:00 GMT
-Server: test-server/fake
-
-If this is received, the location following worked
diff --git a/tests/data/reply32.txt b/tests/data/reply32.txt
deleted file mode 100644
index 9e5e693d306aa1261e5b022d90f4bbd6a3aa94d8..0000000000000000000000000000000000000000
--- a/tests/data/reply32.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-HTTP/1.1 303 See Other
-Server: fake
-Location: /moo/moo/moo/320002
-Connection: close
-
-This Location should be fetched with a GET!
-
-
diff --git a/tests/data/reply320001.txt b/tests/data/reply320001.txt
deleted file mode 100644
index d4605292eea2ec5e1e5e3be9bb22c3885f0c8e9a..0000000000000000000000000000000000000000
--- a/tests/data/reply320001.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-HTTP/1.1 303 See Other
-Server: fake
-Location: /moo/moo/moo/320002
-Connection: close
-
-HTTP/1.1 200 Followed here fine
-Date: Thu, 09 Nov 2010 14:49:00 GMT
-Server: test-server/fake
-
-If this is received, the location following worked
diff --git a/tests/data/reply320002.txt b/tests/data/reply320002.txt
deleted file mode 100644
index 280a45bfa224a6965b9d18d84f6eaa57c175de5f..0000000000000000000000000000000000000000
--- a/tests/data/reply320002.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-HTTP/1.1 200 Followed here fine
-Date: Thu, 09 Nov 2010 14:49:00 GMT
-Server: test-server/fake
-
-If this is received, the location following worked
diff --git a/tests/data/reply33.txt b/tests/data/reply33.txt
deleted file mode 100644
index 8f8cf85224f90a8537533078471d8d961985f444..0000000000000000000000000000000000000000
--- a/tests/data/reply33.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-HTTP/1.1 303 See Other
-Server: fake
-Location: /moo/moo/moo/320002
-
-This Location should be fetched with a GET!
-
-
diff --git a/tests/data/reply34.txt b/tests/data/reply34.txt
deleted file mode 100644
index faed9ca0bbfd285ce22ece7cda9e293769430143..0000000000000000000000000000000000000000
--- a/tests/data/reply34.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-HTTP/1.1 200 funky chunky!
-Server: fakeit/1.0
-Transfer-Encoding: chunked
-Connection: mooo
-
-40
-aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-30
-bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb
-20;heresatest=moooo
-cccccccccccccccccccccccccccccccc
-0
-muuu
diff --git a/tests/data/reply340001.txt b/tests/data/reply340001.txt
deleted file mode 100644
index 5cac3ca9004e47f69ccc221245a06367b5dd3dc4..0000000000000000000000000000000000000000
--- a/tests/data/reply340001.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-HTTP/1.1 200 funky chunky!
-Server: fakeit/1.0
-Transfer-Encoding: chunked
-Connection: mooo
-
-aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbcccccccccccccccccccccccccccccccc
\ No newline at end of file
diff --git a/tests/data/reply35.txt b/tests/data/reply35.txt
deleted file mode 100644
index 0aff134b00d993c6404ecb6c91675ffbc5479fbf..0000000000000000000000000000000000000000
--- a/tests/data/reply35.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-HTTP/1.1 200 OK
-Server: thebest/1.0
-Silly-but-last-header: funny
-
diff --git a/tests/data/reply36.txt b/tests/data/reply36.txt
deleted file mode 100644
index c5269e9874bd565f881c2a8b91fcb85b25cef6a9..0000000000000000000000000000000000000000
--- a/tests/data/reply36.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-HTTP/1.1 200 funky chunky!
-Server: fakeit/1.0
-Transfer-Encoding: chunked
-
-40
-aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-ILLEGAL
-bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb
diff --git a/tests/data/reply37.txt b/tests/data/reply37.txt
deleted file mode 100644
index 5ddff95322e55317b01394464a8677d8cddc774e..0000000000000000000000000000000000000000
--- a/tests/data/reply37.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-HTTP/1.0 200 OK
-
-no headers!
diff --git a/tests/data/reply38.txt b/tests/data/reply38.txt
deleted file mode 100644
index b07b91dae6c9fb258f9f5ad6f9d3d28e2310a734..0000000000000000000000000000000000000000
--- a/tests/data/reply38.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-HTTP/1.0 301 OK
-Location: http://127.0.0.1:8999/ffffooooooooooooooooooooooooooooooooooooooooooooooooooo/37?fake
-
-blah
diff --git a/tests/data/reply380001.txt b/tests/data/reply380001.txt
deleted file mode 100644
index 1431eb8ddbd471ce691dc51874199a4ad57188f3..0000000000000000000000000000000000000000
--- a/tests/data/reply380001.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-HTTP/1.0 301 OK
-Location: http://127.0.0.1:8999/ffffooooooooooooooooooooooooooooooooooooooooooooooooooo/37?fake
-
-HTTP/1.0 200 OK
-
-no headers!
diff --git a/tests/data/reply39.txt b/tests/data/reply39.txt
deleted file mode 100644
index 735612329eaee83386953db24c62aac4ef3e7727..0000000000000000000000000000000000000000
--- a/tests/data/reply39.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-HTTP/1.1 301 This is a weirdo text message
-Date: Thu, 09 Nov 2010 14:49:00 GMT
-Server: test-server/fake
-Location: data/390002.txt?coolsite=yes
-Connection: close
-
-This server reply is for testing a simple Location: following
diff --git a/tests/data/reply390001.txt b/tests/data/reply390001.txt
deleted file mode 100644
index efb86c664718bca8a3a9b9be51ecd872a4a62ef1..0000000000000000000000000000000000000000
--- a/tests/data/reply390001.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-HTTP/1.1 301 This is a weirdo text message
-Date: Thu, 09 Nov 2010 14:49:00 GMT
-Server: test-server/fake
-Location: data/390002.txt?coolsite=yes
-Connection: close
-
-HTTP/1.1 200 Followed here fine
-Server: test-server/fake
-Content-Range: bytes 20-71/91
-Content-Length: 51
-
-If this is received, the location following worked
diff --git a/tests/data/reply390002.txt b/tests/data/reply390002.txt
deleted file mode 100644
index 3d506c19368915ab24fa3a0605014c2b56a1164a..0000000000000000000000000000000000000000
--- a/tests/data/reply390002.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-HTTP/1.1 200 Followed here fine
-Server: test-server/fake
-Content-Range: bytes 20-71/91
-Content-Length: 51
-
-If this is received, the location following worked
diff --git a/tests/data/reply4.txt b/tests/data/reply4.txt
deleted file mode 100644
index 57d8bf96ac21349028a771a916f1712a6e23f0bc..0000000000000000000000000000000000000000
--- a/tests/data/reply4.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-HTTP/1.1 200 OK
-Date: Thu, 09 Nov 2010 14:49:00 GMT
-Server: test-server/fake
-Content-Type: text/html
-Funny-head: yesyes
-
-
diff --git a/tests/data/reply40.txt b/tests/data/reply40.txt
deleted file mode 100644
index 8c298ffa8a79ea68cca086a245b4ae2da774c185..0000000000000000000000000000000000000000
--- a/tests/data/reply40.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-HTTP/1.1 100 Continue weirdo message
-Server: heeee heeee
-
-HTTP/1.1 200 This is a weirdo text message
-Date: Thu, 09 Nov 2010 14:49:00 GMT
-Content-Length: 0
-
-*** This should not be received ***
diff --git a/tests/data/reply41.txt b/tests/data/reply41.txt
deleted file mode 100644
index 57d8bf96ac21349028a771a916f1712a6e23f0bc..0000000000000000000000000000000000000000
--- a/tests/data/reply41.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-HTTP/1.1 200 OK
-Date: Thu, 09 Nov 2010 14:49:00 GMT
-Server: test-server/fake
-Content-Type: text/html
-Funny-head: yesyes
-
-
diff --git a/tests/data/reply5.txt b/tests/data/reply5.txt
deleted file mode 100644
index 57d8bf96ac21349028a771a916f1712a6e23f0bc..0000000000000000000000000000000000000000
--- a/tests/data/reply5.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-HTTP/1.1 200 OK
-Date: Thu, 09 Nov 2010 14:49:00 GMT
-Server: test-server/fake
-Content-Type: text/html
-Funny-head: yesyes
-
-
diff --git a/tests/data/reply6.txt b/tests/data/reply6.txt
deleted file mode 100644
index 57d8bf96ac21349028a771a916f1712a6e23f0bc..0000000000000000000000000000000000000000
--- a/tests/data/reply6.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-HTTP/1.1 200 OK
-Date: Thu, 09 Nov 2010 14:49:00 GMT
-Server: test-server/fake
-Content-Type: text/html
-Funny-head: yesyes
-
-
diff --git a/tests/data/reply7.txt b/tests/data/reply7.txt
deleted file mode 100644
index 9b0a2a9bc774eb624c96a89fd575d550c901ba6b..0000000000000000000000000000000000000000
--- a/tests/data/reply7.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-HTTP/1.1 200 OK
-Date: Thu, 09 Nov 2010 14:49:00 GMT
-Server: test-server/fake
-Content-Type: text/html
-Funny-head: yesyes
-Set-Cookie: foobar=name; domain=127.0.0.1; path=/;
-Set-Cookie: mismatch=this; domain=127.0.0.1; path="/silly/";
-Set-Cookie: partmatch=present; domain=.0.0.1; path=/;
-
diff --git a/tests/data/reply8.txt b/tests/data/reply8.txt
deleted file mode 100644
index 177ca0994fdd96092cb4a131cdebaa2765caa1ce..0000000000000000000000000000000000000000
--- a/tests/data/reply8.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-HTTP/1.1 200 OK
-Date: Thu, 09 Nov 2010 14:49:00 GMT
-Server: test-server/fake
-
-
-
diff --git a/tests/data/reply9.txt b/tests/data/reply9.txt
deleted file mode 100644
index 7cf888e06d2bd085b6d5a3dcfbc284f3c707c858..0000000000000000000000000000000000000000
--- a/tests/data/reply9.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-HTTP/1.1 200 OK
-Date: Thu, 09 Nov 2010 14:49:00 GMT
-Server: test-server/fake
-
-blablabla
diff --git a/tests/data/stdin17.txt b/tests/data/stdin17.txt
deleted file mode 100644
index bd2ebe61b6326e2d1fbc2b637701d1585ccdf783..0000000000000000000000000000000000000000
--- a/tests/data/stdin17.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-#
-# Use a silly request without '--':
-request MOOO
-#
-# Set the user-agent using a short-option:
-# (NOTE: the agent string is stripped in the test program why this
-# will never be compared in the end)
--A "agent007 license to drill\t"
-#
-# long option *with* '--':
---max-time 180
diff --git a/tests/data/stdout107.txt b/tests/data/stdout107.txt
deleted file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000
diff --git a/tests/data/stdout108.txt b/tests/data/stdout108.txt
deleted file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000
diff --git a/tests/data/stdout109.txt b/tests/data/stdout109.txt
deleted file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000
diff --git a/tests/data/stdout110.txt b/tests/data/stdout110.txt
deleted file mode 100644
index ce14288d32c04938275e4ce1740b73a90eb78f35..0000000000000000000000000000000000000000
--- a/tests/data/stdout110.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-e without the first part
-but we emulate that
diff --git a/tests/data/stdout112.txt b/tests/data/stdout112.txt
deleted file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000
diff --git a/tests/data/stdout15.txt b/tests/data/stdout15.txt
deleted file mode 100644
index 788824df9a1bc7bb70c22c09b9fea754c2e0fc2a..0000000000000000000000000000000000000000
--- a/tests/data/stdout15.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-HTTP/1.4 200 OK
-Fake: yes
-Fake: yes
-Fake: yes
-
-Repeated nonsense-headers
-http://127.0.0.1:8999/want/15 200 26
diff --git a/tests/data/stdout18.txt b/tests/data/stdout18.txt
deleted file mode 100644
index c297d716ba4f0052f995286389d18ed7ad6dd77e..0000000000000000000000000000000000000000
--- a/tests/data/stdout18.txt
+++ /dev/null
@@ -1,23 +0,0 @@
---_curl_--127.0.0.1:8999/3
-HTTP/1.0 200 OK
-Server: test-server/fake
-Content-Type: text/html
-Content-Length: 0
-
-this is data even though Content-Length is set to zero
-
-
---_curl_--127.0.0.1:8999/10
-HTTP/1.0 200 OK
-Date: Thu, 09 Nov 2010 14:49:00 GMT
-Server: test-server/fake
-
-blablabla
---_curl_--127.0.0.1:8999/11
-HTTP/1.1 301 This is a weirdo text message
-Date: Thu, 09 Nov 2010 14:49:00 GMT
-Server: test-server/fake
-Location: data/110002.txt?coolsite=yes
-Connection: close
-
-This server reply is for testing a simple Location: following
diff --git a/tests/data/stdout27.txt b/tests/data/stdout27.txt
deleted file mode 100644
index fcc189c5c19ae93ee1e230f49dc6ad17bc116ee4..0000000000000000000000000000000000000000
--- a/tests/data/stdout27.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-HTTP/1.1 301 This is a weirdo text message
-Server: test-server/fake
-Location: data/reply/25
-Content-Length: 32
-Connection: close
-
-Redirect to the same URL again!
-HTTP/1.0 404 BAD BOY
-Content-Type: text/html
-
-This silly page doesn't reaaaaaly exist so you should not get it.
-
-HTTP/1.1 200 OK
-Funny-head: yesyes
-
-This is the proof it works
diff --git a/tests/data/test1 b/tests/data/test1
new file mode 100644
index 0000000000000000000000000000000000000000..3a6f90b282d917919ce71a7242829bceee7a1b13
--- /dev/null
+++ b/tests/data/test1
@@ -0,0 +1,44 @@
+#
+# Server-side
+<reply name="1">
+<data>
+HTTP/1.1 200 OK
+Date: Thu, 09 Nov 2010 14:49:00 GMT
+Server: test-server/fake
+Last-Modified: Tue, 13 Jun 2000 12:10:00 GMT
+ETag: "21025-dc7-39462498"
+Accept-Ranges: bytes
+Content-Length: 6
+Connection: close
+Content-Type: text/html
+Funny-head: yesyes
+
+<foo>
+</data>
+</reply>
+
+#
+# Client-side
+<client>
+ <name>
+simple HTTP GET
+ </name>
+ <command>
+http://%HOSTIP:%HOSTPORT/1
+</command>
+</test>
+
+#
+# Verify data after the test has been "shot"
+<verify>
+<strip>
+^User-Agent:.*
+</strip>
+<protocol>
+GET /1 HTTP/1.1
+Host: 127.0.0.1:8999
+Pragma: no-cache
+Accept: image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, */*
+
+</protocol>
+</verify>
diff --git a/tests/data/reply400.txt b/tests/data/test100
similarity index 61%
rename from tests/data/reply400.txt
rename to tests/data/test100
index 1baaf9385e317ae18cade32bc49446e824fa2f65..3f81d6bdb8e1a2d84f9601ad33adaad6e0d42cec 100644
--- a/tests/data/reply400.txt
+++ b/tests/data/test100
@@ -1,3 +1,7 @@
+#
+# Server-side
+<reply name="1">
+<data>
 total 20
 drwxr-xr-x   8 98       98           512 Oct 22 13:06 .
 drwxr-xr-x   8 98       98           512 Oct 22 13:06 ..
@@ -9,3 +13,32 @@ drwxrwxrwx   2 98       98           512 May 29 16:04 download.html
 dr-xr-xr-x   2 0        1            512 Nov 30  1995 etc
 drwxrwxrwx   2 98       1            512 Oct 30 14:33 pub
 dr-xr-xr-x   5 0        1            512 Oct  1  1997 usr
+</data>
+</reply>
+
+#
+# Client-side
+<client>
+ <name>
+FTP dir list PASV
+ </name>
+ <command>
+ftp://%HOSTIP:%FTPPORT/
+</command>
+</test>
+
+#
+# Verify data after the test has been "shot"
+<verify>
+<strip>
+filter off really nothing
+</strip>
+<protocol>
+USER anonymous
+PASS curl_by_daniel@haxx.se
+PWD
+PASV
+TYPE A
+LIST
+</protocol>
+</verify>
diff --git a/tests/data/test2 b/tests/data/test2
new file mode 100644
index 0000000000000000000000000000000000000000..d8c72d0742521f10ea15c21652c0344efbe63411
--- /dev/null
+++ b/tests/data/test2
@@ -0,0 +1,42 @@
+#
+# Server-side
+<reply>
+<data>
+HTTP/1.1 200 OK
+Date: Thu, 09 Nov 2010 14:49:00 GMT
+Server: test-server/fake
+Content-Type: text/html
+Funny-head: yesyes
+
+</data>
+</reply>
+
+#
+# Client-side
+<client>
+ <name>
+HTTP GET with user and password
+ </name>
+ <command>
+ -u fake:user http://%HOSTIP:%HOSTPORT/2
+</command>
+</test>
+
+#
+# Verify data after the test has been "shot"
+<verify>
+<strip>
+^User-Agent:.*
+</strip>
+<protocol>
+GET /2 HTTP/1.1
+Authorization: Basic ZmFrZTp1c2Vy
+Host: 127.0.0.1:8999
+Pragma: no-cache
+Accept: image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, */*
+
+</protocol>
+<data>
+[insert full protocol verifiction dump here]
+</data>
+</verify>
diff --git a/tests/data/test3 b/tests/data/test3
new file mode 100644
index 0000000000000000000000000000000000000000..eec48a5fcb48d89c3dd72ce3eb2e31436c2d8361
--- /dev/null
+++ b/tests/data/test3
@@ -0,0 +1,42 @@
+#
+# Server-side
+<reply name="1">
+<data>
+HTTP/1.0 200 OK
+Server: test-server/fake
+Content-Type: text/html
+Content-Length: 0
+
+this is data even though Content-Length is set to zero
+</data>
+</reply>
+
+#
+# Client-side
+<client>
+ <name>
+HTTP POST with user and password
+ </name>
+ <command>
+ -d "fooo=mooo&pooo=clue&doo=%20%20%20++++" -u "fake:-user" http://%HOSTIP:%HOSTPORT/3
+</command>
+</test>
+
+#
+# Verify data after the test has been "shot"
+<verify>
+<strip>
+^User-Agent:.*
+</strip>
+<protocol>
+POST /3 HTTP/1.1
+Authorization: Basic ZmFrZTotdXNlcg==
+Host: 127.0.0.1:8999
+Pragma: no-cache
+Accept: image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, */*
+Content-Length: 37
+Content-Type: application/x-www-form-urlencoded
+
+fooo=mooo&pooo=clue&doo=%20%20%20++++
+</protocol>
+</verify>
diff --git a/tests/data/test300 b/tests/data/test300
new file mode 100644
index 0000000000000000000000000000000000000000..619063278eb6b6bd4ea86a757354ed1a1443d165
--- /dev/null
+++ b/tests/data/test300
@@ -0,0 +1,38 @@
+#
+# Server-side
+<reply>
+<data>
+HTTP/1.1 200 OK
+Date: Thu, 09 Nov 2010 14:49:00 GMT
+Server: test-server/fake
+Content-Length: 7
+
+MooMoo
+</data>
+</reply>
+
+#
+# Client-side
+<client>
+ <name>
+simple HTTPS GET
+ </name>
+ <command>
+https://%HOSTIP:%HTTPSPORT/300
+</command>
+</test>
+
+#
+# Verify data after the test has been "shot"
+<verify>
+<strip>
+^User-Agent:.*
+</strip>
+<protocol>
+GET /300 HTTP/1.1
+Host: 127.0.0.1:8433
+Pragma: no-cache
+Accept: image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, */*
+
+</protocol>
+</verify>
diff --git a/tests/data/test4 b/tests/data/test4
new file mode 100644
index 0000000000000000000000000000000000000000..9ca90c9a112007e270355ba941628a6b5472a793
--- /dev/null
+++ b/tests/data/test4
@@ -0,0 +1,39 @@
+#
+# Server-side
+<reply name="1">
+<data>
+HTTP/1.1 200 OK
+Date: Thu, 09 Nov 2010 14:49:00 GMT
+Server: test-server/fake
+Content-Type: text/html
+Funny-head: yesyes
+
+</data>
+</reply>
+
+#
+# Client-side
+<client>
+ <name>
+Replaced internal and added custom HTTP headers
+ </name>
+ <command>
+ -H "extra-header: here" -H "Accept: replaced" http://%HOSTIP:%HOSTPORT/4
+</command>
+</test>
+
+#
+# Verify data after the test has been "shot"
+<verify>
+<strip>
+^User-Agent:.*
+</strip>
+<protocol>
+GET /4 HTTP/1.1
+Host: 127.0.0.1:8999
+Pragma: no-cache
+extra-header: here
+Accept: replaced
+
+</protocol>
+</verify>
diff --git a/tests/data/reply100.txt b/tests/data/test400
similarity index 61%
rename from tests/data/reply100.txt
rename to tests/data/test400
index 1baaf9385e317ae18cade32bc49446e824fa2f65..1159ee859600b0f156567265c23df1030115f0f4 100644
--- a/tests/data/reply100.txt
+++ b/tests/data/test400
@@ -1,3 +1,7 @@
+#
+# Server-side
+<reply name="1">
+<data>
 total 20
 drwxr-xr-x   8 98       98           512 Oct 22 13:06 .
 drwxr-xr-x   8 98       98           512 Oct 22 13:06 ..
@@ -9,3 +13,32 @@ drwxrwxrwx   2 98       98           512 May 29 16:04 download.html
 dr-xr-xr-x   2 0        1            512 Nov 30  1995 etc
 drwxrwxrwx   2 98       1            512 Oct 30 14:33 pub
 dr-xr-xr-x   5 0        1            512 Oct  1  1997 usr
+</data>
+</reply>
+
+#
+# Client-side
+<client>
+ <name>
+FTPS dir list PASV
+ </name>
+ <command>
+ftps://%HOSTIP:%FTPSPORT/
+</command>
+</test>
+
+#
+# Verify data after the test has been "shot"
+<verify>
+<strip>
+filter off really nothing
+</strip>
+<protocol>
+USER anonymous
+PASS curl_by_daniel@haxx.se
+PWD
+PASV
+TYPE A
+LIST
+</protocol>
+</verify>
diff --git a/tests/data/upload107.txt b/tests/data/upload107.txt
deleted file mode 100644
index 0cfa203ddcc2fc5644dec65050aadd6cdef85738..0000000000000000000000000000000000000000
--- a/tests/data/upload107.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-data
-    to
-      see
-that FTP
-works
-  so does it?
diff --git a/tests/data/upload108.txt b/tests/data/upload108.txt
deleted file mode 100644
index 0cfa203ddcc2fc5644dec65050aadd6cdef85738..0000000000000000000000000000000000000000
--- a/tests/data/upload108.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-data
-    to
-      see
-that FTP
-works
-  so does it?
diff --git a/tests/data/upload109.txt b/tests/data/upload109.txt
deleted file mode 100644
index 0cfa203ddcc2fc5644dec65050aadd6cdef85738..0000000000000000000000000000000000000000
--- a/tests/data/upload109.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-data
-    to
-      see
-that FTP
-works
-  so does it?
diff --git a/tests/data/upload112.txt b/tests/data/upload112.txt
deleted file mode 100644
index 741e7b4409acd1610b0382df0f6a6e10bff0dedb..0000000000000000000000000000000000000000
--- a/tests/data/upload112.txt
+++ /dev/null
@@ -1 +0,0 @@
-o does it?