Change test entry format to be more like Turtle's
authorGregg Kellogg <gregg@kellogg-assoc.com>
Tue, 11 Sep 2012 20:50:08 -0700
changeset 138 7e69b4cd2983
parent 137 7d4d663a02b9
child 139 bad9c8c009ee
Change test entry format to be more like Turtle's
microdata-rdf/tests/add-test.rb
microdata-rdf/tests/index.html
microdata-rdf/tests/manifest-frame.jsonld
microdata-rdf/tests/manifest.jsonld
microdata-rdf/tests/manifest.ttl
--- a/microdata-rdf/tests/add-test.rb	Tue Sep 11 20:12:29 2012 -0700
+++ b/microdata-rdf/tests/add-test.rb	Tue Sep 11 20:50:08 2012 -0700
@@ -8,11 +8,11 @@
   [ '--num', GetoptLong::REQUIRED_ARGUMENT ],
   [ '--comment', GetoptLong::REQUIRED_ARGUMENT ],
   [ '--data', GetoptLong::REQUIRED_ARGUMENT ],
-  [ '--query', GetoptLong::REQUIRED_ARGUMENT ],
+  [ '--result', GetoptLong::REQUIRED_ARGUMENT ],
   [ '--negative', GetoptLong::NO_ARGUMENT ],
 )
 
-num = comment = data = query = negative = nil
+num = comment = data = result = negative = nil
 
 section_start = %r(.* id="positive-tests")m
 
@@ -25,13 +25,13 @@
       --negative  - negative test, positive otherwise
       --comment   - REQUIRED: test comment
       --data      - input file, defaults to num.html
-      --query     - result file, defaults to num.ttl
+      --result    - result file, defaults to num.ttl
     )
   when '--num' then num = arg.to_i
   when '--negative' then section_start = %r(.* id="negative-tests")m
   when '--comment' then comment = arg
   when "--data" then data = arg
-  when "--query" then query = arg
+  when "--resuit" then result = arg
   end
 end
 
@@ -53,11 +53,11 @@
 num ||= num_tests + 1
 num_str = "%.4d" % num
 data ||= "#{num_str}.html"
-query ||= "#{num_str}.ttl"
+result ||= "#{num_str}.ttl"
 
 # Create test files, if they don't exist
 File.open(data, "w") unless File.exist?(data)
-File.open(query, "w") unless File.exist?(query)
+File.open(result, "w") unless File.exist?(result)
 
 # Add test
 output += %(
@@ -73,10 +73,10 @@
   <span itemprop="action"
         itemscope="true"
         itemtype="http://www.w3.org/2001/sw/DataAccess/tests/test-query#QueryTest">
-    <a itemprop="data" href="#{data}">input</a> |
-    <a itemprop="query" href="#{query}">query</a>
-  </span>
-  <meta itemprop="result" content="true"/>
+    <a itemprop="data" href="#{data}">input</a>
+  </span> |
+  <a itemprop="result" href="#{query}">result</a>
+  <meta itemprop="positiveTest" content="true"/>
   )
 </div>
 <!-- End Test Description -->
--- a/microdata-rdf/tests/index.html	Tue Sep 11 20:12:29 2012 -0700
+++ b/microdata-rdf/tests/index.html	Tue Sep 11 20:50:08 2012 -0700
@@ -104,9 +104,10 @@
     [ a mf:ManifestEntry;
       mf:name &quot;Test 0001&quot;;
       rdfs:comment  &quot;Item with no itemtype and literal itemprop&quot;;
-      mf:action [qt:data &lt;0001.html&gt; qt:query &lt;0001.ttl&gt;];
+      mf:action [qt:data &lt;0001.html&gt;];
       mf:registry &lt;test-registry.json&gt;;
-      mf:result &quot;true&quot;;
+      mf:result &lt;0001.ttl&gt;
+      mf:positiveTest &quot;true&quot;;
     ]
   )
 ] .
@@ -131,10 +132,10 @@
   <span itemprop="action"
         itemscope="true"
         itemtype="http://www.w3.org/2001/sw/DataAccess/tests/test-query#QueryTest">
-    <a itemprop="data" href="0001.html">input</a> |
-    <a itemprop="query" href="0001.ttl">query</a>
-  </span>
-  <meta itemprop="result" content="true"/>
+    <a itemprop="data" href="0001.html">input</a>
+  </span> |
+  <a itemprop="result" href="0001.ttl">result</a>
+  <meta itemprop="positiveTest" content="true"/>
   )
 </div>
 <!-- End Test Description -->
@@ -151,10 +152,10 @@
   <span itemprop="action"
         itemscope="true"
         itemtype="http://www.w3.org/2001/sw/DataAccess/tests/test-query#QueryTest">
-    <a itemprop="data" href="0002.html">input</a> |
-    <a itemprop="query" href="0002.ttl">query</a>
-  </span>
-  <meta itemprop="result" content="true"/>
+    <a itemprop="data" href="0002.html">input</a>
+  </span> |
+  <a itemprop="result" href="0002.ttl">result</a>
+  <meta itemprop="positiveTest" content="true"/>
   )
 </div>
 <!-- End Test Description -->
@@ -171,10 +172,10 @@
   <span itemprop="action"
         itemscope="true"
         itemtype="http://www.w3.org/2001/sw/DataAccess/tests/test-query#QueryTest">
-    <a itemprop="data" href="0003.html">input</a> |
-    <a itemprop="query" href="0003.ttl">query</a>
-  </span>
-  <meta itemprop="result" content="true"/>
+    <a itemprop="data" href="0003.html">input</a>
+  </span> |
+  <a itemprop="result" href="0003.ttl">result</a>
+  <meta itemprop="positiveTest" content="true"/>
   )
 </div>
 <!-- End Test Description -->
@@ -191,10 +192,10 @@
   <span itemprop="action"
         itemscope="true"
         itemtype="http://www.w3.org/2001/sw/DataAccess/tests/test-query#QueryTest">
-    <a itemprop="data" href="0004.html">input</a> |
-    <a itemprop="query" href="0004.ttl">query</a>
-  </span>
-  <meta itemprop="result" content="true"/>
+    <a itemprop="data" href="0004.html">input</a>
+  </span> |
+  <a itemprop="result" href="0004.ttl">result</a>
+  <meta itemprop="positiveTest" content="true"/>
   )
 </div>
 <!-- End Test Description -->
@@ -211,10 +212,10 @@
   <span itemprop="action"
         itemscope="true"
         itemtype="http://www.w3.org/2001/sw/DataAccess/tests/test-query#QueryTest">
-    <a itemprop="data" href="0005.html">input</a> |
-    <a itemprop="query" href="0005.ttl">query</a>
-  </span>
-  <meta itemprop="result" content="true"/>
+    <a itemprop="data" href="0005.html">input</a>
+  </span> |
+  <a itemprop="result" href="0005.ttl">result</a>
+  <meta itemprop="positiveTest" content="true"/>
   )
 </div>
 <!-- End Test Description -->
@@ -231,10 +232,10 @@
   <span itemprop="action"
         itemscope="true"
         itemtype="http://www.w3.org/2001/sw/DataAccess/tests/test-query#QueryTest">
-    <a itemprop="data" href="0006.html">input</a> |
-    <a itemprop="query" href="0006.ttl">query</a>
-  </span>
-  <meta itemprop="result" content="true"/>
+    <a itemprop="data" href="0006.html">input</a>
+  </span> |
+  <a itemprop="result" href="0006.ttl">result</a>
+  <meta itemprop="positiveTest" content="true"/>
   )
 </div>
 <!-- End Test Description -->
@@ -251,10 +252,10 @@
   <span itemprop="action"
         itemscope="true"
         itemtype="http://www.w3.org/2001/sw/DataAccess/tests/test-query#QueryTest">
-    <a itemprop="data" href="0007.html">input</a> |
-    <a itemprop="query" href="0007.ttl">query</a>
-  </span>
-  <meta itemprop="result" content="true"/>
+    <a itemprop="data" href="0007.html">input</a>
+  </span> |
+  <a itemprop="result" href="0007.ttl">result</a>
+  <meta itemprop="positiveTest" content="true"/>
   )
 </div>
 <!-- End Test Description -->
@@ -271,10 +272,10 @@
   <span itemprop="action"
         itemscope="true"
         itemtype="http://www.w3.org/2001/sw/DataAccess/tests/test-query#QueryTest">
-    <a itemprop="data" href="0008.html">input</a> |
-    <a itemprop="query" href="0008.ttl">query</a>
-  </span>
-  <meta itemprop="result" content="true"/>
+    <a itemprop="data" href="0008.html">input</a>
+  </span> |
+  <a itemprop="result" href="0008.ttl">result</a>
+  <meta itemprop="positiveTest" content="true"/>
   )
 </div>
 <!-- End Test Description -->
@@ -291,10 +292,10 @@
   <span itemprop="action"
         itemscope="true"
         itemtype="http://www.w3.org/2001/sw/DataAccess/tests/test-query#QueryTest">
-    <a itemprop="data" href="0009.html">input</a> |
-    <a itemprop="query" href="0009.ttl">query</a>
-  </span>
-  <meta itemprop="result" content="true"/>
+    <a itemprop="data" href="0009.html">input</a>
+  </span> |
+  <a itemprop="result" href="0009.ttl">result</a>
+  <meta itemprop="positiveTest" content="true"/>
   )
 </div>
 <!-- End Test Description -->
@@ -311,10 +312,10 @@
   <span itemprop="action"
         itemscope="true"
         itemtype="http://www.w3.org/2001/sw/DataAccess/tests/test-query#QueryTest">
-    <a itemprop="data" href="0010.html">input</a> |
-    <a itemprop="query" href="0010.ttl">query</a>
-  </span>
-  <meta itemprop="result" content="true"/>
+    <a itemprop="data" href="0010.html">input</a>
+  </span> |
+  <a itemprop="result" href="0010.ttl">result</a>
+  <meta itemprop="positiveTest" content="true"/>
   )
 </div>
 <!-- End Test Description -->
@@ -331,10 +332,10 @@
   <span itemprop="action"
         itemscope="true"
         itemtype="http://www.w3.org/2001/sw/DataAccess/tests/test-query#QueryTest">
-    <a itemprop="data" href="0011.html">input</a> |
-    <a itemprop="query" href="0011.ttl">query</a>
-  </span>
-  <meta itemprop="result" content="true"/>
+    <a itemprop="data" href="0011.html">input</a>
+  </span> |
+  <a itemprop="result" href="0011.ttl">result</a>
+  <meta itemprop="positiveTest" content="true"/>
   )
 </div>
 <!-- End Test Description -->
@@ -351,10 +352,10 @@
   <span itemprop="action"
         itemscope="true"
         itemtype="http://www.w3.org/2001/sw/DataAccess/tests/test-query#QueryTest">
-    <a itemprop="data" href="0012.html">input</a> |
-    <a itemprop="query" href="0012.ttl">query</a>
-  </span>
-  <meta itemprop="result" content="true"/>
+    <a itemprop="data" href="0012.html">input</a>
+  </span> |
+  <a itemprop="result" href="0012.ttl">result</a>
+  <meta itemprop="positiveTest" content="true"/>
   )
 </div>
 <!-- End Test Description -->
@@ -371,10 +372,10 @@
   <span itemprop="action"
         itemscope="true"
         itemtype="http://www.w3.org/2001/sw/DataAccess/tests/test-query#QueryTest">
-    <a itemprop="data" href="0013.html">input</a> |
-    <a itemprop="query" href="0013.ttl">query</a>
-  </span>
-  <meta itemprop="result" content="true"/>
+    <a itemprop="data" href="0013.html">input</a>
+  </span> |
+  <a itemprop="result" href="0013.ttl">result</a>
+  <meta itemprop="positiveTest" content="true"/>
   )
 </div>
 <!-- End Test Description -->
@@ -391,10 +392,10 @@
   <span itemprop="action"
         itemscope="true"
         itemtype="http://www.w3.org/2001/sw/DataAccess/tests/test-query#QueryTest">
-    <a itemprop="data" href="0014.html">input</a> |
-    <a itemprop="query" href="0014.ttl">query</a>
-  </span>
-  <meta itemprop="result" content="true"/>
+    <a itemprop="data" href="0014.html">input</a>
+  </span> |
+  <a itemprop="result" href="0014.ttl">result</a>
+  <meta itemprop="positiveTest" content="true"/>
   )
 </div>
 <!-- End Test Description -->
@@ -411,10 +412,10 @@
   <span itemprop="action"
         itemscope="true"
         itemtype="http://www.w3.org/2001/sw/DataAccess/tests/test-query#QueryTest">
-    <a itemprop="data" href="0015.html">input</a> |
-    <a itemprop="query" href="0015.ttl">query</a>
-  </span>
-  <meta itemprop="result" content="true"/>
+    <a itemprop="data" href="0015.html">input</a>
+  </span> |
+  <a itemprop="result" href="0015.ttl">result</a>
+  <meta itemprop="positiveTest" content="true"/>
   )
 </div>
 <!-- End Test Description -->
@@ -431,11 +432,11 @@
   <span itemprop="action"
         itemscope="true"
         itemtype="http://www.w3.org/2001/sw/DataAccess/tests/test-query#QueryTest">
-    <a itemprop="data" href="sdo_eg_md_1.html">input</a> |
-    <a itemprop="query" href="sdo_eg_md_1.ttl">query</a>
-  </span>
+    <a itemprop="data" href="sdo_eg_md_1.html">input</a>
+  </span> |
+  <a itemprop="result" href="sdo_eg_md_1.ttl">result</a>
   <link itemprop="registry" href="http://www.w3.org/ns/md"/>
-  <meta itemprop="result" content="true"/>
+  <meta itemprop="positiveTest" content="true"/>
   )
 </div>
 <!-- End Test Description -->
@@ -452,11 +453,11 @@
   <span itemprop="action"
         itemscope="true"
         itemtype="http://www.w3.org/2001/sw/DataAccess/tests/test-query#QueryTest">
-    <a itemprop="data" href="sdo_eg_md_2.html">input</a> |
-    <a itemprop="query" href="sdo_eg_md_2.ttl">query</a>
-  </span>
+    <a itemprop="data" href="sdo_eg_md_2.html">input</a>
+  </span> |
+  <a itemprop="result" href="sdo_eg_md_2.ttl">result</a>
   <link itemprop="registry" href="http://www.w3.org/ns/md"/>
-  <meta itemprop="result" content="true"/>
+  <meta itemprop="positiveTest" content="true"/>
   )
 </div>
 <!-- End Test Description -->
@@ -473,11 +474,11 @@
   <span itemprop="action"
         itemscope="true"
         itemtype="http://www.w3.org/2001/sw/DataAccess/tests/test-query#QueryTest">
-    <a itemprop="data" href="sdo_eg_md_3.html">input</a> |
-    <a itemprop="query" href="sdo_eg_md_3.ttl">query</a>
-  </span>
+    <a itemprop="data" href="sdo_eg_md_3.html">input</a>
+  </span> |
+  <a itemprop="result" href="sdo_eg_md_3.ttl">result</a>
   <link itemprop="registry" href="http://www.w3.org/ns/md"/>
-  <meta itemprop="result" content="true"/>
+  <meta itemprop="positiveTest" content="true"/>
   )
 </div>
 <!-- End Test Description -->
@@ -494,11 +495,11 @@
   <span itemprop="action"
         itemscope="true"
         itemtype="http://www.w3.org/2001/sw/DataAccess/tests/test-query#QueryTest">
-    <a itemprop="data" href="sdo_eg_md_4.html">input</a> |
-    <a itemprop="query" href="sdo_eg_md_4.ttl">query</a>
-  </span>
+    <a itemprop="data" href="sdo_eg_md_4.html">input</a>
+  </span> |
+  <a itemprop="result" href="sdo_eg_md_4.ttl">result</a>
   <link itemprop="registry" href="http://www.w3.org/ns/md"/>
-  <meta itemprop="result" content="true"/>
+  <meta itemprop="positiveTest" content="true"/>
   )
 </div>
 <!-- End Test Description -->
@@ -515,11 +516,11 @@
   <span itemprop="action"
         itemscope="true"
         itemtype="http://www.w3.org/2001/sw/DataAccess/tests/test-query#QueryTest">
-    <a itemprop="data" href="sdo_eg_md_5.html">input</a> |
-    <a itemprop="query" href="sdo_eg_md_5.ttl">query</a>
-  </span>
+    <a itemprop="data" href="sdo_eg_md_5.html">input</a>
+  </span> |
+  <a itemprop="result" href="sdo_eg_md_5.ttl">result</a>
   <link itemprop="registry" href="http://www.w3.org/ns/md"/>
-  <meta itemprop="result" content="true"/>
+  <meta itemprop="positiveTest" content="true"/>
   )
 </div>
 <!-- End Test Description -->
@@ -536,11 +537,11 @@
   <span itemprop="action"
         itemscope="true"
         itemtype="http://www.w3.org/2001/sw/DataAccess/tests/test-query#QueryTest">
-    <a itemprop="data" href="sdo_eg_md_6.html">input</a> |
-    <a itemprop="query" href="sdo_eg_md_6.ttl">query</a>
-  </span>
+    <a itemprop="data" href="sdo_eg_md_6.html">input</a>
+  </span> |
+  <a itemprop="result" href="sdo_eg_md_6.ttl">result</a>
   <link itemprop="registry" href="http://www.w3.org/ns/md"/>
-  <meta itemprop="result" content="true"/>
+  <meta itemprop="positiveTest" content="true"/>
   )
 </div>
 <!-- End Test Description -->
@@ -557,11 +558,11 @@
   <span itemprop="action"
         itemscope="true"
         itemtype="http://www.w3.org/2001/sw/DataAccess/tests/test-query#QueryTest">
-    <a itemprop="data" href="sdo_eg_md_7.html">input</a> |
-    <a itemprop="query" href="sdo_eg_md_7.ttl">query</a>
-  </span>
+    <a itemprop="data" href="sdo_eg_md_7.html">input</a>
+  </span> |
+  <a itemprop="result" href="sdo_eg_md_7.ttl">result</a>
   <link itemprop="registry" href="http://www.w3.org/ns/md"/>
-  <meta itemprop="result" content="true"/>
+  <meta itemprop="positiveTest" content="true"/>
   )
 </div>
 <!-- End Test Description -->
@@ -578,11 +579,11 @@
   <span itemprop="action"
         itemscope="true"
         itemtype="http://www.w3.org/2001/sw/DataAccess/tests/test-query#QueryTest">
-    <a itemprop="data" href="sdo_eg_md_8.html">input</a> |
-    <a itemprop="query" href="sdo_eg_md_8.ttl">query</a>
-  </span>
+    <a itemprop="data" href="sdo_eg_md_8.html">input</a>
+  </span> |
+  <a itemprop="result" href="sdo_eg_md_8.ttl">result</a>
   <link itemprop="registry" href="http://www.w3.org/ns/md"/>
-  <meta itemprop="result" content="true"/>
+  <meta itemprop="positiveTest" content="true"/>
   )
 </div>
 <!-- End Test Description -->
@@ -599,11 +600,11 @@
   <span itemprop="action"
         itemscope="true"
         itemtype="http://www.w3.org/2001/sw/DataAccess/tests/test-query#QueryTest">
-    <a itemprop="data" href="sdo_eg_md_9.html">input</a> |
-    <a itemprop="query" href="sdo_eg_md_9.ttl">query</a>
-  </span>
+    <a itemprop="data" href="sdo_eg_md_9.html">input</a>
+  </span> |
+  <a itemprop="result" href="sdo_eg_md_9.ttl">result</a>
   <link itemprop="registry" href="http://www.w3.org/ns/md"/>
-  <meta itemprop="result" content="true"/>
+  <meta itemprop="positiveTest" content="true"/>
   )
 </div>
 <!-- End Test Description -->
