4 files changed, 16 insertions, 16 deletions
diff --git a/tests/data/test1200 b/tests/data/test1200
index 94327201a..4e15ec9dc 100644
--- a/tests/data/test1200
+++ b/tests/data/test1200
@@ -10,11 +10,11 @@ INDEX
 #
 # Server-side
 <reply>
-<datacheck>
+<data>
 iMenu results		error.host	1
 0Selector 	/bar	bar.foo.invalid	70
 .
-</datacheck>
+</data>
 </reply>
 
 # Client-side
@@ -26,7 +26,7 @@ gopher
 Gopher index
  </name>
  <command>
-gopher://%HOSTIP:%GOPHERPORT
+gopher://%HOSTIP:%GOPHERPORT/1/1200
 </command>
 </client>
 
@@ -34,7 +34,7 @@ gopher://%HOSTIP:%GOPHERPORT
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-
+/1200
 </protocol>
 </verify>
 </testcase>
diff --git a/tests/data/test1201 b/tests/data/test1201
index bb3ccc5ef..ae5ebd11e 100644
--- a/tests/data/test1201
+++ b/tests/data/test1201
@@ -10,11 +10,11 @@ SELECTOR
 #
 # Server-side
 <reply>
-<datacheck>
+<data>
 iMenu results		error.host	1
 0Selector /selector/SELECTOR	/bar	bar.foo.invalid	70
 .
-</datacheck>
+</data>
 </reply>
 
 # Client-side
@@ -26,7 +26,7 @@ gopher
 Gopher selector
  </name>
  <command>
-gopher://%HOSTIP:%GOPHERPORT/1/selector/SELECTOR
+gopher://%HOSTIP:%GOPHERPORT/1/selector/SELECTOR/1201
 </command>
 </client>
 
@@ -34,7 +34,7 @@ gopher://%HOSTIP:%GOPHERPORT/1/selector/SELECTOR
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-/selector/SELECTOR
+/selector/SELECTOR/1201
 </protocol>
 </verify>
 </testcase>
diff --git a/tests/data/test1202 b/tests/data/test1202
index 8b8502d4b..253d42c73 100644
--- a/tests/data/test1202
+++ b/tests/data/test1202
@@ -10,12 +10,12 @@ QUERY
 #
 # Server-side
 <reply>
-<datacheck>
+<data>
 iSearch results		error.host	1
 0Query query succeeded	/foo	foo.bar.invalid	70
 0Selector /the/search/engine	/bar	bar.foo.invalid	70
 .
-</datacheck>
+</data>
 </reply>
 
 # Client-side
@@ -27,7 +27,7 @@ gopher
 Gopher query
  </name>
  <command>
-gopher://%HOSTIP:%GOPHERPORT/7/the/search/engine?query%20succeeded
+gopher://%HOSTIP:%GOPHERPORT/7/the/search/engine?query%20succeeded/1202
 </command>
 </client>
 
@@ -35,7 +35,7 @@ gopher://%HOSTIP:%GOPHERPORT/7/the/search/engine?query%20succeeded
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-/the/search/engine	query succeeded
+/the/search/engine	query succeeded/1202
 </protocol>
 </verify>
 </testcase>
diff --git a/tests/data/test1203 b/tests/data/test1203
index c639512b2..318cd01b4 100644
--- a/tests/data/test1203
+++ b/tests/data/test1203
@@ -11,11 +11,11 @@ INDEX
 #
 # Server-side
 <reply>
-<datacheck>
+<data>
 iMenu results		error.host	1
 0Selector 	/bar	bar.foo.invalid	70
 .
-</datacheck>
+</data>
 </reply>
 
 # Client-side
@@ -27,7 +27,7 @@ gopher-ipv6
 Gopher IPv6 index
  </name>
  <command>
--g "gopher://%HOSTIP:%GOPHER6PORT"
+-g "gopher://%HOSTIP:%GOPHER6PORT/1/moo/1203"
 </command>
 </client>
 
@@ -35,7 +35,7 @@ Gopher IPv6 index
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-
+/moo/1203
 </protocol>
 </verify>
 </testcase>