diff --git a/tests/data/test11 b/tests/data/test11
index eb72dfb655..f304f523d0 100644
--- a/tests/data/test11
+++ b/tests/data/test11
@@ -1,3 +1,10 @@
+
+
+HTTP
+HTTP GET
+followlocation
+
+
# Server-side
diff --git a/tests/data/test12 b/tests/data/test12
index 06a2eaeec5..c6afd1c8a4 100644
--- a/tests/data/test12
+++ b/tests/data/test12
@@ -1,3 +1,10 @@
+
+
+HTTP
+HTTP GET
+HTTP Range
+
+
# Server-side
diff --git a/tests/data/test13 b/tests/data/test13
index 7f7ddf8fe3..7d247b25f1 100644
--- a/tests/data/test13
+++ b/tests/data/test13
@@ -1,3 +1,9 @@
+
+
+HTTP
+HTTP custom request
+
+
# Server-side
diff --git a/tests/data/test14 b/tests/data/test14
index 97afba36de..3e07e69e68 100644
--- a/tests/data/test14
+++ b/tests/data/test14
@@ -1,3 +1,9 @@
+
+
+HTTP
+HTTP HEAD
+
+
# Server-side
diff --git a/tests/data/test15 b/tests/data/test15
index 325783b84d..a3c557e92e 100644
--- a/tests/data/test15
+++ b/tests/data/test15
@@ -1,3 +1,10 @@
+
+
+HTTP
+HTTP GET
+--write-out
+
+
# Server-side
diff --git a/tests/data/test16 b/tests/data/test16
index 13da705787..b7c3d5d357 100644
--- a/tests/data/test16
+++ b/tests/data/test16
@@ -1,3 +1,10 @@
+
+
+HTTP
+HTTP GET
+HTTP proxy Basic auth
+
+
# Server-side
diff --git a/tests/data/test17 b/tests/data/test17
index 52e7063452..25de5d4bb8 100644
--- a/tests/data/test17
+++ b/tests/data/test17
@@ -1,3 +1,10 @@
+
+
+HTTP
+HTTP custom request
+config file
+
+
# Server-side
diff --git a/tests/data/test18 b/tests/data/test18
index df1b70361c..283cbe2b12 100644
--- a/tests/data/test18
+++ b/tests/data/test18
@@ -1,3 +1,10 @@
+
+
+HTTP
+HTTP GET
+{} list
+
+
# Server-side
diff --git a/tests/data/test19 b/tests/data/test19
index 8aaa2023fb..9a40db2edd 100644
--- a/tests/data/test19
+++ b/tests/data/test19
@@ -1,3 +1,10 @@
+
+
+HTTP
+connect to non-listen
+FAILURE
+
+
# Server-side
diff --git a/tests/data/test20 b/tests/data/test20
index 5cfe1fb41a..abc839892a 100644
--- a/tests/data/test20
+++ b/tests/data/test20
@@ -1,3 +1,9 @@
+
+
+non-existing host name
+FAILURE
+
+
# Server-side
@@ -7,7 +13,7 @@
# Client-side
-http
+none
attempt connect to non-existing host name
diff --git a/tests/data/test21 b/tests/data/test21
index 2fba375bef..5f0338cac3 100644
--- a/tests/data/test21
+++ b/tests/data/test21
@@ -1,3 +1,9 @@
+
+
+FAILURE
+multiple HTTP requests
+
+
# Server-side
diff --git a/tests/data/test22 b/tests/data/test22
index 2ffdbc59f4..f2f16066b0 100644
--- a/tests/data/test22
+++ b/tests/data/test22
@@ -1,3 +1,10 @@
+
+
+HTTP
+HTTP PUT
+long URL
+
+
# Server-side
diff --git a/tests/data/test23 b/tests/data/test23
index d09d9a71df..4155ea2cdc 100644
--- a/tests/data/test23
+++ b/tests/data/test23
@@ -1,3 +1,9 @@
+
+
+unsupported protocol
+FAILURE
+
+
# Server-side
diff --git a/tests/data/test24 b/tests/data/test24
index 046c0a6727..d6590578cd 100644
--- a/tests/data/test24
+++ b/tests/data/test24
@@ -1,3 +1,9 @@
+
+
+HTTP
+HTTP GET
+
+
# Server-side
diff --git a/tests/data/test25 b/tests/data/test25
index 71e79ac7d5..5e0b706ccc 100644
--- a/tests/data/test25
+++ b/tests/data/test25
@@ -1,3 +1,11 @@
+
+
+HTTP
+HTTP GET
+followlocation
+--max-redirs
+
+
# Server-side
diff --git a/tests/data/test26 b/tests/data/test26
index 0959342e5b..41f80e42a0 100644
--- a/tests/data/test26
+++ b/tests/data/test26
@@ -1,3 +1,9 @@
+
+
+HTTP
+HTTP GET
+
+
# Server-side
diff --git a/tests/data/test27 b/tests/data/test27
index 06e26a8d0a..df8599771b 100644
--- a/tests/data/test27
+++ b/tests/data/test27
@@ -1,3 +1,10 @@
+
+
+HTTP
+HTTP GET
+cookies
+
+
# Server-side
diff --git a/tests/data/test28 b/tests/data/test28
index 6506c10aef..a746f23488 100644
--- a/tests/data/test28
+++ b/tests/data/test28
@@ -1,3 +1,9 @@
+
+
+HTTP
+HTTP GET
+
+
# Server-side
diff --git a/tests/data/test29 b/tests/data/test29
index 9e47ac396d..c258f6af69 100644
--- a/tests/data/test29
+++ b/tests/data/test29
@@ -1,3 +1,11 @@
+
+
+HTTP
+HTTP GET
+timeout
+FAILURE
+
+
# Server-side
diff --git a/tests/data/test30 b/tests/data/test30
index 80bacc50ef..01b86f6cad 100644
--- a/tests/data/test30
+++ b/tests/data/test30
@@ -1,3 +1,10 @@
+
+
+HTTP
+HTTP GET
+FAILURE
+
+
# Server-side
diff --git a/tests/data/test31 b/tests/data/test31
index 2433ba34b0..437317654f 100644
--- a/tests/data/test31
+++ b/tests/data/test31
@@ -1,3 +1,11 @@
+
+
+HTTP
+HTTP GET
+cookies
+cookiejar
+
+
# Server-side
diff --git a/tests/data/test32 b/tests/data/test32
index 72664a1c0b..b381aa8a5a 100644
--- a/tests/data/test32
+++ b/tests/data/test32
@@ -1,6 +1,13 @@
+
+
+HTTP
+HTTP GET
+-G
+
+
#
# Server-side
-
+
HTTP/1.1 200 OK
Date: Thu, 09 Nov 2010 14:49:00 GMT
diff --git a/tests/data/test8 b/tests/data/test8
index 93795fedae..31c985fe41 100644
--- a/tests/data/test8
+++ b/tests/data/test8
@@ -2,7 +2,7 @@
HTTP
HTTP GET
-HTTP cookies from header file
+cookies
# Server-side