@@ -620,11 +621,11 @@
   <span itemprop="action"
         itemscope="true"
         itemtype="http://www.w3.org/2001/sw/DataAccess/tests/test-query#QueryTest">
-    <a itemprop="data" href="sdo_eg_md_10.html">input</a> |
-    <a itemprop="query" href="sdo_eg_md_10.ttl">query</a>
-  </span>
+    <a itemprop="data" href="sdo_eg_md_10.html">input</a>
+  </span> |
+  <a itemprop="result" href="sdo_eg_md_10.ttl">result</a>
   <link itemprop="registry" href="http://www.w3.org/ns/md"/>
-  <meta itemprop="result" content="true"/>
+  <meta itemprop="positiveTest" content="true"/>
   )
 </div>
 <!-- End Test Description -->
@@ -641,11 +642,11 @@
   <span itemprop="action"
         itemscope="true"
         itemtype="http://www.w3.org/2001/sw/DataAccess/tests/test-query#QueryTest">
-    <a itemprop="data" href="sdo_eg_md_11.html">input</a> |
-    <a itemprop="query" href="sdo_eg_md_11.ttl">query</a>
-  </span>
+    <a itemprop="data" href="sdo_eg_md_11.html">input</a>
+  </span> |
+  <a itemprop="result" href="sdo_eg_md_11.ttl">result</a>
   <link itemprop="registry" href="http://www.w3.org/ns/md"/>
-  <meta itemprop="result" content="true"/>
+  <meta itemprop="positiveTest" content="true"/>
   )
 </div>
 <!-- End Test Description -->
@@ -662,11 +663,11 @@
   <span itemprop="action"
         itemscope="true"
         itemtype="http://www.w3.org/2001/sw/DataAccess/tests/test-query#QueryTest">
-    <a itemprop="data" href="sdo_eg_md_12.html">input</a> |
-    <a itemprop="query" href="sdo_eg_md_12.ttl">query</a>
-  </span>
+    <a itemprop="data" href="sdo_eg_md_12.html">input</a>
+  </span> |
+  <a itemprop="result" href="sdo_eg_md_12.ttl">result</a>
   <link itemprop="registry" href="http://www.w3.org/ns/md"/>
-  <meta itemprop="result" content="true"/>
+  <meta itemprop="positiveTest" content="true"/>
   )
 </div>
 <!-- End Test Description -->
@@ -683,11 +684,11 @@
   <span itemprop="action"
         itemscope="true"
         itemtype="http://www.w3.org/2001/sw/DataAccess/tests/test-query#QueryTest">
-    <a itemprop="data" href="sdo_eg_md_13.html">input</a> |
-    <a itemprop="query" href="sdo_eg_md_13.ttl">query</a>
-  </span>
+    <a itemprop="data" href="sdo_eg_md_13.html">input</a>
+  </span> |
+  <a itemprop="result" href="sdo_eg_md_13.ttl">result</a>
   <link itemprop="registry" href="http://www.w3.org/ns/md"/>
-  <meta itemprop="result" content="true"/>
+  <meta itemprop="positiveTest" content="true"/>
   )
 </div>
 <!-- End Test Description -->
@@ -704,11 +705,11 @@
   <span itemprop="action"
         itemscope="true"
         itemtype="http://www.w3.org/2001/sw/DataAccess/tests/test-query#QueryTest">
-    <a itemprop="data" href="sdo_eg_md_14.html">input</a> |
-    <a itemprop="query" href="sdo_eg_md_14.ttl">query</a>
-  </span>
+    <a itemprop="data" href="sdo_eg_md_14.html">input</a>
+  </span> |
+  <a itemprop="result" href="sdo_eg_md_14.ttl">result</a>
   <link itemprop="registry" href="http://www.w3.org/ns/md"/>
-  <meta itemprop="result" content="true"/>
+  <meta itemprop="positiveTest" content="true"/>
   )
 </div>
 <!-- End Test Description -->
@@ -725,11 +726,11 @@
   <span itemprop="action"
         itemscope="true"
         itemtype="http://www.w3.org/2001/sw/DataAccess/tests/test-query#QueryTest">
-    <a itemprop="data" href="sdo_eg_md_15.html">input</a> |
-    <a itemprop="query" href="sdo_eg_md_15.ttl">query</a>
-  </span>
+    <a itemprop="data" href="sdo_eg_md_15.html">input</a>
+  </span> |
+  <a itemprop="result" href="sdo_eg_md_15.ttl">result</a>
   <link itemprop="registry" href="http://www.w3.org/ns/md"/>
-  <meta itemprop="result" content="true"/>
+  <meta itemprop="positiveTest" content="true"/>
   )
 </div>
 <!-- End Test Description -->
@@ -746,11 +747,11 @@
   <span itemprop="action"
         itemscope="true"
         itemtype="http://www.w3.org/2001/sw/DataAccess/tests/test-query#QueryTest">
-    <a itemprop="data" href="sdo_eg_md_16.html">input</a> |
-    <a itemprop="query" href="sdo_eg_md_16.ttl">query</a>
-  </span>
+    <a itemprop="data" href="sdo_eg_md_16.html">input</a>
+  </span> |
+  <a itemprop="result" href="sdo_eg_md_16.ttl">result</a>
   <link itemprop="registry" href="http://www.w3.org/ns/md"/>
-  <meta itemprop="result" content="true"/>
+  <meta itemprop="positiveTest" content="true"/>
   )
 </div>
 <!-- End Test Description -->
@@ -767,11 +768,11 @@
   <span itemprop="action"
         itemscope="true"
         itemtype="http://www.w3.org/2001/sw/DataAccess/tests/test-query#QueryTest">
-    <a itemprop="data" href="sdo_eg_md_17.html">input</a> |
-    <a itemprop="query" href="sdo_eg_md_17.ttl">query</a>
-  </span>
+    <a itemprop="data" href="sdo_eg_md_17.html">input</a>
+  </span> |
+  <a itemprop="result" href="sdo_eg_md_17.ttl">result</a>
   <link itemprop="registry" href="http://www.w3.org/ns/md"/>
-  <meta itemprop="result" content="true"/>
+  <meta itemprop="positiveTest" content="true"/>
   )
 </div>
 <!-- End Test Description -->
@@ -788,11 +789,11 @@
   <span itemprop="action"
         itemscope="true"
         itemtype="http://www.w3.org/2001/sw/DataAccess/tests/test-query#QueryTest">
-    <a itemprop="data" href="sdo_eg_md_18.html">input</a> |
-    <a itemprop="query" href="sdo_eg_md_18.ttl">query</a>
-  </span>
+    <a itemprop="data" href="sdo_eg_md_18.html">input</a>
+  </span> |
+  <a itemprop="result" href="sdo_eg_md_18.ttl">result</a>
   <link itemprop="registry" href="http://www.w3.org/ns/md"/>
-  <meta itemprop="result" content="true"/>
+  <meta itemprop="positiveTest" content="true"/>
   )
 </div>
 <!-- End Test Description -->
@@ -809,11 +810,11 @@
   <span itemprop="action"
         itemscope="true"
         itemtype="http://www.w3.org/2001/sw/DataAccess/tests/test-query#QueryTest">
-    <a itemprop="data" href="sdo_eg_md_19.html">input</a> |
-    <a itemprop="query" href="sdo_eg_md_19.ttl">query</a>
-  </span>
+    <a itemprop="data" href="sdo_eg_md_19.html">input</a>
+  </span> |
+  <a itemprop="result" href="sdo_eg_md_19.ttl">result</a>
   <link itemprop="registry" href="http://www.w3.org/ns/md"/>
-  <meta itemprop="result" content="true"/>
+  <meta itemprop="positiveTest" content="true"/>
   )
 </div>
 <!-- End Test Description -->
@@ -830,11 +831,11 @@
   <span itemprop="action"
         itemscope="true"
         itemtype="http://www.w3.org/2001/sw/DataAccess/tests/test-query#QueryTest">
-    <a itemprop="data" href="sdo_eg_md_20.html">input</a> |
-    <a itemprop="query" href="sdo_eg_md_20.ttl">query</a>
-  </span>
+    <a itemprop="data" href="sdo_eg_md_20.html">input</a>
+  </span> |
+  <a itemprop="result" href="sdo_eg_md_20.ttl">result</a>
   <link itemprop="registry" href="http://www.w3.org/ns/md"/>
-  <meta itemprop="result" content="true"/>
+  <meta itemprop="positiveTest" content="true"/>
   )
 </div>
 <!-- End Test Description -->
@@ -851,11 +852,11 @@
   <span itemprop="action"
         itemscope="true"
         itemtype="http://www.w3.org/2001/sw/DataAccess/tests/test-query#QueryTest">
-    <a itemprop="data" href="sdo_eg_md_21.html">input</a> |
-    <a itemprop="query" href="sdo_eg_md_21.ttl">query</a>
-  </span>
+    <a itemprop="data" href="sdo_eg_md_21.html">input</a>
+  </span> |
+  <a itemprop="result" href="sdo_eg_md_21.ttl">result</a>
   <link itemprop="registry" href="http://www.w3.org/ns/md"/>
-  <meta itemprop="result" content="true"/>
+  <meta itemprop="positiveTest" content="true"/>
   )
 </div>
 <!-- End Test Description -->
@@ -872,11 +873,11 @@
   <span itemprop="action"
         itemscope="true"
         itemtype="http://www.w3.org/2001/sw/DataAccess/tests/test-query#QueryTest">
-    <a itemprop="data" href="sdo_eg_md_22.html">input</a> |
-    <a itemprop="query" href="sdo_eg_md_22.ttl">query</a>
-  </span>
+    <a itemprop="data" href="sdo_eg_md_22.html">input</a>
+  </span> |
+  <a itemprop="result" href="sdo_eg_md_22.ttl">result</a>
   <link itemprop="registry" href="http://www.w3.org/ns/md"/>
-  <meta itemprop="result" content="true"/>
+  <meta itemprop="positiveTest" content="true"/>
   )
 </div>
 <!-- End Test Description -->
@@ -893,11 +894,11 @@
   <span itemprop="action"
         itemscope="true"
         itemtype="http://www.w3.org/2001/sw/DataAccess/tests/test-query#QueryTest">
-    <a itemprop="data" href="sdo_eg_md_23.html">input</a> |
-    <a itemprop="query" href="sdo_eg_md_23.ttl">query</a>
-  </span>
+    <a itemprop="data" href="sdo_eg_md_23.html">input</a>
+  </span> |
+  <a itemprop="result" href="sdo_eg_md_23.ttl">result</a>
   <link itemprop="registry" href="http://www.w3.org/ns/md"/>
-  <meta itemprop="result" content="true"/>
+  <meta itemprop="positiveTest" content="true"/>
   )
 </div>
 <!-- End Test Description -->
@@ -914,11 +915,11 @@
   <span itemprop="action"
         itemscope="true"
         itemtype="http://www.w3.org/2001/sw/DataAccess/tests/test-query#QueryTest">
-    <a itemprop="data" href="sdo_eg_md_24.html">input</a> |
-    <a itemprop="query" href="sdo_eg_md_24.ttl">query</a>
-  </span>
+    <a itemprop="data" href="sdo_eg_md_24.html">input</a>
+  </span> |
+  <a itemprop="result" href="sdo_eg_md_24.ttl">result</a>
   <link itemprop="registry" href="http://www.w3.org/ns/md"/>
-  <meta itemprop="result" content="true"/>
+  <meta itemprop="positiveTest" content="true"/>
   )
 </div>
 <!-- End Test Description -->
@@ -935,11 +936,11 @@
   <span itemprop="action"
         itemscope="true"
         itemtype="http://www.w3.org/2001/sw/DataAccess/tests/test-query#QueryTest">
-    <a itemprop="data" href="sdo_eg_md_25.html">input</a> |
-    <a itemprop="query" href="sdo_eg_md_25.ttl">query</a>
-  </span>
+    <a itemprop="data" href="sdo_eg_md_25.html">input</a>
+  </span> |
+  <a itemprop="result" href="sdo_eg_md_25.ttl">result</a>
   <link itemprop="registry" href="http://www.w3.org/ns/md"/>
-  <meta itemprop="result" content="true"/>
+  <meta itemprop="positiveTest" content="true"/>
   )
 </div>
 <!-- End Test Description -->
@@ -956,11 +957,11 @@
   <span itemprop="action"
         itemscope="true"
         itemtype="http://www.w3.org/2001/sw/DataAccess/tests/test-query#QueryTest">
-    <a itemprop="data" href="sdo_eg_md_26.html">input</a> |
-    <a itemprop="query" href="sdo_eg_md_26.ttl">query</a>
-  </span>
+    <a itemprop="data" href="sdo_eg_md_26.html">input</a>
+  </span> |
+  <a itemprop="result" href="sdo_eg_md_26.ttl">result</a>
   <link itemprop="registry" href="http://www.w3.org/ns/md"/>
-  <meta itemprop="result" content="true"/>
+  <meta itemprop="positiveTest" content="true"/>
   )
 </div>
 <!-- End Test Description -->
@@ -977,11 +978,11 @@
   <span itemprop="action"
         itemscope="true"
         itemtype="http://www.w3.org/2001/sw/DataAccess/tests/test-query#QueryTest">
-    <a itemprop="data" href="sdo_eg_md_27.html">input</a> |
-    <a itemprop="query" href="sdo_eg_md_27.ttl">query</a>
-  </span>
+    <a itemprop="data" href="sdo_eg_md_27.html">input</a>
+  </span> |
+  <a itemprop="result" href="sdo_eg_md_27.ttl">result</a>
   <link itemprop="registry" href="http://www.w3.org/ns/md"/>
-  <meta itemprop="result" content="true"/>
+  <meta itemprop="positiveTest" content="true"/>
   )
 </div>
 <!-- End Test Description -->
@@ -998,11 +999,11 @@
   <span itemprop="action"
         itemscope="true"
         itemtype="http://www.w3.org/2001/sw/DataAccess/tests/test-query#QueryTest">
-    <a itemprop="data" href="sdo_eg_md_28.html">input</a> |
-    <a itemprop="query" href="sdo_eg_md_28.ttl">query</a>
-  </span>
+    <a itemprop="data" href="sdo_eg_md_28.html">input</a>
+  </span> |
+  <a itemprop="result" href="sdo_eg_md_28.ttl">result</a>
   <link itemprop="registry" href="http://www.w3.org/ns/md"/>
-  <meta itemprop="result" content="true"/>
+  <meta itemprop="positiveTest" content="true"/>
   )
 </div>
 <!-- End Test Description -->
@@ -1019,11 +1020,11 @@
   <span itemprop="action"
         itemscope="true"
         itemtype="http://www.w3.org/2001/sw/DataAccess/tests/test-query#QueryTest">
-    <a itemprop="data" href="sdo_eg_md_29.html">input</a> |
-    <a itemprop="query" href="sdo_eg_md_29.ttl">query</a>
-  </span>
+    <a itemprop="data" href="sdo_eg_md_29.html">input</a>
+  </span> |
+  <a itemprop="result" href="sdo_eg_md_29.ttl">result</a>
   <link itemprop="registry" href="http://www.w3.org/ns/md"/>
-  <meta itemprop="result" content="true"/>
+  <meta itemprop="positiveTest" content="true"/>
   )
 </div>
 <!-- End Test Description -->
@@ -1040,11 +1041,11 @@
   <span itemprop="action"
         itemscope="true"
         itemtype="http://www.w3.org/2001/sw/DataAccess/tests/test-query#QueryTest">
-    <a itemprop="data" href="sdo_eg_md_30.html">input</a> |
-    <a itemprop="query" href="sdo_eg_md_30.ttl">query</a>
-  </span>
+    <a itemprop="data" href="sdo_eg_md_30.html">input</a>
+  </span> |
+  <a itemprop="result" href="sdo_eg_md_30.ttl">result</a>
   <link itemprop="registry" href="http://www.w3.org/ns/md"/>
-  <meta itemprop="result" content="true"/>
+  <meta itemprop="positiveTest" content="true"/>
   )
 </div>
 <!-- End Test Description -->
@@ -1061,10 +1062,10 @@
   <span itemprop="action"
         itemscope="true"
         itemtype="http://www.w3.org/2001/sw/DataAccess/tests/test-query#QueryTest">
-    <a itemprop="data" href="0046.html">input</a> |
-    <a itemprop="query" href="0046.ttl">query</a>
-  </span>
-  <meta itemprop="result" content="true"/>
+    <a itemprop="data" href="0046.html">input</a>
+  </span> |
+  <a itemprop="result" href="0046.ttl">result</a>
+  <meta itemprop="positiveTest" content="true"/>
   )
 </div>
 <!-- End Test Description -->
@@ -1081,10 +1082,10 @@
   <span itemprop="action"
         itemscope="true"
         itemtype="http://www.w3.org/2001/sw/DataAccess/tests/test-query#QueryTest">
-    <a itemprop="data" href="0047.html">input</a> |
-    <a itemprop="query" href="0047.ttl">query</a>
-  </span>
-  <meta itemprop="result" content="true"/>
+    <a itemprop="data" href="0047.html">input</a>
+  </span> |
+  <a itemprop="result" href="0047.ttl">result</a>
+  <meta itemprop="positiveTest" content="true"/>
   )
 </div>
 <!-- End Test Description -->
@@ -1101,10 +1102,10 @@
   <span itemprop="action"
         itemscope="true"
         itemtype="http://www.w3.org/2001/sw/DataAccess/tests/test-query#QueryTest">
-    <a itemprop="data" href="0048.html">input</a> |
-    <a itemprop="query" href="0048.ttl">query</a>
-  </span>
-  <meta itemprop="result" content="true"/>
+    <a itemprop="data" href="0048.html">input</a>
+  </span> |
+  <a itemprop="result" href="0048.ttl">result</a>
+  <meta itemprop="positiveTest" content="true"/>
   )
 </div>
 <!-- End Test Description -->
@@ -1121,10 +1122,10 @@
   <span itemprop="action"
         itemscope="true"
         itemtype="http://www.w3.org/2001/sw/DataAccess/tests/test-query#QueryTest">
-    <a itemprop="data" href="0049.html">input</a> |
-    <a itemprop="query" href="0049.ttl">query</a>
-  </span>
-  <meta itemprop="result" content="true"/>
+    <a itemprop="data" href="0049.html">input</a>
+  </span> |
+  <a itemprop="result" href="0049.ttl">result</a>
+  <meta itemprop="positiveTest" content="true"/>
   )
 </div>
 <!-- End Test Description -->
@@ -1141,10 +1142,10 @@
   <span itemprop="action"
         itemscope="true"
         itemtype="http://www.w3.org/2001/sw/DataAccess/tests/test-query#QueryTest">
-    <a itemprop="data" href="0050.html">input</a> |
-    <a itemprop="query" href="0050.ttl">query</a>
-  </span>
-  <meta itemprop="result" content="true"/>
+    <a itemprop="data" href="0050.html">input</a>
+  </span> |
+  <a itemprop="result" href="0050.ttl">result</a>
+  <meta itemprop="positiveTest" content="true"/>
   )
 </div>
 <!-- End Test Description -->
@@ -1161,10 +1162,10 @@
   <span itemprop="action"
         itemscope="true"
         itemtype="http://www.w3.org/2001/sw/DataAccess/tests/test-query#QueryTest">
-    <a itemprop="data" href="0051.html">input</a> |
-    <a itemprop="query" href="0051.ttl">query</a>
-  </span>
-  <meta itemprop="result" content="true"/>
+    <a itemprop="data" href="0051.html">input</a>
+  </span> |
+  <a itemprop="result" href="0051.ttl">result</a>
+  <meta itemprop="positiveTest" content="true"/>
   )
 </div>
 <!-- End Test Description -->
@@ -1181,10 +1182,10 @@
   <span itemprop="action"
         itemscope="true"
         itemtype="http://www.w3.org/2001/sw/DataAccess/tests/test-query#QueryTest">
