diff --git a/tests/data/Makefile.am b/tests/data/Makefile.am
index 82448af55..794921751 100644
--- a/tests/data/Makefile.am
+++ b/tests/data/Makefile.am
@@ -51,5 +51,6 @@ command6.txt      name12.txt        prot3.txt         upload109.txt \
 command7.txt      name13.txt        prot4.txt         upload112.txt \
 command8.txt      name14.txt        prot5.txt \
 command9.txt      name15.txt        prot6.txt \
-error111.txt      name16.txt        prot7.txt
-
+error111.txt      name16.txt        prot7.txt \
+command26.txt  prot26.txt     command27.txt  prot27.txt \
+name26.txt     reply26.txt    name27.txt     stdout27.txt 
diff --git a/tests/data/command26.txt b/tests/data/command26.txt
new file mode 100644
index 000000000..4b591be20
--- /dev/null
+++ b/tests/data/command26.txt
@@ -0,0 +1,4 @@
+http://%HOSTIP:%HOSTPORT/want/25 -o - -o -
+
+
+
diff --git a/tests/data/command27.txt b/tests/data/command27.txt
new file mode 100644
index 000000000..21e2a9c97
--- /dev/null
+++ b/tests/data/command27.txt
@@ -0,0 +1 @@
+http://%HOSTIP:%HOSTPORT/want/25 http://%HOSTIP:%HOSTPORT/want/24 http://%HOSTIP:%HOSTPORT/want/22
diff --git a/tests/data/name26.txt b/tests/data/name26.txt
new file mode 100644
index 000000000..4c300b248
--- /dev/null
+++ b/tests/data/name26.txt
@@ -0,0 +1 @@
+specify more -o than URLs
diff --git a/tests/data/name27.txt b/tests/data/name27.txt
new file mode 100644
index 000000000..90a851fe9
--- /dev/null
+++ b/tests/data/name27.txt
@@ -0,0 +1 @@
+getting three URLs in one command line (to stdout)
diff --git a/tests/data/prot26.txt b/tests/data/prot26.txt
new file mode 100644
index 000000000..de3540252
--- /dev/null
+++ b/tests/data/prot26.txt
@@ -0,0 +1,6 @@
+GET /want/25 HTTP/1.0
+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
new file mode 100644
index 000000000..98355c33e
--- /dev/null
+++ b/tests/data/prot27.txt
@@ -0,0 +1,6 @@
+GET /want/22 HTTP/1.0
+User-Agent: curl/7.6-pre1 (sparc-sun-solaris2.7) libcurl 7.6-pre1 (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/reply26.txt b/tests/data/reply26.txt
new file mode 100644
index 000000000..5839f8d3c
--- /dev/null
+++ b/tests/data/reply26.txt
@@ -0,0 +1,5 @@
+HTTP/1.1 301 This is a weirdo text message
+Server: test-server/fake
+Location: data/reply/25
+
+Redirect to the same URL again!
diff --git a/tests/data/stdout27.txt b/tests/data/stdout27.txt
new file mode 100644
index 000000000..6c6fe7ec2
--- /dev/null
+++ b/tests/data/stdout27.txt
@@ -0,0 +1,14 @@
+HTTP/1.1 301 This is a weirdo text message
+Server: test-server/fake
+Location: data/reply/25
+
+Redirect to the same URL again!
+HTTP/1.1 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