diff --git a/tests/data/command5.txt b/tests/data/command5.txt
new file mode 100644
index 0000000000000000000000000000000000000000..f0fb2677d74e5a7226edd9803e3a8432e21b331b
--- /dev/null
+++ b/tests/data/command5.txt
@@ -0,0 +1 @@
+http://%HOSTIP:%HOSTPORT/we/want/that/page/5 -x %HOSTIP:%HOSTPORT
diff --git a/tests/data/command6.txt b/tests/data/command6.txt
new file mode 100644
index 0000000000000000000000000000000000000000..a0b979842d3f48fd96417b74ce964f837c395826
--- /dev/null
+++ b/tests/data/command6.txt
@@ -0,0 +1,2 @@
+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
new file mode 100644
index 0000000000000000000000000000000000000000..0f7f85e7b5888904e38f6a18f71977bcee50ec10
--- /dev/null
+++ b/tests/data/command7.txt
@@ -0,0 +1 @@
+http://%HOSTIP:%HOSTPORT/we/want/7 -b none -D log/heads7.txt
diff --git a/tests/data/command8.txt b/tests/data/command8.txt
new file mode 100644
index 0000000000000000000000000000000000000000..b7437cf2a19dbceb7ab326311d5f9072191c189e
--- /dev/null
+++ b/tests/data/command8.txt
@@ -0,0 +1 @@
+http://%HOSTIP:%HOSTPORT/we/want/8 -b log/heads7.txt
diff --git a/tests/data/command9.txt b/tests/data/command9.txt
new file mode 100644
index 0000000000000000000000000000000000000000..b0846bb2f8830d68dbe7c97ee8aa7266e798bb7b
--- /dev/null
+++ b/tests/data/command9.txt
@@ -0,0 +1,2 @@
+http://%HOSTIP:%HOSTPORT/we/want/9 -F name=daniel -F tool=curl -F file=@data/command9.txt
+
diff --git a/tests/data/http5.txt b/tests/data/http5.txt
new file mode 100644
index 0000000000000000000000000000000000000000..7980930832122ba594237409df764a9dfbc01e06
--- /dev/null
+++ b/tests/data/http5.txt
@@ -0,0 +1,5 @@
+GET http://127.0.0.1:8999/we/want/that/page/5 HTTP/1.0
+Host: 127.0.0.1:8999
+Pragma: no-cache
+Accept: image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, */*
+
diff --git a/tests/data/http6.txt b/tests/data/http6.txt
new file mode 100644
index 0000000000000000000000000000000000000000..fee9d8013560aa5f0daea8b92c06b40b25159806
--- /dev/null
+++ b/tests/data/http6.txt
@@ -0,0 +1,6 @@
+GET /we/want/that/page/6 HTTP/1.0
+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/http7.txt b/tests/data/http7.txt
new file mode 100644
index 0000000000000000000000000000000000000000..0c8f2f9f8dc9f03284b9bfbd205cdd1f231289c5
--- /dev/null
+++ b/tests/data/http7.txt
@@ -0,0 +1,5 @@
+GET /we/want/7 HTTP/1.0
+Host: 127.0.0.1:8999
+Pragma: no-cache
+Accept: image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, */*
+
diff --git a/tests/data/http8.txt b/tests/data/http8.txt
new file mode 100644
index 0000000000000000000000000000000000000000..efe5eac3610899f4f5d657e2bd1fae0b997f4c4d
--- /dev/null
+++ b/tests/data/http8.txt
@@ -0,0 +1,6 @@
+GET /we/want/8 HTTP/1.0
+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/http9.txt b/tests/data/http9.txt
new file mode 100644
index 0000000000000000000000000000000000000000..deffd74d55155e219ca164731a6cb9dc36f46ec4
--- /dev/null
+++ b/tests/data/http9.txt
@@ -0,0 +1,23 @@
+POST /we/want/9 HTTP/1.0
+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/name4.txt b/tests/data/name4.txt
index dcb5f5e981b20eb38ea8633e981d7a45c0bb9914..df748d37516a4c193c8b54ff1ce1a78211b3d547 100644
--- a/tests/data/name4.txt
+++ b/tests/data/name4.txt
@@ -1 +1 @@
-Replaced HTTP headers
+Replaced internal and added custom HTTP headers
diff --git a/tests/data/name5.txt b/tests/data/name5.txt
new file mode 100644
index 0000000000000000000000000000000000000000..de72604102976e10a90b14f7e80c55e31cb2136a
--- /dev/null
+++ b/tests/data/name5.txt
@@ -0,0 +1 @@
+HTTP over proxy
diff --git a/tests/data/name6.txt b/tests/data/name6.txt
new file mode 100644
index 0000000000000000000000000000000000000000..5cfcf871918c9c1353a1c9356a3090ab827ba94b
--- /dev/null
+++ b/tests/data/name6.txt
@@ -0,0 +1 @@
+HTTP with simple cookie send
diff --git a/tests/data/name7.txt b/tests/data/name7.txt
new file mode 100644
index 0000000000000000000000000000000000000000..8dd34dee3b91a4429b95336c23866b39ae4d1e6d
--- /dev/null
+++ b/tests/data/name7.txt
@@ -0,0 +1 @@
+HTTP with cookie parser and header recording
diff --git a/tests/data/name8.txt b/tests/data/name8.txt
new file mode 100644
index 0000000000000000000000000000000000000000..d3571f47135f289e1334e42a1741c23e585ddd55
--- /dev/null
+++ b/tests/data/name8.txt
@@ -0,0 +1 @@
+HTTP with cookie parsing from header file, must follow test 7
diff --git a/tests/data/name9.txt b/tests/data/name9.txt
new file mode 100644
index 0000000000000000000000000000000000000000..82d7b5899af2394a5a27037537129a1a02751461
--- /dev/null
+++ b/tests/data/name9.txt
@@ -0,0 +1 @@
+HTTP RFC1867-type formposting
diff --git a/tests/data/reply5.txt b/tests/data/reply5.txt
new file mode 100644
index 0000000000000000000000000000000000000000..57d8bf96ac21349028a771a916f1712a6e23f0bc
--- /dev/null
+++ b/tests/data/reply5.txt
@@ -0,0 +1,7 @@
+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
new file mode 100644
index 0000000000000000000000000000000000000000..57d8bf96ac21349028a771a916f1712a6e23f0bc
--- /dev/null
+++ b/tests/data/reply6.txt
@@ -0,0 +1,7 @@
+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
new file mode 100644
index 0000000000000000000000000000000000000000..9b0a2a9bc774eb624c96a89fd575d550c901ba6b
--- /dev/null
+++ b/tests/data/reply7.txt
@@ -0,0 +1,9 @@
+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
new file mode 100644
index 0000000000000000000000000000000000000000..177ca0994fdd96092cb4a131cdebaa2765caa1ce
--- /dev/null
+++ b/tests/data/reply8.txt
@@ -0,0 +1,6 @@
+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
new file mode 100644
index 0000000000000000000000000000000000000000..7cf888e06d2bd085b6d5a3dcfbc284f3c707c858
--- /dev/null
+++ b/tests/data/reply9.txt
@@ -0,0 +1,5 @@
+HTTP/1.1 200 OK
+Date: Thu, 09 Nov 2010 14:49:00 GMT
+Server: test-server/fake
+
+blablabla