-    <a itemprop="data" href="0052.html">input</a> |
-    <a itemprop="query" href="0052.ttl">query</a>
-  </span>
-  <meta itemprop="result" content="true"/>
+    <a itemprop="data" href="0052.html">input</a>
+  </span> |
+  <a itemprop="result" href="0052.ttl">result</a>
+  <meta itemprop="positiveTest" content="true"/>
   )
 </div>
 <!-- End Test Description -->
@@ -1201,10 +1202,10 @@
   <span itemprop="action"
         itemscope="true"
         itemtype="http://www.w3.org/2001/sw/DataAccess/tests/test-query#QueryTest">
-    <a itemprop="data" href="0053.html">input</a> |
-    <a itemprop="query" href="0053.ttl">query</a>
-  </span>
-  <meta itemprop="result" content="true"/>
+    <a itemprop="data" href="0053.html">input</a>
+  </span> |
+  <a itemprop="result" href="0053.ttl">result</a>
+  <meta itemprop="positiveTest" content="true"/>
   )
 </div>
 <!-- End Test Description -->
@@ -1221,10 +1222,10 @@
   <span itemprop="action"
         itemscope="true"
         itemtype="http://www.w3.org/2001/sw/DataAccess/tests/test-query#QueryTest">
-    <a itemprop="data" href="0054.html">input</a> |
-    <a itemprop="query" href="0054.ttl">query</a>
-  </span>
-  <meta itemprop="result" content="true"/>
+    <a itemprop="data" href="0054.html">input</a>
+  </span> |
+  <a itemprop="result" href="0054.ttl">result</a>
+  <meta itemprop="positiveTest" content="true"/>
   )
 </div>
 <!-- End Test Description -->
@@ -1241,10 +1242,10 @@
   <span itemprop="action"
         itemscope="true"
         itemtype="http://www.w3.org/2001/sw/DataAccess/tests/test-query#QueryTest">
-    <a itemprop="data" href="0055.html">input</a> |
-    <a itemprop="query" href="0055.ttl">query</a>
-  </span>
-  <meta itemprop="result" content="true"/>
+    <a itemprop="data" href="0055.html">input</a>
+  </span> |
+  <a itemprop="result" href="0055.ttl">result</a>
+  <meta itemprop="positiveTest" content="true"/>
   )
 </div>
 <!-- End Test Description -->
@@ -1261,10 +1262,10 @@
   <span itemprop="action"
         itemscope="true"
         itemtype="http://www.w3.org/2001/sw/DataAccess/tests/test-query#QueryTest">
-    <a itemprop="data" href="0056.html">input</a> |
-    <a itemprop="query" href="0056.ttl">query</a>
-  </span>
-  <meta itemprop="result" content="true"/>
+    <a itemprop="data" href="0056.html">input</a>
+  </span> |
+  <a itemprop="result" href="0056.ttl">result</a>
+  <meta itemprop="positiveTest" content="true"/>
   )
 </div>
 <!-- End Test Description -->
@@ -1281,10 +1282,10 @@
   <span itemprop="action"
         itemscope="true"
         itemtype="http://www.w3.org/2001/sw/DataAccess/tests/test-query#QueryTest">
-    <a itemprop="data" href="0057.html">input</a> |
-    <a itemprop="query" href="0057.ttl">query</a>
-  </span>
-  <meta itemprop="result" content="true"/>
+    <a itemprop="data" href="0057.html">input</a>
+  </span> |
+  <a itemprop="result" href="0057.ttl">result</a>
+  <meta itemprop="positiveTest" content="true"/>
   )
 </div>
 <!-- End Test Description -->
@@ -1301,10 +1302,10 @@
   <span itemprop="action"
         itemscope="true"
         itemtype="http://www.w3.org/2001/sw/DataAccess/tests/test-query#QueryTest">
-    <a itemprop="data" href="0058.html">input</a> |
-    <a itemprop="query" href="0058.ttl">query</a>
-  </span>
-  <meta itemprop="result" content="true"/>
+    <a itemprop="data" href="0058.html">input</a>
+  </span> |
+  <a itemprop="result" href="0058.ttl">result</a>
+  <meta itemprop="positiveTest" content="true"/>
   )
 </div>
 <!-- End Test Description -->
@@ -1321,10 +1322,10 @@
   <span itemprop="action"
         itemscope="true"
         itemtype="http://www.w3.org/2001/sw/DataAccess/tests/test-query#QueryTest">
-    <a itemprop="data" href="0059.html">input</a> |
-    <a itemprop="query" href="0059.ttl">query</a>
-  </span>
-  <meta itemprop="result" content="true"/>
+    <a itemprop="data" href="0059.html">input</a>
+  </span> |
+  <a itemprop="result" href="0059.ttl">result</a>
+  <meta itemprop="positiveTest" content="true"/>
   )
 </div>
 <!-- End Test Description -->
@@ -1341,10 +1342,10 @@
   <span itemprop="action"
         itemscope="true"
         itemtype="http://www.w3.org/2001/sw/DataAccess/tests/test-query#QueryTest">
-    <a itemprop="data" href="0060.html">input</a> |
-    <a itemprop="query" href="0060.ttl">query</a>
-  </span>
-  <meta itemprop="result" content="true"/>
+    <a itemprop="data" href="0060.html">input</a>
+  </span> |
+  <a itemprop="result" href="0060.ttl">result</a>
+  <meta itemprop="positiveTest" content="true"/>
   )
 </div>
 <!-- End Test Description -->
@@ -1361,10 +1362,10 @@
   <span itemprop="action"
         itemscope="true"
         itemtype="http://www.w3.org/2001/sw/DataAccess/tests/test-query#QueryTest">
-    <a itemprop="data" href="0061.html">input</a> |
-    <a itemprop="query" href="0061.ttl">query</a>
-  </span>
-  <meta itemprop="result" content="true"/>
+    <a itemprop="data" href="0061.html">input</a>
+  </span> |
+  <a itemprop="result" href="0061.ttl">result</a>
+  <meta itemprop="positiveTest" content="true"/>
   )
 </div>
 <!-- End Test Description -->
@@ -1381,10 +1382,10 @@
   <span itemprop="action"
         itemscope="true"
         itemtype="http://www.w3.org/2001/sw/DataAccess/tests/test-query#QueryTest">
-    <a itemprop="data" href="0062.html">input</a> |
-    <a itemprop="query" href="0062.ttl">query</a>
-  </span>
-  <meta itemprop="result" content="true"/>
+    <a itemprop="data" href="0062.html">input</a>
+  </span> |
+  <a itemprop="result" href="0062.ttl">result</a>
+  <meta itemprop="positiveTest" content="true"/>
   )
 </div>
 <!-- End Test Description -->
@@ -1401,10 +1402,10 @@
   <span itemprop="action"
         itemscope="true"
         itemtype="http://www.w3.org/2001/sw/DataAccess/tests/test-query#QueryTest">
-    <a itemprop="data" href="0063.html">input</a> |
-    <a itemprop="query" href="0063.ttl">query</a>
-  </span>
-  <meta itemprop="result" content="true"/>
+    <a itemprop="data" href="0063.html">input</a>
+  </span> |
+  <a itemprop="result" href="0063.ttl">result</a>
+  <meta itemprop="positiveTest" content="true"/>
   )
 </div>
 <!-- End Test Description -->
@@ -1421,10 +1422,10 @@
   <span itemprop="action"
         itemscope="true"
         itemtype="http://www.w3.org/2001/sw/DataAccess/tests/test-query#QueryTest">
-    <a itemprop="data" href="0064.html">input</a> |
-    <a itemprop="query" href="0064.ttl">query</a>
-  </span>
-  <meta itemprop="result" content="true"/>
+    <a itemprop="data" href="0064.html">input</a>
+  </span> |
+  <a itemprop="result" href="0064.ttl">result</a>
+  <meta itemprop="positiveTest" content="true"/>
   )
 </div>
 <!-- End Test Description -->
@@ -1441,10 +1442,10 @@
   <span itemprop="action"
         itemscope="true"
         itemtype="http://www.w3.org/2001/sw/DataAccess/tests/test-query#QueryTest">
-    <a itemprop="data" href="0065.html">input</a> |
-    <a itemprop="query" href="0065.ttl">query</a>
-  </span>
-  <meta itemprop="result" content="true"/>
+    <a itemprop="data" href="0065.html">input</a>
+  </span> |
+  <a itemprop="result" href="0065.ttl">result</a>
+  <meta itemprop="positiveTest" content="true"/>
   )
 </div>
 <!-- End Test Description -->
@@ -1461,10 +1462,10 @@
   <span itemprop="action"
         itemscope="true"
         itemtype="http://www.w3.org/2001/sw/DataAccess/tests/test-query#QueryTest">
-    <a itemprop="data" href="0066.html">input</a> |
-    <a itemprop="query" href="0066.ttl">query</a>
-  </span>
-  <meta itemprop="result" content="true"/>
+    <a itemprop="data" href="0066.html">input</a>
+  </span> |
+  <a itemprop="result" href="0066.ttl">result</a>
+  <meta itemprop="positiveTest" content="true"/>
   )
 </div>
 <!-- End Test Description -->
@@ -1481,10 +1482,10 @@
   <span itemprop="action"
         itemscope="true"
         itemtype="http://www.w3.org/2001/sw/DataAccess/tests/test-query#QueryTest">
-    <a itemprop="data" href="0067.html">input</a> |
-    <a itemprop="query" href="0067.ttl">query</a>
-  </span>
-  <meta itemprop="result" content="true"/>
+    <a itemprop="data" href="0067.html">input</a>
+  </span> |
+  <a itemprop="result" href="0067.ttl">result</a>
+  <meta itemprop="positiveTest" content="true"/>
   )
 </div>
 <!-- End Test Description -->
@@ -1501,10 +1502,10 @@
   <span itemprop="action"
         itemscope="true"
         itemtype="http://www.w3.org/2001/sw/DataAccess/tests/test-query#QueryTest">
-    <a itemprop="data" href="0068.html">input</a> |
-    <a itemprop="query" href="0068.ttl">query</a>
-  </span>
-  <meta itemprop="result" content="true"/>
+    <a itemprop="data" href="0068.html">input</a>
+  </span> |
+  <a itemprop="result" href="0068.ttl">result</a>
+  <meta itemprop="positiveTest" content="true"/>
   )
 </div>
 <!-- End Test Description -->
@@ -1521,10 +1522,10 @@
   <span itemprop="action"
         itemscope="true"
         itemtype="http://www.w3.org/2001/sw/DataAccess/tests/test-query#QueryTest">
-    <a itemprop="data" href="0069.html">input</a> |
-    <a itemprop="query" href="0069.ttl">query</a>
-  </span>
-  <meta itemprop="result" content="true"/>
+    <a itemprop="data" href="0069.html">input</a>
+  </span> |
+  <a itemprop="result" href="0069.ttl">result</a>
+  <meta itemprop="positiveTest" content="true"/>
   )
 </div>
 <!-- End Test Description -->
@@ -1541,10 +1542,10 @@
   <span itemprop="action"
         itemscope="true"
         itemtype="http://www.w3.org/2001/sw/DataAccess/tests/test-query#QueryTest">
-    <a itemprop="data" href="0070.html">input</a> |
-    <a itemprop="query" href="0070.ttl">query</a>
-  </span>
-  <meta itemprop="result" content="true"/>
+    <a itemprop="data" href="0070.html">input</a>
+  </span> |
+  <a itemprop="result" href="0070.ttl">result</a>
+  <meta itemprop="positiveTest" content="true"/>
   )
 </div>
 <!-- End Test Description -->
@@ -1561,10 +1562,10 @@
   <span itemprop="action"
         itemscope="true"
         itemtype="http://www.w3.org/2001/sw/DataAccess/tests/test-query#QueryTest">
-    <a itemprop="data" href="0071.html">input</a> |
-    <a itemprop="query" href="0071.ttl">query</a>
-  </span>
-  <meta itemprop="result" content="true"/>
+    <a itemprop="data" href="0071.html">input</a>
+  </span> |
+  <a itemprop="result" href="0071.ttl">result</a>
+  <meta itemprop="positiveTest" content="true"/>
   )
 </div>
 <!-- End Test Description -->
@@ -1581,10 +1582,10 @@
   <span itemprop="action"
         itemscope="true"
         itemtype="http://www.w3.org/2001/sw/DataAccess/tests/test-query#QueryTest">
-    <a itemprop="data" href="0072.html">input</a> |
-    <a itemprop="query" href="0072.ttl">query</a>
-  </span>
-  <meta itemprop="result" content="true"/>
+    <a itemprop="data" href="0072.html">input</a>
+  </span> |
+  <a itemprop="result" href="0072.ttl">result</a>
+  <meta itemprop="positiveTest" content="true"/>
   )
 </div>
 <!-- End Test Description -->
--- a/microdata-rdf/tests/manifest-frame.jsonld	Tue Sep 11 20:12:29 2012 -0700
+++ b/microdata-rdf/tests/manifest-frame.jsonld	Tue Sep 11 20:50:08 2012 -0700
@@ -10,9 +10,9 @@
     "name": "mf:name",
     "action": "mf:action",
     "data": {"@id": "mq:data", "@type": "@id"},
-    "query": {"@id": "mq:query", "@type": "@id"},
+    "result": {"@id": "mf:result", "@type": "@id"},
     "registry": {"@id": "mf:registry", "@type": "@id"},
-    "result": "mf:result"
+    "positiveTest": "mf:positiveTest"
   },
   "@type": "mf:Manifest",
   "entries": {
--- a/microdata-rdf/tests/manifest.jsonld	Tue Sep 11 20:12:29 2012 -0700
+++ b/microdata-rdf/tests/manifest.jsonld	Tue Sep 11 20:50:08 2012 -0700
@@ -15,112 +15,125 @@
       "@id": "mq:data",
       "@type": "@id"
     },
-    "query": {
-      "@id": "mq:query",
+    "result": {
+      "@id": "mf:result",
       "@type": "@id"
     },
     "registry": {
       "@id": "mf:registry",
       "@type": "@id"
     },
-    "result": "mf:result"
+    "positiveTest": "mf:positiveTest"
   },
   "@graph": [
     {
-      "@id": "_:ae5",
+      "@id": "_:ae2",
       "@type": "mf:Manifest",
       "comment": "Positive processor tests",
       "entries": [
         {
-          "@id": "_:u4",
+          "@id": "_:w1",
           "@type": "mf:ManifestEntry",
           "action": {
-            "@id": "_:u5",
+            "@id": "_:w2",
             "@type": "mq:QueryTest",
-            "data": "http://www.w3.org/TR/microdata-rdf/tests/0001.html",
-            "query": "http://www.w3.org/TR/microdata-rdf/tests/0001.ttl"
+            "data": "http://www.w3.org/TR/microdata-rdf/tests/0001.html"
           },
           "comment": "Item with no itemtype and literal itemprop",
           "name": "Test 0001",
-          "result": "true"
+          "positiveTest": "true",
+          "result": "http://www.w3.org/TR/microdata-rdf/tests/0001.ttl"
         },
         {
-          "@id": "_:v7",
+          "@id": "_:x8",
           "@type": "mf:ManifestEntry",
           "action": {
-            "@id": "_:v8",
+            "@id": "_:x9",
             "@type": "mq:QueryTest",
-            "data": "http://www.w3.org/TR/microdata-rdf/tests/0002.html",
-            "query": "http://www.w3.org/TR/microdata-rdf/tests/0002.ttl"
+            "data": "http://www.w3.org/TR/microdata-rdf/tests/0002.html"
           },
           "comment": "Item with no itemtype and 2 elements with equivalent itemprop",
           "name": "Test 0002",
-          "result": "true"
+          "positiveTest": "true",
+          "result": "http://www.w3.org/TR/microdata-rdf/tests/0002.ttl"
         },
         {
-          "@id": "_:w7",
+          "@id": "_:y5",
           "@type": "mf:ManifestEntry",
           "action": {
-            "@id": "_:w8",
+            "@id": "_:y6",
             "@type": "mq:QueryTest",
-            "data": "http://www.w3.org/TR/microdata-rdf/tests/0003.html",
-            "query": "http://www.w3.org/TR/microdata-rdf/tests/0003.ttl"
+            "data": "http://www.w3.org/TR/microdata-rdf/tests/0003.html"
           },
           "comment": "Item with itemprop having two properties",
           "name": "Test 0003",
-          "result": "true"
+          "positiveTest": "true",
+          "result": "http://www.w3.org/TR/microdata-rdf/tests/0003.ttl"
         },
         {
-          "@id": "_:x6",
+          "@id": "_:z5",
           "@type": "mf:ManifestEntry",
           "action": {
-            "@id": "_:x7",
+            "@id": "_:z6",
             "@type": "mq:QueryTest",
-            "data": "http://www.w3.org/TR/microdata-rdf/tests/0004.html",
-            "query": "http://www.w3.org/TR/microdata-rdf/tests/0004.ttl"
+            "data": "http://www.w3.org/TR/microdata-rdf/tests/0004.html"
           },
           "comment": "Use of meta and @content",
           "name": "Test 0004",
-          "result": "true"
+          "positiveTest": "true",
+          "result": "http://www.w3.org/TR/microdata-rdf/tests/0004.ttl"
         },
         {
-          "@id": "_:y8",
+          "@id": "_:aa6",
           "@type": "mf:ManifestEntry",
           "action": {
-            "@id": "_:y9",
+            "@id": "_:aa7",
             "@type": "mq:QueryTest",
-            "data": "http://www.w3.org/TR/microdata-rdf/tests/0005.html",
-            "query": "http://www.w3.org/TR/microdata-rdf/tests/0005.ttl"
+            "data": "http://www.w3.org/TR/microdata-rdf/tests/0005.html"
           },
           "comment": "Use of audio and @src",
           "name": "Test 0005",
-          "result": "true"
+          "positiveTest": "true",
+          "result": "http://www.w3.org/TR/microdata-rdf/tests/0005.ttl"
         },
         {
-          "@id": "_:z8",
+          "@id": "_:ab6",
           "@type": "mf:ManifestEntry",
           "action": {
-            "@id": "_:z9",
+            "@id": "_:ab7",
             "@type": "mq:QueryTest",
-            "data": "http://www.w3.org/TR/microdata-rdf/tests/0006.html",
-            "query": "http://www.w3.org/TR/microdata-rdf/tests/0006.ttl"
+            "data": "http://www.w3.org/TR/microdata-rdf/tests/0006.html"
           },
           "comment": "Use of embed and @src",
           "name": "Test 0006",
-          "result": "true"
+          "positiveTest": "true",
+          "result": "http://www.w3.org/TR/microdata-rdf/tests/0006.ttl"
         },
         {
-          "@id": "_:aa5",
+          "@id": "_:ac4",
           "@type": "mf:ManifestEntry",
           "action": {
-            "@id": "_:aa6",
+            "@id": "_:ac5",
             "@type": "mq:QueryTest",
-            "data": "http://www.w3.org/TR/microdata-rdf/tests/0007.html",
-            "query": "http://www.w3.org/TR/microdata-rdf/tests/0007.ttl"
+            "data": "http://www.w3.org/TR/microdata-rdf/tests/0007.html"
           },
           "comment": "Use of iframe and @src",
           "name": "Test 0007",
-          "result": "true"
+          "positiveTest": "true",
+          "result": "http://www.w3.org/TR/microdata-rdf/tests/0007.ttl"
+        },
+        {
+          "@id": "_:ad9",
+          "@type": "mf:ManifestEntry",
+          "action": {
+            "@id": "_:ae0",
+            "@type": "mq:QueryTest",
+            "data": "http://www.w3.org/TR/microdata-rdf/tests/0008.html"
+          },
+          "comment": "Use of img and @src",
+          "name": "Test 0008",
+          "positiveTest": "true",
+          "result": "http://www.w3.org/TR/microdata-rdf/tests/0008.ttl"
         },
         {
           "@id": "_:ad4",
@@ -128,562 +141,770 @@
           "action": {
             "@id": "_:ad5",
             "@type": "mq:QueryTest",
-            "data": "http://www.w3.org/TR/microdata-rdf/tests/0008.html",
-            "query": "http://www.w3.org/TR/microdata-rdf/tests/0008.ttl"
-          },
-          "comment": "Use of img and @src",
-          "name": "Test 0008",
-          "result": "true"
-        },
-        {
-          "@id": "_:ad7",
-          "@type": "mf:ManifestEntry",
-          "action": {
-            "@id": "_:ad8",
-            "@type": "mq:QueryTest",
-            "data": "http://www.w3.org/TR/microdata-rdf/tests/0009.html",
-            "query": "http://www.w3.org/TR/microdata-rdf/tests/0009.ttl"
+            "data": "http://www.w3.org/TR/microdata-rdf/tests/0009.html"
           },
           "comment": "Use of source and @src",
           "name": "Test 0009",
-          "result": "true"
+          "positiveTest": "true",
+          "result": "http://www.w3.org/TR/microdata-rdf/tests/0009.ttl"
+        },
+        {
+          "@id": "_:ae3",
+          "@type": "mf:ManifestEntry",
+          "action": {
+            "@id": "_:ag5",
+            "@type": "mq:QueryTest",
+            "data": "http://www.w3.org/TR/microdata-rdf/tests/0010.html"
+          },
+          "comment": "Use of track and @src",
+          "name": "Test 0010",
+          "positiveTest": "true",
+          "result": "http://www.w3.org/TR/microdata-rdf/tests/0010.ttl"
+        },
+        {
+          "@id": "_:ae4",
+          "@type": "mf:ManifestEntry",
+          "action": {
+            "@id": "_:ag9",
+            "@type": "mq:QueryTest",
+            "data": "http://www.w3.org/TR/microdata-rdf/tests/0011.html"
+          },
+          "comment": "Use of video and @src",
+          "name": "Test 0011",
+          "positiveTest": "true",
+          "result": "http://www.w3.org/TR/microdata-rdf/tests/0011.ttl"
+        },
+        {
+          "@id": "_:ae5",
+          "@type": "mf:ManifestEntry",
+          "action": {
+            "@id": "_:ah2",
+            "@type": "mq:QueryTest",
+            "data": "http://www.w3.org/TR/microdata-rdf/tests/0012.html"
+          },
+          "comment": "Use of a and @href",
+          "name": "Test 0012",
+          "positiveTest": "true",
+          "result": "http://www.w3.org/TR/microdata-rdf/tests/0012.ttl"
         },
         {
           "@id": "_:ae6",
           "@type": "mf:ManifestEntry",
           "action": {
-            "@id": "_:ag5",
+            "@id": "_:ah1",
             "@type": "mq:QueryTest",
-            "data": "http://www.w3.org/TR/microdata-rdf/tests/0010.html",
-            "query": "http://www.w3.org/TR/microdata-rdf/tests/0010.ttl"
+            "data": "http://www.w3.org/TR/microdata-rdf/tests/0013.html"
           },
-          "comment": "Use of track and @src",
-          "name": "Test 0010",
-          "result": "true"
+          "comment": "Use of area and @href",
+          "name": "Test 0013",
+          "positiveTest": "true",
+          "result": "http://www.w3.org/TR/microdata-rdf/tests/0013.ttl"
         },
         {
           "@id": "_:ae7",
           "@type": "mf:ManifestEntry",
           "action": {
-            "@id": "_:ag9",
+            "@id": "_:ag6",
             "@type": "mq:QueryTest",
-            "data": "http://www.w3.org/TR/microdata-rdf/tests/0011.html",
-            "query": "http://www.w3.org/TR/microdata-rdf/tests/0011.ttl"
+            "data": "http://www.w3.org/TR/microdata-rdf/tests/0014.html"
           },
-          "comment": "Use of video and @src",
-          "name": "Test 0011",
-          "result": "true"
+          "comment": "Use of link and @href",
+          "name": "Test 0014",
+          "positiveTest": "true",
+          "result": "http://www.w3.org/TR/microdata-rdf/tests/0014.ttl"
         },
         {
           "@id": "_:ae8",
           "@type": "mf:ManifestEntry",
           "action": {
-            "@id": "_:ah3",
+            "@id": "_:ad7",
             "@type": "mq:QueryTest",
-            "data": "http://www.w3.org/TR/microdata-rdf/tests/0012.html",
-            "query": "http://www.w3.org/TR/microdata-rdf/tests/0012.ttl"
+            "data": "http://www.w3.org/TR/microdata-rdf/tests/0015.html"
           },
-          "comment": "Use of a and @href",
-          "name": "Test 0012",
-          "result": "true"
+          "comment": "Use of object and @data",
+          "name": "Test 0015",
+          "positiveTest": "true",
+          "result": "http://www.w3.org/TR/microdata-rdf/tests/0015.ttl"
         },
         {
           "@id": "_:ae9",
           "@type": "mf:ManifestEntry",
           "action": {
-            "@id": "_:ah1",
+            "@id": "_:ag2",
             "@type": "mq:QueryTest",
-            "data": "http://www.w3.org/TR/microdata-rdf/tests/0013.html",
-            "query": "http://www.w3.org/TR/microdata-rdf/tests/0013.ttl"
+            "data": "http://www.w3.org/TR/microdata-rdf/tests/sdo_eg_md_1.html"
           },
-          "comment": "Use of area and @href",
-          "name": "Test 0013",
-          "result": "true"
+          "comment": "Web Schemas TF: Schema.org tests: test 1 (format md)",
+          "name": "Test 0016",
+          "positiveTest": "true",
+          "registry": "http://www.w3.org/ns/md",
+          "result": "http://www.w3.org/TR/microdata-rdf/tests/sdo_eg_md_1.ttl"
+        },
+        {
+          "@id": "_:ac9",
+          "@type": "mf:ManifestEntry",
+          "action": {
+            "@id": "_:ac3",
+            "@type": "mq:QueryTest",
+            "data": "http://www.w3.org/TR/microdata-rdf/tests/sdo_eg_md_2.html"
+          },
+          "comment": "Web Schemas TF: Schema.org tests: test 2 (format md)",
+          "name": "Test 0017",
+          "positiveTest": "true",
+          "registry": "http://www.w3.org/ns/md",
+          "result": "http://www.w3.org/TR/microdata-rdf/tests/sdo_eg_md_2.ttl"
+        },
+        {
+          "@id": "_:ab5",
+          "@type": "mf:ManifestEntry",
+          "action": {
+            "@id": "_:ab0",
+            "@type": "mq:QueryTest",
+            "data": "http://www.w3.org/TR/microdata-rdf/tests/sdo_eg_md_3.html"
+          },
+          "comment": "Web Schemas TF: Schema.org tests: test 3 (format md)",
+          "name": "Test 0018",
+          "positiveTest": "true",
+          "registry": "http://www.w3.org/ns/md",
+          "result": "http://www.w3.org/TR/microdata-rdf/tests/sdo_eg_md_3.ttl"
+        },
+        {
+          "@id": "_:aa5",
+          "@type": "mf:ManifestEntry",
+          "action": {
+            "@id": "_:z9",
+            "@type": "mq:QueryTest",
+            "data": "http://www.w3.org/TR/microdata-rdf/tests/sdo_eg_md_4.html"
+          },
+          "comment": "Web Schemas TF: Schema.org tests: test 4 (format md)",
+          "name": "Test 0019",
+          "positiveTest": "true",
+          "registry": "http://www.w3.org/ns/md",
+          "result": "http://www.w3.org/TR/microdata-rdf/tests/sdo_eg_md_4.ttl"
+        },
+        {
+          "@id": "_:z3",
+          "@type": "mf:ManifestEntry",
+          "action": {
+            "@id": "_:y8",
+            "@type": "mq:QueryTest",
+            "data": "http://www.w3.org/TR/microdata-rdf/tests/sdo_eg_md_5.html"
+          },
+          "comment": "Web Schemas TF: Schema.org tests: test 5 (format md)",
+          "name": "Test 0020",
+          "positiveTest": "true",
+          "registry": "http://www.w3.org/ns/md",
+          "result": "http://www.w3.org/TR/microdata-rdf/tests/sdo_eg_md_5.ttl"
+        },
+        {
+          "@id": "_:y1",
+          "@type": "mf:ManifestEntry",
+          "action": {
+            "@id": "_:x7",
+            "@type": "mq:QueryTest",
+            "data": "http://www.w3.org/TR/microdata-rdf/tests/sdo_eg_md_6.html"
+          },
+          "comment": "Web Schemas TF: Schema.org tests: test 6 (format md)",
+          "name": "Test 0021",
+          "positiveTest": "true",
+          "registry": "http://www.w3.org/ns/md",
+          "result": "http://www.w3.org/TR/microdata-rdf/tests/sdo_eg_md_6.ttl"
+        },
+        {
+          "@id": "_:w5",
+          "@type": "mf:ManifestEntry",
+          "action": {
+            "@id": "_:w0",
+            "@type": "mq:QueryTest",
+            "data": "http://www.w3.org/TR/microdata-rdf/tests/sdo_eg_md_7.html"
+          },
+          "comment": "Web Schemas TF: Schema.org tests: test 7 (format md)",
+          "name": "Test 0022",
+          "positiveTest": "true",
+          "registry": "http://www.w3.org/ns/md",
+          "result": "http://www.w3.org/TR/microdata-rdf/tests/sdo_eg_md_7.ttl"
+        },
+        {
+          "@id": "_:x0",
+          "@type": "mf:ManifestEntry",
+          "action": {
+            "@id": "_:v5",
+            "@type": "mq:QueryTest",
+            "data": "http://www.w3.org/TR/microdata-rdf/tests/sdo_eg_md_8.html"
+          },
+          "comment": "Web Schemas TF: Schema.org tests: test 8 (format md)",
+          "name": "Test 0023",
+          "positiveTest": "true",
+          "registry": "http://www.w3.org/ns/md",
+          "result": "http://www.w3.org/TR/microdata-rdf/tests/sdo_eg_md_8.ttl"
+        },
+        {
+          "@id": "_:v0",
+          "@type": "mf:ManifestEntry",
+          "action": {
+            "@id": "_:u8",
+            "@type": "mq:QueryTest",
+            "data": "http://www.w3.org/TR/microdata-rdf/tests/sdo_eg_md_9.html"
+          },
+          "comment": "Web Schemas TF: Schema.org tests: test 9 (format md)",
+          "name": "Test 0024",
+          "positiveTest": "true",
+          "registry": "http://www.w3.org/ns/md",
+          "result": "http://www.w3.org/TR/microdata-rdf/tests/sdo_eg_md_9.ttl"
+        },
+        {
+          "@id": "_:t8",
+          "@type": "mf:ManifestEntry",
+          "action": {
+            "@id": "_:t5",
+            "@type": "mq:QueryTest",
+            "data": "http://www.w3.org/TR/microdata-rdf/tests/sdo_eg_md_10.html"
+          },
+          "comment": "Web Schemas TF: Schema.org tests: test 10 (format md)",
+          "name": "Test 0025",
+          "positiveTest": "true",
+          "registry": "http://www.w3.org/ns/md",
+          "result": "http://www.w3.org/TR/microdata-rdf/tests/sdo_eg_md_10.ttl"
+        },
+        {
+          "@id": "_:u2",
+          "@type": "mf:ManifestEntry",
+          "action": {
+            "@id": "_:t9",
+            "@type": "mq:QueryTest",
+            "data": "http://www.w3.org/TR/microdata-rdf/tests/sdo_eg_md_11.html"
+          },
+          "comment": "Web Schemas TF: Schema.org tests: test 11 (format md)",
+          "name": "Test 0026",
+          "positiveTest": "true",
+          "registry": "http://www.w3.org/ns/md",
+          "result": "http://www.w3.org/TR/microdata-rdf/tests/sdo_eg_md_11.ttl"
         },
         {
           "@id": "_:af0",
           "@type": "mf:ManifestEntry",
           "action": {
-            "@id": "_:ag7",
+            "@id": "_:ah4",
             "@type": "mq:QueryTest",
-            "data": "http://www.w3.org/TR/microdata-rdf/tests/0014.html",
-            "query": "http://www.w3.org/TR/microdata-rdf/tests/0014.ttl"
+            "data": "http://www.w3.org/TR/microdata-rdf/tests/sdo_eg_md_12.html"
           },
-          "comment": "Use of link and @href",
-          "name": "Test 0014",
-          "result": "true"
+          "comment": "Web Schemas TF: Schema.org tests: test 12 (format md)",
+          "name": "Test 0027",
+          "positiveTest": "true",
+          "registry": "http://www.w3.org/ns/md",
+          "result": "http://www.w3.org/TR/microdata-rdf/tests/sdo_eg_md_12.ttl"
         },
         {
           "@id": "_:af1",
           "@type": "mf:ManifestEntry",
           "action": {
-            "@id": "_:ag2",
+            "@id": "_:ag8",
             "@type": "mq:QueryTest",
-            "data": "http://www.w3.org/TR/microdata-rdf/tests/0015.html",
-            "query": "http://www.w3.org/TR/microdata-rdf/tests/0015.ttl"
+            "data": "http://www.w3.org/TR/microdata-rdf/tests/sdo_eg_md_13.html"
           },
-          "comment": "Use of object and @data",
-          "name": "Test 0015",
-          "result": "true"
+          "comment": "Web Schemas TF: Schema.org tests: test 13 (format md)",
+          "name": "Test 0028",
+          "positiveTest": "true",
+          "registry": "http://www.w3.org/ns/md",
+          "result": "http://www.w3.org/TR/microdata-rdf/tests/sdo_eg_md_13.ttl"
         },
         {
           "@id": "_:af2",
           "@type": "mf:ManifestEntry",
           "action": {
-            "@id": "_:ae0",
-            "@type": "mq:QueryTest",
-            "data": "http://www.w3.org/TR/microdata-rdf/tests/sdo_eg_md_1.html",
-            "query": "http://www.w3.org/TR/microdata-rdf/tests/sdo_eg_md_1.ttl"
-          },
-          "comment": "Web Schemas TF: Schema.org tests: test 1 (format md)",
-          "name": "Test 0016",
-          "registry": "http://www.w3.org/ns/md",
-          "result": "true"
-        },
-        {
-          "@id": "_:ab0",
-          "@type": "mf:ManifestEntry",
-          "action": {
-            "@id": "_:aa4",
-            "@type": "mq:QueryTest",
-            "data": "http://www.w3.org/TR/microdata-rdf/tests/sdo_eg_md_2.html",
-            "query": "http://www.w3.org/TR/microdata-rdf/tests/sdo_eg_md_2.ttl"
-          },
-          "comment": "Web Schemas TF: Schema.org tests: test 2 (format md)",
-          "name": "Test 0017",
-          "registry": "http://www.w3.org/ns/md",
-          "result": "true"
-        },
-        {
-          "@id": "_:z7",
-          "@type": "mf:ManifestEntry",
-          "action": {
-            "@id": "_:z2",
-            "@type": "mq:QueryTest",
-            "data": "http://www.w3.org/TR/microdata-rdf/tests/sdo_eg_md_3.html",
-            "query": "http://www.w3.org/TR/microdata-rdf/tests/sdo_eg_md_3.ttl"
-          },
-          "comment": "Web Schemas TF: Schema.org tests: test 3 (format md)",
-          "name": "Test 0018",
-          "registry": "http://www.w3.org/ns/md",
-          "result": "true"
-        },
-        {
-          "@id": "_:y4",
-          "@type": "mf:ManifestEntry",
-          "action": {
-            "@id": "_:y1",
-            "@type": "mq:QueryTest",
-            "data": "http://www.w3.org/TR/microdata-rdf/tests/sdo_eg_md_4.html",
-            "query": "http://www.w3.org/TR/microdata-rdf/tests/sdo_eg_md_4.ttl"
-          },
-          "comment": "Web Schemas TF: Schema.org tests: test 4 (format md)",
-          "name": "Test 0019",
-          "registry": "http://www.w3.org/ns/md",
-          "result": "true"
-        },
-        {
-          "@id": "_:x2",
-          "@type": "mf:ManifestEntry",
-          "action": {
-            "@id": "_:w9",
-            "@type": "mq:QueryTest",
-            "data": "http://www.w3.org/TR/microdata-rdf/tests/sdo_eg_md_5.html",
-            "query": "http://www.w3.org/TR/microdata-rdf/tests/sdo_eg_md_5.ttl"
-          },
-          "comment": "Web Schemas TF: Schema.org tests: test 5 (format md)",
-          "name": "Test 0020",
-          "registry": "http://www.w3.org/ns/md",
-          "result": "true"
-        },
-        {
-          "@id": "_:w0",
-          "@type": "mf:ManifestEntry",
-          "action": {
-            "@id": "_:v6",
+            "@id": "_:ad8",
             "@type": "mq:QueryTest",
-            "data": "http://www.w3.org/TR/microdata-rdf/tests/sdo_eg_md_6.html",
-            "query": "http://www.w3.org/TR/microdata-rdf/tests/sdo_eg_md_6.ttl"
+            "data": "http://www.w3.org/TR/microdata-rdf/tests/sdo_eg_md_14.html"
           },
-          "comment": "Web Schemas TF: Schema.org tests: test 6 (format md)",
-          "name": "Test 0021",
-          "registry": "http://www.w3.org/ns/md",
-          "result": "true"
-        },
-        {
-          "@id": "_:u8",
-          "@type": "mf:ManifestEntry",
-          "action": {
-            "@id": "_:u3",
-            "@type": "mq:QueryTest",
-            "data": "http://www.w3.org/TR/microdata-rdf/tests/sdo_eg_md_7.html",
-            "query": "http://www.w3.org/TR/microdata-rdf/tests/sdo_eg_md_7.ttl"
-          },
-          "comment": "Web Schemas TF: Schema.org tests: test 7 (format md)",
-          "name": "Test 0022",
-          "registry": "http://www.w3.org/ns/md",
-          "result": "true"
-        },
-        {
-          "@id": "_:t9",
-          "@type": "mf:ManifestEntry",
-          "action": {
-            "@id": "_:t6",
-            "@type": "mq:QueryTest",
-            "data": "http://www.w3.org/TR/microdata-rdf/tests/sdo_eg_md_8.html",
-            "query": "http://www.w3.org/TR/microdata-rdf/tests/sdo_eg_md_8.ttl"
-          },
-          "comment": "Web Schemas TF: Schema.org tests: test 8 (format md)",
-          "name": "Test 0023",
+          "comment": "Web Schemas TF: Schema.org tests: test 14 (format md)",
+          "name": "Test 0029",
+          "positiveTest": "true",
           "registry": "http://www.w3.org/ns/md",
-          "result": "true"
-        },
-        {
-          "@id": "_:ad1",
-          "@type": "mf:ManifestEntry",
-          "action": {
-            "@id": "_:ac9",
-            "@type": "mq:QueryTest",
-            "data": "http://www.w3.org/TR/microdata-rdf/tests/sdo_eg_md_9.html",
-            "query": "http://www.w3.org/TR/microdata-rdf/tests/sdo_eg_md_9.ttl"
-          },
-          "comment": "Web Schemas TF: Schema.org tests: test 9 (format md)",
-          "name": "Test 0024",
-          "registry": "http://www.w3.org/ns/md",
-          "result": "true"
-        },
-        {
-          "@id": "_:ac3",
-          "@type": "mf:ManifestEntry",
-          "action": {
-            "@id": "_:ac0",
-            "@type": "mq:QueryTest",
-            "data": "http://www.w3.org/TR/microdata-rdf/tests/sdo_eg_md_10.html",
-            "query": "http://www.w3.org/TR/microdata-rdf/tests/sdo_eg_md_10.ttl"
-          },
-          "comment": "Web Schemas TF: Schema.org tests: test 10 (format md)",
-          "name": "Test 0025",
-          "registry": "http://www.w3.org/ns/md",
-          "result": "true"
-        },
-        {
-          "@id": "_:ab7",
-          "@type": "mf:ManifestEntry",
-          "action": {
-            "@id": "_:ab2",
-            "@type": "mq:QueryTest",
-            "data": "http://www.w3.org/TR/microdata-rdf/tests/sdo_eg_md_11.html",
-            "query": "http://www.w3.org/TR/microdata-rdf/tests/sdo_eg_md_11.ttl"
-          },
-          "comment": "Web Schemas TF: Schema.org tests: test 11 (format md)",
-          "name": "Test 0026",
-          "registry": "http://www.w3.org/ns/md",
-          "result": "true"
+          "result": "http://www.w3.org/TR/microdata-rdf/tests/sdo_eg_md_14.ttl"
         },
         {
           "@id": "_:af3",
           "@type": "mf:ManifestEntry",
           "action": {
-            "@id": "_:ah4",
+            "@id": "_:ae1",
             "@type": "mq:QueryTest",
-            "data": "http://www.w3.org/TR/microdata-rdf/tests/sdo_eg_md_12.html",
-            "query": "http://www.w3.org/TR/microdata-rdf/tests/sdo_eg_md_12.ttl"
+            "data": "http://www.w3.org/TR/microdata-rdf/tests/sdo_eg_md_15.html"
           },
-          "comment": "Web Schemas TF: Schema.org tests: test 12 (format md)",
-          "name": "Test 0027",
+          "comment": "Web Schemas TF: Schema.org tests: test 15 (format md)",
+          "name": "Test 0030",
+          "positiveTest": "true",
           "registry": "http://www.w3.org/ns/md",
-          "result": "true"
+          "result": "http://www.w3.org/TR/microdata-rdf/tests/sdo_eg_md_15.ttl"
+        },
+        {
+          "@id": "_:ac8",
+          "@type": "mf:ManifestEntry",
+          "action": {
+            "@id": "_:ac2",
+            "@type": "mq:QueryTest",
+            "data": "http://www.w3.org/TR/microdata-rdf/tests/sdo_eg_md_16.html"
+          },
+          "comment": "Web Schemas TF: Schema.org tests: test 16 (format md)",
+          "name": "Test 0031",
+          "positiveTest": "true",
+          "registry": "http://www.w3.org/ns/md",
+          "result": "http://www.w3.org/TR/microdata-rdf/tests/sdo_eg_md_16.ttl"
+        },
+        {
+          "@id": "_:ab3",
+          "@type": "mf:ManifestEntry",
+          "action": {
+            "@id": "_:aa9",
+            "@type": "mq:QueryTest",
+            "data": "http://www.w3.org/TR/microdata-rdf/tests/sdo_eg_md_17.html"
+          },
+          "comment": "Web Schemas TF: Schema.org tests: test 17 (format md)",
+          "name": "Test 0032",
+          "positiveTest": "true",
+          "registry": "http://www.w3.org/ns/md",
+          "result": "http://www.w3.org/TR/microdata-rdf/tests/sdo_eg_md_17.ttl"
+        },
+        {
+          "@id": "_:aa3",
+          "@type": "mf:ManifestEntry",
+          "action": {
+            "@id": "_:z7",
+            "@type": "mq:QueryTest",
+            "data": "http://www.w3.org/TR/microdata-rdf/tests/sdo_eg_md_18.html"
+          },
+          "comment": "Web Schemas TF: Schema.org tests: test 18 (format md)",
+          "name": "Test 0033",
+          "positiveTest": "true",
+          "registry": "http://www.w3.org/ns/md",
+          "result": "http://www.w3.org/TR/microdata-rdf/tests/sdo_eg_md_18.ttl"
+        },
+        {
+          "@id": "_:y9",
+          "@type": "mf:ManifestEntry",
+          "action": {
+            "@id": "_:y3",
+            "@type": "mq:QueryTest",
+            "data": "http://www.w3.org/TR/microdata-rdf/tests/sdo_eg_md_19.html"
+          },
+          "comment": "Web Schemas TF: Schema.org tests: test 19 (format md)",
+          "name": "Test 0034",
+          "positiveTest": "true",
+          "registry": "http://www.w3.org/ns/md",
+          "result": "http://www.w3.org/TR/microdata-rdf/tests/sdo_eg_md_19.ttl"
+        },
+        {
+          "@id": "_:x6",
+          "@type": "mf:ManifestEntry",
+          "action": {
+            "@id": "_:w8",
+            "@type": "mq:QueryTest",
+            "data": "http://www.w3.org/TR/microdata-rdf/tests/sdo_eg_md_20.html"
+          },
+          "comment": "Web Schemas TF: Schema.org tests: test 20 (format md)",
+          "name": "Test 0035",
+          "positiveTest": "true",
+          "registry": "http://www.w3.org/ns/md",
+          "result": "http://www.w3.org/TR/microdata-rdf/tests/sdo_eg_md_20.ttl"
+        },
+        {
+          "@id": "_:v8",
+          "@type": "mf:ManifestEntry",
+          "action": {
+            "@id": "_:v9",
+            "@type": "mq:QueryTest",
+            "data": "http://www.w3.org/TR/microdata-rdf/tests/sdo_eg_md_21.html"
+          },
+          "comment": "Web Schemas TF: Schema.org tests: test 21 (format md)",
+          "name": "Test 0036",
+          "positiveTest": "true",
+          "registry": "http://www.w3.org/ns/md",
+          "result": "http://www.w3.org/TR/microdata-rdf/tests/sdo_eg_md_21.ttl"
+        },
+        {
+          "@id": "_:v4",
+          "@type": "mf:ManifestEntry",
+          "action": {
+            "@id": "_:v2",
+            "@type": "mq:QueryTest",
+            "data": "http://www.w3.org/TR/microdata-rdf/tests/sdo_eg_md_22.html"
+          },
+          "comment": "Web Schemas TF: Schema.org tests: test 22 (format md)",
+          "name": "Test 0037",
+          "positiveTest": "true",
+          "registry": "http://www.w3.org/ns/md",
+          "result": "http://www.w3.org/TR/microdata-rdf/tests/sdo_eg_md_22.ttl"
+        },
+        {
+          "@id": "_:u5",
+          "@type": "mf:ManifestEntry",
+          "action": {
+            "@id": "_:u4",
+            "@type": "mq:QueryTest",
+            "data": "http://www.w3.org/TR/microdata-rdf/tests/sdo_eg_md_23.html"
+          },
+          "comment": "Web Schemas TF: Schema.org tests: test 23 (format md)",
+          "name": "Test 0038",
+          "positiveTest": "true",
+          "registry": "http://www.w3.org/ns/md",
+          "result": "http://www.w3.org/TR/microdata-rdf/tests/sdo_eg_md_23.ttl"
+        },
+        {
+          "@id": "_:t1",
+          "@type": "mf:ManifestEntry",
+          "action": {
+            "@id": "_:t2",
+            "@type": "mq:QueryTest",
+            "data": "http://www.w3.org/TR/microdata-rdf/tests/sdo_eg_md_24.html"
+          },
+          "comment": "Web Schemas TF: Schema.org tests: test 24 (format md)",
+          "name": "Test 0039",
+          "positiveTest": "true",
+          "registry": "http://www.w3.org/ns/md",
+          "result": "http://www.w3.org/TR/microdata-rdf/tests/sdo_eg_md_24.ttl"
+        },
+        {
+          "@id": "_:ad2",
+          "@type": "mf:ManifestEntry",
+          "action": {
+            "@id": "_:t0",
+            "@type": "mq:QueryTest",
+            "data": "http://www.w3.org/TR/microdata-rdf/tests/sdo_eg_md_25.html"
+          },
+          "comment": "Web Schemas TF: Schema.org tests: test 25 (format md)",
+          "name": "Test 0040",
+          "positiveTest": "true",
+          "registry": "http://www.w3.org/ns/md",
+          "result": "http://www.w3.org/TR/microdata-rdf/tests/sdo_eg_md_25.ttl"
         },
         {
           "@id": "_:af4",
           "@type": "mf:ManifestEntry",
           "action": {
-            "@id": "_:ag8",
+            "@id": "_:ah0",
             "@type": "mq:QueryTest",
-            "data": "http://www.w3.org/TR/microdata-rdf/tests/sdo_eg_md_13.html",
-            "query": "http://www.w3.org/TR/microdata-rdf/tests/sdo_eg_md_13.ttl"
+            "data": "http://www.w3.org/TR/microdata-rdf/tests/sdo_eg_md_26.html"
           },
-          "comment": "Web Schemas TF: Schema.org tests: test 13 (format md)",
-          "name": "Test 0028",
+          "comment": "Web Schemas TF: Schema.org tests: test 26 (format md)",
+          "name": "Test 0041",
+          "positiveTest": "true",
           "registry": "http://www.w3.org/ns/md",
-          "result": "true"
+          "result": "http://www.w3.org/TR/microdata-rdf/tests/sdo_eg_md_26.ttl"
         },
         {
           "@id": "_:af5",
           "@type": "mf:ManifestEntry",
           "action": {
+            "@id": "_:ag4",
+            "@type": "mq:QueryTest",
+            "data": "http://www.w3.org/TR/microdata-rdf/tests/sdo_eg_md_27.html"
+          },
+          "comment": "Web Schemas TF: Schema.org tests: test 27 (format md)",
+          "name": "Test 0042",
+          "positiveTest": "true",
+          "registry": "http://www.w3.org/ns/md",
+          "result": "http://www.w3.org/TR/microdata-rdf/tests/sdo_eg_md_27.ttl"
+        },
+        {
+          "@id": "_:af6",
+          "@type": "mf:ManifestEntry",
+          "action": {
             "@id": "_:ag3",
             "@type": "mq:QueryTest",
-            "data": "http://www.w3.org/TR/microdata-rdf/tests/sdo_eg_md_14.html",
-            "query": "http://www.w3.org/TR/microdata-rdf/tests/sdo_eg_md_14.ttl"
+            "data": "http://www.w3.org/TR/microdata-rdf/tests/sdo_eg_md_28.html"
           },
-          "comment": "Web Schemas TF: Schema.org tests: test 14 (format md)",
-          "name": "Test 0029",
+          "comment": "Web Schemas TF: Schema.org tests: test 28 (format md)",
+          "name": "Test 0043",
+          "positiveTest": "true",
           "registry": "http://www.w3.org/ns/md",
-          "result": "true"
+          "result": "http://www.w3.org/TR/microdata-rdf/tests/sdo_eg_md_28.ttl"
         },
         {
-          "@id": "_:ae4",
+          "@id": "_:ad0",
+          "@type": "mf:ManifestEntry",
+          "action": {
+            "@id": "_:ac6",
+            "@type": "mq:QueryTest",
+            "data": "http://www.w3.org/TR/microdata-rdf/tests/sdo_eg_md_29.html"
+          },
+          "comment": "Web Schemas TF: Schema.org tests: test 29 (format md)",
+          "name": "Test 0044",
+          "positiveTest": "true",
+          "registry": "http://www.w3.org/ns/md",
+          "result": "http://www.w3.org/TR/microdata-rdf/tests/sdo_eg_md_29.ttl"
+        },
+        {
+          "@id": "_:ab8",
+          "@type": "mf:ManifestEntry",
+          "action": {
+            "@id": "_:ab1",
+            "@type": "mq:QueryTest",
+            "data": "http://www.w3.org/TR/microdata-rdf/tests/sdo_eg_md_30.html"
+          },
+          "comment": "Web Schemas TF: Schema.org tests: test 30 (format md)",
+          "name": "Test 0045",
+          "positiveTest": "true",
+          "registry": "http://www.w3.org/ns/md",
+          "result": "http://www.w3.org/TR/microdata-rdf/tests/sdo_eg_md_30.ttl"
+        },
+        {
+          "@id": "_:aa4",
+          "@type": "mf:ManifestEntry",
+          "action": {
+            "@id": "_:z8",
+            "@type": "mq:QueryTest",
+            "data": "http://www.w3.org/TR/microdata-rdf/tests/0046.html"
+          },
+          "comment": "Use of time with @datetime xsd:time",
+          "name": "Test 0046",
+          "positiveTest": "true",
+          "result": "http://www.w3.org/TR/microdata-rdf/tests/0046.ttl"
+        },
+        {
+          "@id": "_:z2",
+          "@type": "mf:ManifestEntry",
+          "action": {
+            "@id": "_:y4",
+            "@type": "mq:QueryTest",
+            "data": "http://www.w3.org/TR/microdata-rdf/tests/0047.html"
+          },
+          "comment": "Use of time with @datetime xsd:dateTime",
+          "name": "Test 0047",
+          "positiveTest": "true",
+          "result": "http://www.w3.org/TR/microdata-rdf/tests/0047.ttl"
+        },
+        {
+          "@id": "_:y0",
+          "@type": "mf:ManifestEntry",
+          "action": {
+            "@id": "_:x2",
+            "@type": "mq:QueryTest",
+            "data": "http://www.w3.org/TR/microdata-rdf/tests/0048.html"
+          },
+          "comment": "Use of time with @datetime xsd:duration",
+          "name": "Test 0048",
+          "positiveTest": "true",
+          "result": "http://www.w3.org/TR/microdata-rdf/tests/0048.ttl"
+        },
+        {
+          "@id": "_:w3",
+          "@type": "mf:ManifestEntry",
+          "action": {
+            "@id": "_:w4",
+            "@type": "mq:QueryTest",
+            "data": "http://www.w3.org/TR/microdata-rdf/tests/0049.html"
+          },
+          "comment": "Use of time with @datetime invalid",
+          "name": "Test 0049",
+          "positiveTest": "true",
+          "result": "http://www.w3.org/TR/microdata-rdf/tests/0049.ttl"
+        },
+        {
+          "@id": "_:w9",
+          "@type": "mf:ManifestEntry",
+          "action": {
+            "@id": "_:v3",
+            "@type": "mq:QueryTest",
+            "data": "http://www.w3.org/TR/microdata-rdf/tests/0050.html"
+          },
+          "comment": "relative URL as object",
+          "name": "Test 0050",
+          "positiveTest": "true",
+          "result": "http://www.w3.org/TR/microdata-rdf/tests/0050.ttl"
+        },
+        {
+          "@id": "_:v1",
+          "@type": "mf:ManifestEntry",
+          "action": {
+            "@id": "_:u9",
+            "@type": "mq:QueryTest",
+            "data": "http://www.w3.org/TR/microdata-rdf/tests/0051.html"
+          },
+          "comment": "relative URL as itemid",
+          "name": "Test 0051",
+          "positiveTest": "true",
+          "result": "http://www.w3.org/TR/microdata-rdf/tests/0051.ttl"
+        },
+        {
+          "@id": "_:u3",
+          "@type": "mf:ManifestEntry",
+          "action": {
+            "@id": "_:t6",
+            "@type": "mq:QueryTest",
+            "data": "http://www.w3.org/TR/microdata-rdf/tests/0052.html"
+          },
+          "comment": "token property no @itemtype",
+          "name": "Test 0052",
+          "positiveTest": "true",
+          "result": "http://www.w3.org/TR/microdata-rdf/tests/0052.ttl"
+        },
+        {
+          "@id": "_:u1",
+          "@type": "mf:ManifestEntry",
+          "action": {
+            "@id": "_:t7",
+            "@type": "mq:QueryTest",
+            "data": "http://www.w3.org/TR/microdata-rdf/tests/0053.html"
+          },
+          "comment": "token property empty @itemtype",
+          "name": "Test 0053",
+          "positiveTest": "true",
+          "result": "http://www.w3.org/TR/microdata-rdf/tests/0053.ttl"
+        },
+        {
+          "@id": "_:af7",
+          "@type": "mf:ManifestEntry",
+          "action": {
+            "@id": "_:ah3",
+            "@type": "mq:QueryTest",
+            "data": "http://www.w3.org/TR/microdata-rdf/tests/0054.html"
+          },
+          "comment": "token property and relative @itemtype",
+          "name": "Test 0054",
+          "positiveTest": "true",
+          "result": "http://www.w3.org/TR/microdata-rdf/tests/0054.ttl"
+        },
+        {
+          "@id": "_:af8",
+          "@type": "mf:ManifestEntry",
+          "action": {
+            "@id": "_:ag7",
+            "@type": "mq:QueryTest",
+            "data": "http://www.w3.org/TR/microdata-rdf/tests/0055.html"
+          },
+          "comment": "token property and single @itemtype",
+          "name": "Test 0055",
+          "positiveTest": "true",
+          "result": "http://www.w3.org/TR/microdata-rdf/tests/0055.ttl"
+        },
+        {
+          "@id": "_:af9",
           "@type": "mf:ManifestEntry",
           "action": {
             "@id": "_:ad6",
             "@type": "mq:QueryTest",
-            "data": "http://www.w3.org/TR/microdata-rdf/tests/sdo_eg_md_15.html",
-            "query": "http://www.w3.org/TR/microdata-rdf/tests/sdo_eg_md_15.ttl"
-          },
-          "comment": "Web Schemas TF: Schema.org tests: test 15 (format md)",
-          "name": "Test 0030",
-          "registry": "http://www.w3.org/ns/md",
-          "result": "true"
-        },
-        {
-          "@id": "_:aa9",
-          "@type": "mf:ManifestEntry",
-          "action": {
-            "@id": "_:aa3",
-            "@type": "mq:QueryTest",
-            "data": "http://www.w3.org/TR/microdata-rdf/tests/sdo_eg_md_16.html",
-            "query": "http://www.w3.org/TR/microdata-rdf/tests/sdo_eg_md_16.ttl"
+            "data": "http://www.w3.org/TR/microdata-rdf/tests/0056.html"
           },
-          "comment": "Web Schemas TF: Schema.org tests: test 16 (format md)",
-          "name": "Test 0031",
-          "registry": "http://www.w3.org/ns/md",
-          "result": "true"
-        },
-        {
-          "@id": "_:z4",
-          "@type": "mf:ManifestEntry",
-          "action": {
-            "@id": "_:z0",
-            "@type": "mq:QueryTest",
-            "data": "http://www.w3.org/TR/microdata-rdf/tests/sdo_eg_md_17.html",
-            "query": "http://www.w3.org/TR/microdata-rdf/tests/sdo_eg_md_17.ttl"
-          },
-          "comment": "Web Schemas TF: Schema.org tests: test 17 (format md)",
-          "name": "Test 0032",
-          "registry": "http://www.w3.org/ns/md",
-          "result": "true"
-        },
-        {
-          "@id": "_:y2",
-          "@type": "mf:ManifestEntry",
-          "action": {
-            "@id": "_:x8",
-            "@type": "mq:QueryTest",
-            "data": "http://www.w3.org/TR/microdata-rdf/tests/sdo_eg_md_18.html",
-            "query": "http://www.w3.org/TR/microdata-rdf/tests/sdo_eg_md_18.ttl"
-          },
-          "comment": "Web Schemas TF: Schema.org tests: test 18 (format md)",
-          "name": "Test 0033",
-          "registry": "http://www.w3.org/ns/md",
-          "result": "true"
+          "comment": "token property and multiple @itemtypes from different vocabularies",
+          "name": "Test 0056",
+          "positiveTest": "true",
+          "result": "http://www.w3.org/TR/microdata-rdf/tests/0056.ttl"
         },
         {
-          "@id": "_:x0",
-          "@type": "mf:ManifestEntry",
-          "action": {
-            "@id": "_:w4",
-            "@type": "mq:QueryTest",
-            "data": "http://www.w3.org/TR/microdata-rdf/tests/sdo_eg_md_19.html",
-            "query": "http://www.w3.org/TR/microdata-rdf/tests/sdo_eg_md_19.ttl"
-          },
-          "comment": "Web Schemas TF: Schema.org tests: test 19 (format md)",
-          "name": "Test 0034",
-          "registry": "http://www.w3.org/ns/md",
-          "result": "true"
-        },
-        {
-          "@id": "_:v5",
+          "@id": "_:ag0",
           "@type": "mf:ManifestEntry",
           "action": {
-            "@id": "_:v1",
-            "@type": "mq:QueryTest",
-            "data": "http://www.w3.org/TR/microdata-rdf/tests/sdo_eg_md_20.html",
-            "query": "http://www.w3.org/TR/microdata-rdf/tests/sdo_eg_md_20.ttl"
-          },
-          "comment": "Web Schemas TF: Schema.org tests: test 20 (format md)",
-          "name": "Test 0035",
-          "registry": "http://www.w3.org/ns/md",
-          "result": "true"
-        },
-        {
-          "@id": "_:v2",
-          "@type": "mf:ManifestEntry",
-          "action": {
-            "@id": "_:u2",
+            "@id": "_:ad1",
             "@type": "mq:QueryTest",
-            "data": "http://www.w3.org/TR/microdata-rdf/tests/sdo_eg_md_21.html",
-            "query": "http://www.w3.org/TR/microdata-rdf/tests/sdo_eg_md_21.ttl"
+            "data": "http://www.w3.org/TR/microdata-rdf/tests/0057.html"
           },
-          "comment": "Web Schemas TF: Schema.org tests: test 21 (format md)",
-          "name": "Test 0036",
-          "registry": "http://www.w3.org/ns/md",
-          "result": "true"
-        },
-        {
-          "@id": "_:t4",
-          "@type": "mf:ManifestEntry",
-          "action": {
-            "@id": "_:t5",
-            "@type": "mq:QueryTest",
-            "data": "http://www.w3.org/TR/microdata-rdf/tests/sdo_eg_md_22.html",
-            "query": "http://www.w3.org/TR/microdata-rdf/tests/sdo_eg_md_22.ttl"
-          },
-          "comment": "Web Schemas TF: Schema.org tests: test 22 (format md)",
-          "name": "Test 0037",
-          "registry": "http://www.w3.org/ns/md",
-          "result": "true"
+          "comment": "URI property no @itemtype",
+          "name": "Test 0057",
+          "positiveTest": "true",
+          "result": "http://www.w3.org/TR/microdata-rdf/tests/0057.ttl"
         },
         {
           "@id": "_:ac7",
           "@type": "mf:ManifestEntry",
           "action": {
-            "@id": "_:ac6",
+            "@id": "_:ac1",
             "@type": "mq:QueryTest",
-            "data": "http://www.w3.org/TR/microdata-rdf/tests/sdo_eg_md_23.html",
-            "query": "http://www.w3.org/TR/microdata-rdf/tests/sdo_eg_md_23.ttl"
+            "data": "http://www.w3.org/TR/microdata-rdf/tests/0058.html"
           },
-          "comment": "Web Schemas TF: Schema.org tests: test 23 (format md)",
-          "name": "Test 0038",
-          "registry": "http://www.w3.org/ns/md",
-          "result": "true"
-        },
-        {
-          "@id": "_:ac1",
-          "@type": "mf:ManifestEntry",
-          "action": {
-            "@id": "_:ab8",
-            "@type": "mq:QueryTest",
-            "data": "http://www.w3.org/TR/microdata-rdf/tests/sdo_eg_md_24.html",
-            "query": "http://www.w3.org/TR/microdata-rdf/tests/sdo_eg_md_24.ttl"
-          },
-          "comment": "Web Schemas TF: Schema.org tests: test 24 (format md)",
-          "name": "Test 0039",
-          "registry": "http://www.w3.org/ns/md",
-          "result": "true"
+          "comment": "URI property empty @itemtype",
+          "name": "Test 0058",
+          "positiveTest": "true",
+          "result": "http://www.w3.org/TR/microdata-rdf/tests/0058.ttl"
         },
         {
-          "@id": "_:ab3",
-          "@type": "mf:ManifestEntry",
-          "action": {
-            "@id": "_:t1",
-            "@type": "mq:QueryTest",
-            "data": "http://www.w3.org/TR/microdata-rdf/tests/sdo_eg_md_25.html",
-            "query": "http://www.w3.org/TR/microdata-rdf/tests/sdo_eg_md_25.ttl"
-          },
-          "comment": "Web Schemas TF: Schema.org tests: test 25 (format md)",
-          "name": "Test 0040",
-          "registry": "http://www.w3.org/ns/md",
-          "result": "true"
-        },
-        {
-          "@id": "_:af6",
-          "@type": "mf:ManifestEntry",
-          "action": {
-            "@id": "_:ah0",
-            "@type": "mq:QueryTest",
-            "data": "http://www.w3.org/TR/microdata-rdf/tests/sdo_eg_md_26.html",
-            "query": "http://www.w3.org/TR/microdata-rdf/tests/sdo_eg_md_26.ttl"
-          },
-          "comment": "Web Schemas TF: Schema.org tests: test 26 (format md)",
-          "name": "Test 0041",
-          "registry": "http://www.w3.org/ns/md",
-          "result": "true"
-        },
-        {
-          "@id": "_:af7",
-          "@type": "mf:ManifestEntry",
-          "action": {
-            "@id": "_:ag4",
-            "@type": "mq:QueryTest",
-            "data": "http://www.w3.org/TR/microdata-rdf/tests/sdo_eg_md_27.html",
-            "query": "http://www.w3.org/TR/microdata-rdf/tests/sdo_eg_md_27.ttl"
-          },
-          "comment": "Web Schemas TF: Schema.org tests: test 27 (format md)",
-          "name": "Test 0042",
-          "registry": "http://www.w3.org/ns/md",
-          "result": "true"
-        },
-        {
-          "@id": "_:af8",
+          "@id": "_:ab2",
           "@type": "mf:ManifestEntry",
           "action": {
-            "@id": "_:ae3",
+            "@id": "_:aa8",
             "@type": "mq:QueryTest",
-            "data": "http://www.w3.org/TR/microdata-rdf/tests/sdo_eg_md_28.html",
-            "query": "http://www.w3.org/TR/microdata-rdf/tests/sdo_eg_md_28.ttl"
+            "data": "http://www.w3.org/TR/microdata-rdf/tests/0059.html"
           },
-          "comment": "Web Schemas TF: Schema.org tests: test 28 (format md)",
-          "name": "Test 0043",
-          "registry": "http://www.w3.org/ns/md",
-          "result": "true"
+          "comment": "URI property relative @itemtype",
+          "name": "Test 0059",
+          "positiveTest": "true",
+          "result": "http://www.w3.org/TR/microdata-rdf/tests/0059.ttl"
         },
         {
-          "@id": "_:ab1",
-          "@type": "mf:ManifestEntry",
-          "action": {
-            "@id": "_:aa7",
-            "@type": "mq:QueryTest",
-            "data": "http://www.w3.org/TR/microdata-rdf/tests/sdo_eg_md_29.html",
-            "query": "http://www.w3.org/TR/microdata-rdf/tests/sdo_eg_md_29.ttl"
-          },
-          "comment": "Web Schemas TF: Schema.org tests: test 29 (format md)",
-          "name": "Test 0044",
-          "registry": "http://www.w3.org/ns/md",
-          "result": "true"
-        },
-        {
-          "@id": "_:z6",
+          "@id": "_:aa0",
           "@type": "mf:ManifestEntry",
           "action": {
-            "@id": "_:z1",
+            "@id": "_:z4",
             "@type": "mq:QueryTest",
-            "data": "http://www.w3.org/TR/microdata-rdf/tests/sdo_eg_md_30.html",
-            "query": "http://www.w3.org/TR/microdata-rdf/tests/sdo_eg_md_30.ttl"
+            "data": "http://www.w3.org/TR/microdata-rdf/tests/0060.html"
           },
-          "comment": "Web Schemas TF: Schema.org tests: test 30 (format md)",
-          "name": "Test 0045",
-          "registry": "http://www.w3.org/ns/md",
-          "result": "true"
-        },
-        {
-          "@id": "_:y3",
-          "@type": "mf:ManifestEntry",
-          "action": {
-            "@id": "_:x9",
-            "@type": "mq:QueryTest",
-            "data": "http://www.w3.org/TR/microdata-rdf/tests/0046.html",
-            "query": "http://www.w3.org/TR/microdata-rdf/tests/0046.ttl"
-          },
-          "comment": "Use of time with @datetime xsd:time",
-          "name": "Test 0046",
-          "result": "true"
+          "comment": "URI property single @itemtype",
+          "name": "Test 0060",
+          "positiveTest": "true",
+          "result": "http://www.w3.org/TR/microdata-rdf/tests/0060.ttl"
         },
         {
-          "@id": "_:x1",
+          "@id": "_:y7",
           "@type": "mf:ManifestEntry",
           "action": {
-            "@id": "_:w5",
+            "@id": "_:y2",
             "@type": "mq:QueryTest",
-            "data": "http://www.w3.org/TR/microdata-rdf/tests/0047.html",
-            "query": "http://www.w3.org/TR/microdata-rdf/tests/0047.ttl"
+            "data": "http://www.w3.org/TR/microdata-rdf/tests/0061.html"
           },
-          "comment": "Use of time with @datetime xsd:dateTime",
-          "name": "Test 0047",
-          "result": "true"
+          "comment": "inherited type and token property",
+          "name": "Test 0061",
+          "positiveTest": "true",
+          "result": "http://www.w3.org/TR/microdata-rdf/tests/0061.ttl"
         },
         {
-          "@id": "_:v9",
+          "@id": "_:x5",
           "@type": "mf:ManifestEntry",
           "action": {
-            "@id": "_:v3",
+            "@id": "_:w7",
             "@type": "mq:QueryTest",
-            "data": "http://www.w3.org/TR/microdata-rdf/tests/0048.html",
-            "query": "http://www.w3.org/TR/microdata-rdf/tests/0048.ttl"
+            "data": "http://www.w3.org/TR/microdata-rdf/tests/0062.html"
           },
-          "comment": "Use of time with @datetime xsd:duration",
-          "name": "Test 0048",
-          "result": "true"
+          "comment": "@itemref to single id",
+          "name": "Test 0062",
+          "positiveTest": "true",
+          "result": "http://www.w3.org/TR/microdata-rdf/tests/0062.ttl"
+        },
+        {
+          "@id": "_:ag1",
+          "@type": "mf:ManifestEntry",
+          "action": {
+            "@id": "_:ab4",
+            "@type": "mq:QueryTest",
+            "data": "http://www.w3.org/TR/microdata-rdf/tests/0063.html"
+          },
+          "comment": "@itemref generates property values",
+          "name": "Test 0063",
+          "positiveTest": "true",
+          "result": "http://www.w3.org/TR/microdata-rdf/tests/0063.ttl"
+        },
+        {
+          "@id": "_:ad3",
+          "@type": "mf:ManifestEntry",
+          "action": {
+            "@id": "_:u0",
+            "@type": "mq:QueryTest",
+            "data": "http://www.w3.org/TR/microdata-rdf/tests/0064.html"
+          },
+          "comment": "@itemref to single id with different types",
+          "name": "Test 0064",
+          "positiveTest": "true",
+          "result": "http://www.w3.org/TR/microdata-rdf/tests/0064.ttl"
+        },
+        {
+          "@id": "_:t3",
+          "@type": "mf:ManifestEntry",
+          "action": {
+            "@id": "_:t4",
+            "@type": "mq:QueryTest",
+            "data": "http://www.w3.org/TR/microdata-rdf/tests/0065.html"
+          },
+          "comment": "@itemref to multiple ids",
+          "name": "Test 0065",
+          "positiveTest": "true",
+          "result": "http://www.w3.org/TR/microdata-rdf/tests/0065.ttl"
         },
         {
           "@id": "_:u6",
@@ -691,272 +912,38 @@
           "action": {
             "@id": "_:u7",
             "@type": "mq:QueryTest",
-            "data": "http://www.w3.org/TR/microdata-rdf/tests/0049.html",
-            "query": "http://www.w3.org/TR/microdata-rdf/tests/0049.ttl"
-          },
-          "comment": "Use of time with @datetime invalid",
-          "name": "Test 0049",
-          "result": "true"
-        },
-        {
-          "@id": "_:t8",
-          "@type": "mf:ManifestEntry",
-          "action": {
-            "@id": "_:t3",
-            "@type": "mq:QueryTest",
-            "data": "http://www.w3.org/TR/microdata-rdf/tests/0050.html",
-            "query": "http://www.w3.org/TR/microdata-rdf/tests/0050.ttl"
-          },
-          "comment": "relative URL as object",
-          "name": "Test 0050",
-          "result": "true"
-        },
-        {
-          "@id": "_:ad0",
-          "@type": "mf:ManifestEntry",
-          "action": {
-            "@id": "_:ac8",
-            "@type": "mq:QueryTest",
-            "data": "http://www.w3.org/TR/microdata-rdf/tests/0051.html",
-            "query": "http://www.w3.org/TR/microdata-rdf/tests/0051.ttl"
-          },
-          "comment": "relative URL as itemid",
-          "name": "Test 0051",
-          "result": "true"
-        },
-        {
-          "@id": "_:ac2",
-          "@type": "mf:ManifestEntry",
-          "action": {
-            "@id": "_:ab9",
-            "@type": "mq:QueryTest",
-            "data": "http://www.w3.org/TR/microdata-rdf/tests/0052.html",
-            "query": "http://www.w3.org/TR/microdata-rdf/tests/0052.ttl"
-          },
-          "comment": "token property no @itemtype",
-          "name": "Test 0052",
-          "result": "true"
-        },
-        {
-          "@id": "_:ab6",
-          "@type": "mf:ManifestEntry",
-          "action": {
-            "@id": "_:t2",
-            "@type": "mq:QueryTest",
-            "data": "http://www.w3.org/TR/microdata-rdf/tests/0053.html",
-            "query": "http://www.w3.org/TR/microdata-rdf/tests/0053.ttl"
-          },
-          "comment": "token property empty @itemtype",
-          "name": "Test 0053",
-          "result": "true"
-        },
-        {
-          "@id": "_:af9",
-          "@type": "mf:ManifestEntry",
-          "action": {
-            "@id": "_:ah2",
-            "@type": "mq:QueryTest",
-            "data": "http://www.w3.org/TR/microdata-rdf/tests/0054.html",
-            "query": "http://www.w3.org/TR/microdata-rdf/tests/0054.ttl"
-          },
-          "comment": "token property and relative @itemtype",
-          "name": "Test 0054",
-          "result": "true"
-        },
-        {
-          "@id": "_:ag0",
-          "@type": "mf:ManifestEntry",
-          "action": {
-            "@id": "_:ag6",
-            "@type": "mq:QueryTest",
-            "data": "http://www.w3.org/TR/microdata-rdf/tests/0055.html",
-            "query": "http://www.w3.org/TR/microdata-rdf/tests/0055.ttl"
-          },
-          "comment": "token property and single @itemtype",
-          "name": "Test 0055",
-          "result": "true"
-        },
-        {
-          "@id": "_:ag1",
-          "@type": "mf:ManifestEntry",
-          "action": {
-            "@id": "_:ad9",
-            "@type": "mq:QueryTest",
-            "data": "http://www.w3.org/TR/microdata-rdf/tests/0056.html",
-            "query": "http://www.w3.org/TR/microdata-rdf/tests/0056.ttl"
-          },
-          "comment": "token property and multiple @itemtypes from different vocabularies",
-          "name": "Test 0056",
-          "result": "true"
-        },
-        {
-          "@id": "_:ae1",
-          "@type": "mf:ManifestEntry",
-          "action": {
-            "@id": "_:ae2",
-            "@type": "mq:QueryTest",
-            "data": "http://www.w3.org/TR/microdata-rdf/tests/0057.html",
-            "query": "http://www.w3.org/TR/microdata-rdf/tests/0057.ttl"
-          },
-          "comment": "URI property no @itemtype",
-          "name": "Test 0057",
-          "result": "true"
-        },
-        {
-          "@id": "_:aa8",
-          "@type": "mf:ManifestEntry",
-          "action": {
-            "@id": "_:aa0",
-            "@type": "mq:QueryTest",
-            "data": "http://www.w3.org/TR/microdata-rdf/tests/0058.html",
-            "query": "http://www.w3.org/TR/microdata-rdf/tests/0058.ttl"
-          },
-          "comment": "URI property empty @itemtype",
-          "name": "Test 0058",
-          "result": "true"
-        },
-        {
-          "@id": "_:z3",
-          "@type": "mf:ManifestEntry",
-          "action": {
-            "@id": "_:y7",
-            "@type": "mq:QueryTest",
-            "data": "http://www.w3.org/TR/microdata-rdf/tests/0059.html",
-            "query": "http://www.w3.org/TR/microdata-rdf/tests/0059.ttl"
-          },
-          "comment": "URI property relative @itemtype",
-          "name": "Test 0059",
-          "result": "true"
-        },
-        {
-          "@id": "_:y0",
-          "@type": "mf:ManifestEntry",
-          "action": {
-            "@id": "_:x5",
-            "@type": "mq:QueryTest",
-            "data": "http://www.w3.org/TR/microdata-rdf/tests/0060.html",
-            "query": "http://www.w3.org/TR/microdata-rdf/tests/0060.ttl"
-          },
-          "comment": "URI property single @itemtype",
-          "name": "Test 0060",
-          "result": "true"
-        },
-        {
-          "@id": "_:w6",
-          "@type": "mf:ManifestEntry",
-          "action": {
-            "@id": "_:w3",
-            "@type": "mq:QueryTest",
-            "data": "http://www.w3.org/TR/microdata-rdf/tests/0061.html",
-            "query": "http://www.w3.org/TR/microdata-rdf/tests/0061.ttl"
-          },
-          "comment": "inherited type and token property",
-          "name": "Test 0061",
-          "result": "true"
-        },
-        {
-          "@id": "_:v4",
-          "@type": "mf:ManifestEntry",
-          "action": {
-            "@id": "_:t7",
-            "@type": "mq:QueryTest",
-            "data": "http://www.w3.org/TR/microdata-rdf/tests/0062.html",
-            "query": "http://www.w3.org/TR/microdata-rdf/tests/0062.ttl"
-          },
-          "comment": "@itemref to single id",
-          "name": "Test 0062",
-          "result": "true"
-        },
-        {
-          "@id": "_:z5",
-          "@type": "mf:ManifestEntry",
-          "action": {
-            "@id": "_:t0",
-            "@type": "mq:QueryTest",
-            "data": "http://www.w3.org/TR/microdata-rdf/tests/0063.html",
-            "query": "http://www.w3.org/TR/microdata-rdf/tests/0063.ttl"
-          },
-          "comment": "@itemref generates property values",
-          "name": "Test 0063",
-          "result": "true"
-        },
-        {
-          "@id": "_:ab4",
-          "@type": "mf:ManifestEntry",
-          "action": {
-            "@id": "_:ab5",
-            "@type": "mq:QueryTest",
-            "data": "http://www.w3.org/TR/microdata-rdf/tests/0064.html",
-            "query": "http://www.w3.org/TR/microdata-rdf/tests/0064.ttl"
-          },
-          "comment": "@itemref to single id with different types",
-          "name": "Test 0064",
-          "result": "true"
-        },
-        {
-          "@id": "_:ac4",
-          "@type": "mf:ManifestEntry",
-          "action": {
-            "@id": "_:ac5",
-            "@type": "mq:QueryTest",
-            "data": "http://www.w3.org/TR/microdata-rdf/tests/0065.html",
-            "query": "http://www.w3.org/TR/microdata-rdf/tests/0065.ttl"
-          },
-          "comment": "@itemref to multiple ids",
-          "name": "Test 0065",
-          "result": "true"
-        },
-        {
-          "@id": "_:ad2",
-          "@type": "mf:ManifestEntry",
-          "action": {
-            "@id": "_:ad3",
-            "@type": "mq:QueryTest",
-            "data": "http://www.w3.org/TR/microdata-rdf/tests/0066.html",
-            "query": "http://www.w3.org/TR/microdata-rdf/tests/0066.ttl"
+            "data": "http://www.w3.org/TR/microdata-rdf/tests/0066.html"
           },
           "comment": "@itemref with chaining",
           "name": "Test 0066",
-          "result": "true"
+          "positiveTest": "true",
+          "result": "http://www.w3.org/TR/microdata-rdf/tests/0066.ttl"
         },
         {
-          "@id": "_:u0",
+          "@id": "_:v6",
           "@type": "mf:ManifestEntry",
           "action": {
-            "@id": "_:u1",
+            "@id": "_:v7",
             "@type": "mq:QueryTest",
-            "data": "http://www.w3.org/TR/microdata-rdf/tests/0067.html",
-            "query": "http://www.w3.org/TR/microdata-rdf/tests/0067.ttl"
+            "data": "http://www.w3.org/TR/microdata-rdf/tests/0067.html"
           },
           "comment": "Shared @itemref",
           "name": "Test 0067",
-          "result": "true"
+          "positiveTest": "true",
+          "result": "http://www.w3.org/TR/microdata-rdf/tests/0067.ttl"
         },
         {
-          "@id": "_:u9",
+          "@id": "_:x1",
           "@type": "mf:ManifestEntry",
           "action": {
-            "@id": "_:v0",
+            "@id": "_:w6",
             "@type": "mq:QueryTest",
-            "data": "http://www.w3.org/TR/microdata-rdf/tests/0068.html",
-            "query": "http://www.w3.org/TR/microdata-rdf/tests/0068.ttl"
+            "data": "http://www.w3.org/TR/microdata-rdf/tests/0068.html"
           },
           "comment": "Property URI generation (default) 1",
           "name": "Test 0068",
-          "result": "true"
-        },
-        {
-          "@id": "_:w1",
-          "@type": "mf:ManifestEntry",
-          "action": {
-            "@id": "_:w2",
-            "@type": "mq:QueryTest",
-            "data": "http://www.w3.org/TR/microdata-rdf/tests/0069.html",
-            "query": "http://www.w3.org/TR/microdata-rdf/tests/0069.ttl"
-          },
-          "comment": "Property URI generation (default) 2",
-          "name": "Test 0069",
-          "result": "true"
+          "positiveTest": "true",
+          "result": "http://www.w3.org/TR/microdata-rdf/tests/0068.ttl"
         },
         {
           "@id": "_:x3",
@@ -964,25 +951,25 @@
           "action": {
             "@id": "_:x4",
             "@type": "mq:QueryTest",
-            "data": "http://www.w3.org/TR/microdata-rdf/tests/0070.html",
-            "query": "http://www.w3.org/TR/microdata-rdf/tests/0070.ttl"
+            "data": "http://www.w3.org/TR/microdata-rdf/tests/0069.html"
+          },
+          "comment": "Property URI generation (default) 2",
+          "name": "Test 0069",
+          "positiveTest": "true",
+          "result": "http://www.w3.org/TR/microdata-rdf/tests/0069.ttl"
+        },
+        {
+          "@id": "_:z0",
+          "@type": "mf:ManifestEntry",
+          "action": {
+            "@id": "_:z1",
+            "@type": "mq:QueryTest",
+            "data": "http://www.w3.org/TR/microdata-rdf/tests/0070.html"
           },
           "comment": "Property URI generation (default) 3",
           "name": "Test 0070",
-          "result": "true"
-        },
-        {
-          "@id": "_:y5",
-          "@type": "mf:ManifestEntry",
-          "action": {
-            "@id": "_:y6",
-            "@type": "mq:QueryTest",
-            "data": "http://www.w3.org/TR/microdata-rdf/tests/0071.html",
-            "query": "http://www.w3.org/TR/microdata-rdf/tests/0071.ttl"
-          },
-          "comment": "Property URI generation (contextual) 1",
-          "name": "Test 0071",
-          "result": "true"
+          "positiveTest": "true",
+          "result": "http://www.w3.org/TR/microdata-rdf/tests/0070.ttl"
         },
         {
           "@id": "_:aa1",
@@ -990,12 +977,25 @@
           "action": {
             "@id": "_:aa2",
             "@type": "mq:QueryTest",
-            "data": "http://www.w3.org/TR/microdata-rdf/tests/0072.html",
-            "query": "http://www.w3.org/TR/microdata-rdf/tests/0072.ttl"
+            "data": "http://www.w3.org/TR/microdata-rdf/tests/0071.html"
+          },
+          "comment": "Property URI generation (contextual) 1",
+          "name": "Test 0071",
+          "positiveTest": "true",
+          "result": "http://www.w3.org/TR/microdata-rdf/tests/0071.ttl"
+        },
+        {
+          "@id": "_:ab9",
+          "@type": "mf:ManifestEntry",
+          "action": {
+            "@id": "_:ac0",
+            "@type": "mq:QueryTest",
+            "data": "http://www.w3.org/TR/microdata-rdf/tests/0072.html"
           },
           "comment": "Property URI generation (contextual) 2",
           "name": "Test 0072",
-          "result": "true"
+          "positiveTest": "true",
+          "result": "http://www.w3.org/TR/microdata-rdf/tests/0072.ttl"
         }
       ]
     }
--- a/microdata-rdf/tests/manifest.ttl	Tue Sep 11 20:12:29 2012 -0700
+++ b/microdata-rdf/tests/manifest.ttl	Tue Sep 11 20:50:08 2012 -0700
@@ -8,463 +8,463 @@
        mf:entries ([ a mf:ManifestEntry;
            rdfs:comment "Item with no itemtype and literal itemprop";
            mf:action [ a mq:QueryTest;
-             mq:data <0001.html>;
-             mq:query <0001.ttl>];
+             mq:data <0001.html>];
            mf:name "Test 0001";
-           mf:result "true"] [ a mf:ManifestEntry;
+           mf:positiveTest "true";
+           mf:result <0001.ttl>] [ a mf:ManifestEntry;
            rdfs:comment "Item with no itemtype and 2 elements with equivalent itemprop";
            mf:action [ a mq:QueryTest;
-             mq:data <0002.html>;
-             mq:query <0002.ttl>];
+             mq:data <0002.html>];
            mf:name "Test 0002";
-           mf:result "true"] [ a mf:ManifestEntry;
+           mf:positiveTest "true";
+           mf:result <0002.ttl>] [ a mf:ManifestEntry;
            rdfs:comment "Item with itemprop having two properties";
            mf:action [ a mq:QueryTest;
-             mq:data <0003.html>;
-             mq:query <0003.ttl>];
+             mq:data <0003.html>];
            mf:name "Test 0003";
-           mf:result "true"] [ a mf:ManifestEntry;
+           mf:positiveTest "true";
+           mf:result <0003.ttl>] [ a mf:ManifestEntry;
            rdfs:comment "Use of meta and @content";
            mf:action [ a mq:QueryTest;
-             mq:data <0004.html>;
-             mq:query <0004.ttl>];
+             mq:data <0004.html>];
            mf:name "Test 0004";
-           mf:result "true"] [ a mf:ManifestEntry;
+           mf:positiveTest "true";
+           mf:result <0004.ttl>] [ a mf:ManifestEntry;
            rdfs:comment "Use of audio and @src";
            mf:action [ a mq:QueryTest;
-             mq:data <0005.html>;
-             mq:query <0005.ttl>];
+             mq:data <0005.html>];
            mf:name "Test 0005";
-           mf:result "true"] [ a mf:ManifestEntry;
+           mf:positiveTest "true";
+           mf:result <0005.ttl>] [ a mf:ManifestEntry;
            rdfs:comment "Use of embed and @src";
            mf:action [ a mq:QueryTest;
-             mq:data <0006.html>;
-             mq:query <0006.ttl>];
+             mq:data <0006.html>];
            mf:name "Test 0006";
-           mf:result "true"] [ a mf:ManifestEntry;
+           mf:positiveTest "true";
+           mf:result <0006.ttl>] [ a mf:ManifestEntry;
            rdfs:comment "Use of iframe and @src";
            mf:action [ a mq:QueryTest;
-             mq:data <0007.html>;
-             mq:query <0007.ttl>];
+             mq:data <0007.html>];
            mf:name "Test 0007";
-           mf:result "true"] [ a mf:ManifestEntry;
+           mf:positiveTest "true";
+           mf:result <0007.ttl>] [ a mf:ManifestEntry;
            rdfs:comment "Use of img and @src";
            mf:action [ a mq:QueryTest;
-             mq:data <0008.html>;
-             mq:query <0008.ttl>];
+             mq:data <0008.html>];
            mf:name "Test 0008";
-           mf:result "true"] [ a mf:ManifestEntry;
+           mf:positiveTest "true";
+           mf:result <0008.ttl>] [ a mf:ManifestEntry;
            rdfs:comment "Use of source and @src";
            mf:action [ a mq:QueryTest;
-             mq:data <0009.html>;
-             mq:query <0009.ttl>];
+             mq:data <0009.html>];
            mf:name "Test 0009";
-           mf:result "true"] [ a mf:ManifestEntry;
+           mf:positiveTest "true";
+           mf:result <0009.ttl>] [ a mf:ManifestEntry;
            rdfs:comment "Use of track and @src";
            mf:action [ a mq:QueryTest;
-             mq:data <0010.html>;
-             mq:query <0010.ttl>];
+             mq:data <0010.html>];
            mf:name "Test 0010";
-           mf:result "true"] [ a mf:ManifestEntry;
+           mf:positiveTest "true";
+           mf:result <0010.ttl>] [ a mf:ManifestEntry;
            rdfs:comment "Use of video and @src";
            mf:action [ a mq:QueryTest;
-             mq:data <0011.html>;
-             mq:query <0011.ttl>];
+             mq:data <0011.html>];
            mf:name "Test 0011";
-           mf:result "true"] [ a mf:ManifestEntry;
+           mf:positiveTest "true";
+           mf:result <0011.ttl>] [ a mf:ManifestEntry;
            rdfs:comment "Use of a and @href";
            mf:action [ a mq:QueryTest;
-             mq:data <0012.html>;
-             mq:query <0012.ttl>];
+             mq:data <0012.html>];
            mf:name "Test 0012";
-           mf:result "true"] [ a mf:ManifestEntry;
+           mf:positiveTest "true";
+           mf:result <0012.ttl>] [ a mf:ManifestEntry;
            rdfs:comment "Use of area and @href";
            mf:action [ a mq:QueryTest;
-             mq:data <0013.html>;
-             mq:query <0013.ttl>];
+             mq:data <0013.html>];
            mf:name "Test 0013";
-           mf:result "true"] [ a mf:ManifestEntry;
+           mf:positiveTest "true";
+           mf:result <0013.ttl>] [ a mf:ManifestEntry;
            rdfs:comment "Use of link and @href";
            mf:action [ a mq:QueryTest;
-             mq:data <0014.html>;
-             mq:query <0014.ttl>];
+             mq:data <0014.html>];
            mf:name "Test 0014";
-           mf:result "true"] [ a mf:ManifestEntry;
+           mf:positiveTest "true";
+           mf:result <0014.ttl>] [ a mf:ManifestEntry;
            rdfs:comment "Use of object and @data";
            mf:action [ a mq:QueryTest;
-             mq:data <0015.html>;
-             mq:query <0015.ttl>];
+             mq:data <0015.html>];
            mf:name "Test 0015";
-           mf:result "true"] [ a mf:ManifestEntry;
+           mf:positiveTest "true";
+           mf:result <0015.ttl>] [ a mf:ManifestEntry;
            rdfs:comment "Web Schemas TF: Schema.org tests: test 1 (format md)";
            mf:action [ a mq:QueryTest;
-             mq:data <sdo_eg_md_1.html>;
-             mq:query <sdo_eg_md_1.ttl>];
+             mq:data <sdo_eg_md_1.html>];
            mf:name "Test 0016";
+           mf:positiveTest "true";
            mf:registry <http://www.w3.org/ns/md>;
-           mf:result "true"] [ a mf:ManifestEntry;
+           mf:result <sdo_eg_md_1.ttl>] [ a mf:ManifestEntry;
            rdfs:comment "Web Schemas TF: Schema.org tests: test 2 (format md)";
            mf:action [ a mq:QueryTest;
-             mq:data <sdo_eg_md_2.html>;
-             mq:query <sdo_eg_md_2.ttl>];
+             mq:data <sdo_eg_md_2.html>];
            mf:name "Test 0017";
+           mf:positiveTest "true";
            mf:registry <http://www.w3.org/ns/md>;
-           mf:result "true"] [ a mf:ManifestEntry;
+           mf:result <sdo_eg_md_2.ttl>] [ a mf:ManifestEntry;
            rdfs:comment "Web Schemas TF: Schema.org tests: test 3 (format md)";
            mf:action [ a mq:QueryTest;
-             mq:data <sdo_eg_md_3.html>;
-             mq:query <sdo_eg_md_3.ttl>];
+             mq:data <sdo_eg_md_3.html>];
            mf:name "Test 0018";
+           mf:positiveTest "true";
            mf:registry <http://www.w3.org/ns/md>;
-           mf:result "true"] [ a mf:ManifestEntry;
+           mf:result <sdo_eg_md_3.ttl>] [ a mf:ManifestEntry;
            rdfs:comment "Web Schemas TF: Schema.org tests: test 4 (format md)";
            mf:action [ a mq:QueryTest;
-             mq:data <sdo_eg_md_4.html>;
-             mq:query <sdo_eg_md_4.ttl>];
+             mq:data <sdo_eg_md_4.html>];
            mf:name "Test 0019";
+           mf:positiveTest "true";
            mf:registry <http://www.w3.org/ns/md>;
-           mf:result "true"] [ a mf:ManifestEntry;
+           mf:result <sdo_eg_md_4.ttl>] [ a mf:ManifestEntry;
            rdfs:comment "Web Schemas TF: Schema.org tests: test 5 (format md)";
            mf:action [ a mq:QueryTest;
-             mq:data <sdo_eg_md_5.html>;
-             mq:query <sdo_eg_md_5.ttl>];
+             mq:data <sdo_eg_md_5.html>];
            mf:name "Test 0020";
+           mf:positiveTest "true";
            mf:registry <http://www.w3.org/ns/md>;
-           mf:result "true"] [ a mf:ManifestEntry;
+           mf:result <sdo_eg_md_5.ttl>] [ a mf:ManifestEntry;
            rdfs:comment "Web Schemas TF: Schema.org tests: test 6 (format md)";
            mf:action [ a mq:QueryTest;
-             mq:data <sdo_eg_md_6.html>;
-             mq:query <sdo_eg_md_6.ttl>];
+             mq:data <sdo_eg_md_6.html>];
            mf:name "Test 0021";
+           mf:positiveTest "true";
            mf:registry <http://www.w3.org/ns/md>;
-           mf:result "true"] [ a mf:ManifestEntry;
+           mf:result <sdo_eg_md_6.ttl>] [ a mf:ManifestEntry;
            rdfs:comment "Web Schemas TF: Schema.org tests: test 7 (format md)";
            mf:action [ a mq:QueryTest;
-             mq:data <sdo_eg_md_7.html>;
-             mq:query <sdo_eg_md_7.ttl>];
+             mq:data <sdo_eg_md_7.html>];
            mf:name "Test 0022";
+           mf:positiveTest "true";
            mf:registry <http://www.w3.org/ns/md>;
-           mf:result "true"] [ a mf:ManifestEntry;
+           mf:result <sdo_eg_md_7.ttl>] [ a mf:ManifestEntry;
            rdfs:comment "Web Schemas TF: Schema.org tests: test 8 (format md)";
            mf:action [ a mq:QueryTest;
-             mq:data <sdo_eg_md_8.html>;
-             mq:query <sdo_eg_md_8.ttl>];
+             mq:data <sdo_eg_md_8.html>];
            mf:name "Test 0023";
+           mf:positiveTest "true";
            mf:registry <http://www.w3.org/ns/md>;
-           mf:result "true"] [ a mf:ManifestEntry;
+           mf:result <sdo_eg_md_8.ttl>] [ a mf:ManifestEntry;
            rdfs:comment "Web Schemas TF: Schema.org tests: test 9 (format md)";
            mf:action [ a mq:QueryTest;
-             mq:data <sdo_eg_md_9.html>;
-             mq:query <sdo_eg_md_9.ttl>];
+             mq:data <sdo_eg_md_9.html>];
            mf:name "Test 0024";
+           mf:positiveTest "true";
            mf:registry <http://www.w3.org/ns/md>;
-           mf:result "true"] [ a mf:ManifestEntry;
+           mf:result <sdo_eg_md_9.ttl>] [ a mf:ManifestEntry;
            rdfs:comment "Web Schemas TF: Schema.org tests: test 10 (format md)";
            mf:action [ a mq:QueryTest;
-             mq:data <sdo_eg_md_10.html>;
-             mq:query <sdo_eg_md_10.ttl>];
+             mq:data <sdo_eg_md_10.html>];
            mf:name "Test 0025";
+           mf:positiveTest "true";
            mf:registry <http://www.w3.org/ns/md>;
-           mf:result "true"] [ a mf:ManifestEntry;
+           mf:result <sdo_eg_md_10.ttl>] [ a mf:ManifestEntry;
            rdfs:comment "Web Schemas TF: Schema.org tests: test 11 (format md)";
            mf:action [ a mq:QueryTest;
-             mq:data <sdo_eg_md_11.html>;
-             mq:query <sdo_eg_md_11.ttl>];
+             mq:data <sdo_eg_md_11.html>];
            mf:name "Test 0026";
+           mf:positiveTest "true";
            mf:registry <http://www.w3.org/ns/md>;
-           mf:result "true"] [ a mf:ManifestEntry;
+           mf:result <sdo_eg_md_11.ttl>] [ a mf:ManifestEntry;
            rdfs:comment "Web Schemas TF: Schema.org tests: test 12 (format md)";
            mf:action [ a mq:QueryTest;
-             mq:data <sdo_eg_md_12.html>;
-             mq:query <sdo_eg_md_12.ttl>];
+             mq:data <sdo_eg_md_12.html>];
            mf:name "Test 0027";
+           mf:positiveTest "true";
            mf:registry <http://www.w3.org/ns/md>;
-           mf:result "true"] [ a mf:ManifestEntry;
+           mf:result <sdo_eg_md_12.ttl>] [ a mf:ManifestEntry;
            rdfs:comment "Web Schemas TF: Schema.org tests: test 13 (format md)";
            mf:action [ a mq:QueryTest;
-             mq:data <sdo_eg_md_13.html>;
-             mq:query <sdo_eg_md_13.ttl>];
+             mq:data <sdo_eg_md_13.html>];
            mf:name "Test 0028";
+           mf:positiveTest "true";
            mf:registry <http://www.w3.org/ns/md>;
-           mf:result "true"] [ a mf:ManifestEntry;
+           mf:result <sdo_eg_md_13.ttl>] [ a mf:ManifestEntry;
            rdfs:comment "Web Schemas TF: Schema.org tests: test 14 (format md)";
            mf:action [ a mq:QueryTest;
-             mq:data <sdo_eg_md_14.html>;
-             mq:query <sdo_eg_md_14.ttl>];
+             mq:data <sdo_eg_md_14.html>];
            mf:name "Test 0029";
+           mf:positiveTest "true";
            mf:registry <http://www.w3.org/ns/md>;
-           mf:result "true"] [ a mf:ManifestEntry;
+           mf:result <sdo_eg_md_14.ttl>] [ a mf:ManifestEntry;
            rdfs:comment "Web Schemas TF: Schema.org tests: test 15 (format md)";
            mf:action [ a mq:QueryTest;
-             mq:data <sdo_eg_md_15.html>;
-             mq:query <sdo_eg_md_15.ttl>];
+             mq:data <sdo_eg_md_15.html>];
            mf:name "Test 0030";
+           mf:positiveTest "true";
            mf:registry <http://www.w3.org/ns/md>;
-           mf:result "true"] [ a mf:ManifestEntry;
+           mf:result <sdo_eg_md_15.ttl>] [ a mf:ManifestEntry;
            rdfs:comment "Web Schemas TF: Schema.org tests: test 16 (format md)";
            mf:action [ a mq:QueryTest;
-             mq:data <sdo_eg_md_16.html>;
-             mq:query <sdo_eg_md_16.ttl>];
+             mq:data <sdo_eg_md_16.html>];
            mf:name "Test 0031";
+           mf:positiveTest "true";
            mf:registry <http://www.w3.org/ns/md>;
-           mf:result "true"] [ a mf:ManifestEntry;
+           mf:result <sdo_eg_md_16.ttl>] [ a mf:ManifestEntry;
            rdfs:comment "Web Schemas TF: Schema.org tests: test 17 (format md)";
            mf:action [ a mq:QueryTest;
-             mq:data <sdo_eg_md_17.html>;
-             mq:query <sdo_eg_md_17.ttl>];
+             mq:data <sdo_eg_md_17.html>];
            mf:name "Test 0032";
+           mf:positiveTest "true";
            mf:registry <http://www.w3.org/ns/md>;
-           mf:result "true"] [ a mf:ManifestEntry;
+           mf:result <sdo_eg_md_17.ttl>] [ a mf:ManifestEntry;
            rdfs:comment "Web Schemas TF: Schema.org tests: test 18 (format md)";
            mf:action [ a mq:QueryTest;
-             mq:data <sdo_eg_md_18.html>;
-             mq:query <sdo_eg_md_18.ttl>];
+             mq:data <sdo_eg_md_18.html>];
            mf:name "Test 0033";
+           mf:positiveTest "true";
            mf:registry <http://www.w3.org/ns/md>;
-           mf:result "true"] [ a mf:ManifestEntry;
+           mf:result <sdo_eg_md_18.ttl>] [ a mf:ManifestEntry;
            rdfs:comment "Web Schemas TF: Schema.org tests: test 19 (format md)";
            mf:action [ a mq:QueryTest;
-             mq:data <sdo_eg_md_19.html>;
-             mq:query <sdo_eg_md_19.ttl>];
+             mq:data <sdo_eg_md_19.html>];
            mf:name "Test 0034";
+           mf:positiveTest "true";
            mf:registry <http://www.w3.org/ns/md>;
-           mf:result "true"] [ a mf:ManifestEntry;
+           mf:result <sdo_eg_md_19.ttl>] [ a mf:ManifestEntry;
            rdfs:comment "Web Schemas TF: Schema.org tests: test 20 (format md)";
            mf:action [ a mq:QueryTest;
-             mq:data <sdo_eg_md_20.html>;
-             mq:query <sdo_eg_md_20.ttl>];
+             mq:data <sdo_eg_md_20.html>];
            mf:name "Test 0035";
+           mf:positiveTest "true";
            mf:registry <http://www.w3.org/ns/md>;
-           mf:result "true"] [ a mf:ManifestEntry;
+           mf:result <sdo_eg_md_20.ttl>] [ a mf:ManifestEntry;
            rdfs:comment "Web Schemas TF: Schema.org tests: test 21 (format md)";
            mf:action [ a mq:QueryTest;
-             mq:data <sdo_eg_md_21.html>;
-             mq:query <sdo_eg_md_21.ttl>];
+             mq:data <sdo_eg_md_21.html>];
            mf:name "Test 0036";
+           mf:positiveTest "true";
            mf:registry <http://www.w3.org/ns/md>;
-           mf:result "true"] [ a mf:ManifestEntry;
+           mf:result <sdo_eg_md_21.ttl>] [ a mf:ManifestEntry;
            rdfs:comment "Web Schemas TF: Schema.org tests: test 22 (format md)";
            mf:action [ a mq:QueryTest;
-             mq:data <sdo_eg_md_22.html>;
-             mq:query <sdo_eg_md_22.ttl>];
+             mq:data <sdo_eg_md_22.html>];
            mf:name "Test 0037";
+           mf:positiveTest "true";
            mf:registry <http://www.w3.org/ns/md>;
-           mf:result "true"] [ a mf:ManifestEntry;
+           mf:result <sdo_eg_md_22.ttl>] [ a mf:ManifestEntry;
            rdfs:comment "Web Schemas TF: Schema.org tests: test 23 (format md)";
            mf:action [ a mq:QueryTest;
-             mq:data <sdo_eg_md_23.html>;
-             mq:query <sdo_eg_md_23.ttl>];
+             mq:data <sdo_eg_md_23.html>];
            mf:name "Test 0038";
+           mf:positiveTest "true";
            mf:registry <http://www.w3.org/ns/md>;
-           mf:result "true"] [ a mf:ManifestEntry;
+           mf:result <sdo_eg_md_23.ttl>] [ a mf:ManifestEntry;
            rdfs:comment "Web Schemas TF: Schema.org tests: test 24 (format md)";
            mf:action [ a mq:QueryTest;
-             mq:data <sdo_eg_md_24.html>;
-             mq:query <sdo_eg_md_24.ttl>];
+             mq:data <sdo_eg_md_24.html>];
            mf:name "Test 0039";
+           mf:positiveTest "true";
            mf:registry <http://www.w3.org/ns/md>;
-           mf:result "true"] [ a mf:ManifestEntry;
+           mf:result <sdo_eg_md_24.ttl>] [ a mf:ManifestEntry;
            rdfs:comment "Web Schemas TF: Schema.org tests: test 25 (format md)";
            mf:action [ a mq:QueryTest;
-             mq:data <sdo_eg_md_25.html>;
-             mq:query <sdo_eg_md_25.ttl>];
+             mq:data <sdo_eg_md_25.html>];
            mf:name "Test 0040";
+           mf:positiveTest "true";
            mf:registry <http://www.w3.org/ns/md>;
-           mf:result "true"] [ a mf:ManifestEntry;
+           mf:result <sdo_eg_md_25.ttl>] [ a mf:ManifestEntry;
            rdfs:comment "Web Schemas TF: Schema.org tests: test 26 (format md)";
            mf:action [ a mq:QueryTest;
-             mq:data <sdo_eg_md_26.html>;
-             mq:query <sdo_eg_md_26.ttl>];
+             mq:data <sdo_eg_md_26.html>];
            mf:name "Test 0041";
+           mf:positiveTest "true";
            mf:registry <http://www.w3.org/ns/md>;
-           mf:result "true"] [ a mf:ManifestEntry;
+           mf:result <sdo_eg_md_26.ttl>] [ a mf:ManifestEntry;
            rdfs:comment "Web Schemas TF: Schema.org tests: test 27 (format md)";
            mf:action [ a mq:QueryTest;
-             mq:data <sdo_eg_md_27.html>;
-             mq:query <sdo_eg_md_27.ttl>];
+             mq:data <sdo_eg_md_27.html>];
            mf:name "Test 0042";
+           mf:positiveTest "true";
            mf:registry <http://www.w3.org/ns/md>;
-           mf:result "true"] [ a mf:ManifestEntry;
+           mf:result <sdo_eg_md_27.ttl>] [ a mf:ManifestEntry;
            rdfs:comment "Web Schemas TF: Schema.org tests: test 28 (format md)";
            mf:action [ a mq:QueryTest;
-             mq:data <sdo_eg_md_28.html>;
-             mq:query <sdo_eg_md_28.ttl>];
+             mq:data <sdo_eg_md_28.html>];
            mf:name "Test 0043";
+           mf:positiveTest "true";
            mf:registry <http://www.w3.org/ns/md>;
-           mf:result "true"] [ a mf:ManifestEntry;
+           mf:result <sdo_eg_md_28.ttl>] [ a mf:ManifestEntry;
            rdfs:comment "Web Schemas TF: Schema.org tests: test 29 (format md)";
            mf:action [ a mq:QueryTest;
-             mq:data <sdo_eg_md_29.html>;
-             mq:query <sdo_eg_md_29.ttl>];
+             mq:data <sdo_eg_md_29.html>];
            mf:name "Test 0044";
+           mf:positiveTest "true";
            mf:registry <http://www.w3.org/ns/md>;
-           mf:result "true"] [ a mf:ManifestEntry;
+           mf:result <sdo_eg_md_29.ttl>] [ a mf:ManifestEntry;
            rdfs:comment "Web Schemas TF: Schema.org tests: test 30 (format md)";
            mf:action [ a mq:QueryTest;
-             mq:data <sdo_eg_md_30.html>;
-             mq:query <sdo_eg_md_30.ttl>];
+             mq:data <sdo_eg_md_30.html>];
            mf:name "Test 0045";
+           mf:positiveTest "true";
            mf:registry <http://www.w3.org/ns/md>;
-           mf:result "true"] [ a mf:ManifestEntry;
+           mf:result <sdo_eg_md_30.ttl>] [ a mf:ManifestEntry;
            rdfs:comment "Use of time with @datetime xsd:time";
            mf:action [ a mq:QueryTest;
-             mq:data <0046.html>;
-             mq:query <0046.ttl>];
+             mq:data <0046.html>];
            mf:name "Test 0046";
-           mf:result "true"] [ a mf:ManifestEntry;
+           mf:positiveTest "true";
+           mf:result <0046.ttl>] [ a mf:ManifestEntry;
            rdfs:comment "Use of time with @datetime xsd:dateTime";
            mf:action [ a mq:QueryTest;
-             mq:data <0047.html>;
-             mq:query <0047.ttl>];
+             mq:data <0047.html>];
            mf:name "Test 0047";
-           mf:result "true"] [ a mf:ManifestEntry;
+           mf:positiveTest "true";
+           mf:result <0047.ttl>] [ a mf:ManifestEntry;
            rdfs:comment "Use of time with @datetime xsd:duration";
            mf:action [ a mq:QueryTest;
-             mq:data <0048.html>;
-             mq:query <0048.ttl>];
+             mq:data <0048.html>];
            mf:name "Test 0048";
-           mf:result "true"] [ a mf:ManifestEntry;
+           mf:positiveTest "true";
+           mf:result <0048.ttl>] [ a mf:ManifestEntry;
            rdfs:comment "Use of time with @datetime invalid";
            mf:action [ a mq:QueryTest;
-             mq:data <0049.html>;
-             mq:query <0049.ttl>];
+             mq:data <0049.html>];
            mf:name "Test 0049";
-           mf:result "true"] [ a mf:ManifestEntry;
+           mf:positiveTest "true";
+           mf:result <0049.ttl>] [ a mf:ManifestEntry;
            rdfs:comment "relative URL as object";
            mf:action [ a mq:QueryTest;
-             mq:data <0050.html>;
-             mq:query <0050.ttl>];
+             mq:data <0050.html>];
            mf:name "Test 0050";
-           mf:result "true"] [ a mf:ManifestEntry;
+           mf:positiveTest "true";
+           mf:result <0050.ttl>] [ a mf:ManifestEntry;
            rdfs:comment "relative URL as itemid";
            mf:action [ a mq:QueryTest;
-             mq:data <0051.html>;
-             mq:query <0051.ttl>];
+             mq:data <0051.html>];
            mf:name "Test 0051";
-           mf:result "true"] [ a mf:ManifestEntry;
+           mf:positiveTest "true";
+           mf:result <0051.ttl>] [ a mf:ManifestEntry;
            rdfs:comment "token property no @itemtype";
            mf:action [ a mq:QueryTest;
-             mq:data <0052.html>;
-             mq:query <0052.ttl>];
+             mq:data <0052.html>];
            mf:name "Test 0052";
-           mf:result "true"] [ a mf:ManifestEntry;
+           mf:positiveTest "true";
+           mf:result <0052.ttl>] [ a mf:ManifestEntry;
            rdfs:comment "token property empty @itemtype";
            mf:action [ a mq:QueryTest;
-             mq:data <0053.html>;
-             mq:query <0053.ttl>];
+             mq:data <0053.html>];
            mf:name "Test 0053";
-           mf:result "true"] [ a mf:ManifestEntry;
+           mf:positiveTest "true";
+           mf:result <0053.ttl>] [ a mf:ManifestEntry;
            rdfs:comment "token property and relative @itemtype";
            mf:action [ a mq:QueryTest;
-             mq:data <0054.html>;
-             mq:query <0054.ttl>];
+             mq:data <0054.html>];
            mf:name "Test 0054";
-           mf:result "true"] [ a mf:ManifestEntry;
+           mf:positiveTest "true";
+           mf:result <0054.ttl>] [ a mf:ManifestEntry;
            rdfs:comment "token property and single @itemtype";
            mf:action [ a mq:QueryTest;
-             mq:data <0055.html>;
-             mq:query <0055.ttl>];
+             mq:data <0055.html>];
            mf:name "Test 0055";
-           mf:result "true"] [ a mf:ManifestEntry;
+           mf:positiveTest "true";
+           mf:result <0055.ttl>] [ a mf:ManifestEntry;
            rdfs:comment "token property and multiple @itemtypes from different vocabularies";
            mf:action [ a mq:QueryTest;
-             mq:data <0056.html>;
-             mq:query <0056.ttl>];
+             mq:data <0056.html>];
            mf:name "Test 0056";
-           mf:result "true"] [ a mf:ManifestEntry;
+           mf:positiveTest "true";
+           mf:result <0056.ttl>] [ a mf:ManifestEntry;
            rdfs:comment "URI property no @itemtype";
            mf:action [ a mq:QueryTest;
-             mq:data <0057.html>;
-             mq:query <0057.ttl>];
+             mq:data <0057.html>];
            mf:name "Test 0057";
-           mf:result "true"] [ a mf:ManifestEntry;
+           mf:positiveTest "true";
+           mf:result <0057.ttl>] [ a mf:ManifestEntry;
            rdfs:comment "URI property empty @itemtype";
            mf:action [ a mq:QueryTest;
-             mq:data <0058.html>;
-             mq:query <0058.ttl>];
+             mq:data <0058.html>];
            mf:name "Test 0058";
-           mf:result "true"] [ a mf:ManifestEntry;
+           mf:positiveTest "true";
+           mf:result <0058.ttl>] [ a mf:ManifestEntry;
            rdfs:comment "URI property relative @itemtype";
            mf:action [ a mq:QueryTest;
-             mq:data <0059.html>;
-             mq:query <0059.ttl>];
+             mq:data <0059.html>];
            mf:name "Test 0059";
-           mf:result "true"] [ a mf:ManifestEntry;
+           mf:positiveTest "true";
+           mf:result <0059.ttl>] [ a mf:ManifestEntry;
            rdfs:comment "URI property single @itemtype";
            mf:action [ a mq:QueryTest;
-             mq:data <0060.html>;
-             mq:query <0060.ttl>];
+             mq:data <0060.html>];
            mf:name "Test 0060";
-           mf:result "true"] [ a mf:ManifestEntry;
+           mf:positiveTest "true";
+           mf:result <0060.ttl>] [ a mf:ManifestEntry;
            rdfs:comment "inherited type and token property";
            mf:action [ a mq:QueryTest;
-             mq:data <0061.html>;
-             mq:query <0061.ttl>];
+             mq:data <0061.html>];
            mf:name "Test 0061";
-           mf:result "true"] [ a mf:ManifestEntry;
+           mf:positiveTest "true";
+           mf:result <0061.ttl>] [ a mf:ManifestEntry;
            rdfs:comment "@itemref to single id";
            mf:action [ a mq:QueryTest;
-             mq:data <0062.html>;
-             mq:query <0062.ttl>];
+             mq:data <0062.html>];
            mf:name "Test 0062";
-           mf:result "true"] [ a mf:ManifestEntry;
+           mf:positiveTest "true";
+           mf:result <0062.ttl>] [ a mf:ManifestEntry;
            rdfs:comment "@itemref generates property values";
            mf:action [ a mq:QueryTest;
-             mq:data <0063.html>;
-             mq:query <0063.ttl>];
+             mq:data <0063.html>];
            mf:name "Test 0063";
-           mf:result "true"] [ a mf:ManifestEntry;
+           mf:positiveTest "true";
+           mf:result <0063.ttl>] [ a mf:ManifestEntry;
            rdfs:comment "@itemref to single id with different types";
            mf:action [ a mq:QueryTest;
-             mq:data <0064.html>;
-             mq:query <0064.ttl>];
+             mq:data <0064.html>];
            mf:name "Test 0064";
-           mf:result "true"] [ a mf:ManifestEntry;
+           mf:positiveTest "true";
+           mf:result <0064.ttl>] [ a mf:ManifestEntry;
            rdfs:comment "@itemref to multiple ids";
            mf:action [ a mq:QueryTest;
-             mq:data <0065.html>;
-             mq:query <0065.ttl>];
+             mq:data <0065.html>];
            mf:name "Test 0065";
-           mf:result "true"] [ a mf:ManifestEntry;
+           mf:positiveTest "true";
+           mf:result <0065.ttl>] [ a mf:ManifestEntry;
            rdfs:comment "@itemref with chaining";
            mf:action [ a mq:QueryTest;
-             mq:data <0066.html>;
-             mq:query <0066.ttl>];
+             mq:data <0066.html>];
            mf:name "Test 0066";
-           mf:result "true"] [ a mf:ManifestEntry;
+           mf:positiveTest "true";
+           mf:result <0066.ttl>] [ a mf:ManifestEntry;
            rdfs:comment "Shared @itemref";
            mf:action [ a mq:QueryTest;
-             mq:data <0067.html>;
-             mq:query <0067.ttl>];
+             mq:data <0067.html>];
            mf:name "Test 0067";
-           mf:result "true"] [ a mf:ManifestEntry;
+           mf:positiveTest "true";
+           mf:result <0067.ttl>] [ a mf:ManifestEntry;
            rdfs:comment "Property URI generation (default) 1";
            mf:action [ a mq:QueryTest;
-             mq:data <0068.html>;
-             mq:query <0068.ttl>];
+             mq:data <0068.html>];
            mf:name "Test 0068";
-           mf:result "true"] [ a mf:ManifestEntry;
+           mf:positiveTest "true";
+           mf:result <0068.ttl>] [ a mf:ManifestEntry;
            rdfs:comment "Property URI generation (default) 2";
            mf:action [ a mq:QueryTest;
-             mq:data <0069.html>;
-             mq:query <0069.ttl>];
+             mq:data <0069.html>];
            mf:name "Test 0069";
-           mf:result "true"] [ a mf:ManifestEntry;
+           mf:positiveTest "true";
+           mf:result <0069.ttl>] [ a mf:ManifestEntry;
            rdfs:comment "Property URI generation (default) 3";
            mf:action [ a mq:QueryTest;
-             mq:data <0070.html>;
-             mq:query <0070.ttl>];
+             mq:data <0070.html>];
            mf:name "Test 0070";
-           mf:result "true"] [ a mf:ManifestEntry;
+           mf:positiveTest "true";
+           mf:result <0070.ttl>] [ a mf:ManifestEntry;
            rdfs:comment "Property URI generation (contextual) 1";
            mf:action [ a mq:QueryTest;
-             mq:data <0071.html>;
-             mq:query <0071.ttl>];
+             mq:data <0071.html>];
            mf:name "Test 0071";
-           mf:result "true"] [ a mf:ManifestEntry;
+           mf:positiveTest "true";
+           mf:result <0071.ttl>] [ a mf:ManifestEntry;
            rdfs:comment "Property URI generation (contextual) 2";
            mf:action [ a mq:QueryTest;
-             mq:data <0072.html>;
-             mq:query <0072.ttl>];
+             mq:data <0072.html>];
            mf:name "Test 0072";
-           mf:result "true"])]) .
+           mf:positiveTest "true";
+           mf:result <0072.ttl>])]) .