--- a/testcases/constraints/prov-o-property-hadUsage-FAIL-c51-DM.provn	Wed Jan 09 13:33:44 2013 +0000
+++ b/testcases/constraints/prov-o-property-hadUsage-FAIL-c51-DM.provn	Wed Jan 09 16:11:26 2013 +0000
@@ -3,6 +3,6 @@
 
   entity(proteinSample)
   entity(digestedProteinSample1)
-  wasDerivedFrom(digestedProteinSample1, proteinSample, -, u1)
+  wasDerivedFrom(digestedProteinSample1, proteinSample, -, u1, -)
   used(u1; -, Trypsin, -,[prov:role='treatmentEnzyme'])
 endDocument

--- a/testcases/constraints/prov-o-property-hadUsage-FAIL-c51-DM.provx	Wed Jan 09 13:33:44 2013 +0000
+++ b/testcases/constraints/prov-o-property-hadUsage-FAIL-c51-DM.provx	Wed Jan 09 16:11:26 2013 +0000
@@ -3,16 +3,12 @@
     <prov:entity xmlns:def="http://example.com/" prov:id="def:proteinSample"/>
     <prov:entity xmlns:def="http://example.com/" prov:id="def:digestedProteinSample1"/>
     <prov:wasDerivedFrom>
+        <prov:usage xmlns="" prov:ref="node17d8sv91ex2"/>
         <prov:generatedEntity xmlns:def="http://example.com/" prov:ref="def:digestedProteinSample1"/>
         <prov:usedEntity xmlns:def="http://example.com/" prov:ref="def:proteinSample"/>
     </prov:wasDerivedFrom>
-    <prov:wasDerivedFrom>
-        <prov:usage xmlns="" prov:ref="node17d8sv91ex2"/>
-        <prov:generatedEntity xmlns:def="http://example.com/" prov:ref="def:digestedProteinSample1"/>
-    </prov:wasDerivedFrom>
     <prov:used>
         <prov:entity xmlns:def="http://example.com/" prov:ref="def:Trypsin"/>
         <prov:role xsi:type="xsd:string">http://example.com/treatmentEnzyme</prov:role>
-        <prov:role xmlns:def="http://example.com/" xsi:type="prov:AnyRef" prov:ref="def:treatmentEnzyme"/>
     </prov:used>
 </prov:document>

--- a/testcases/provo/prov-o-class-Collection-PASS.provn	Wed Jan 09 13:33:44 2013 +0000
+++ b/testcases/provo/prov-o-class-Collection-PASS.provn	Wed Jan 09 16:11:26 2013 +0000
@@ -8,7 +8,7 @@
   entity(todays-us-supreme-court, [prov:type='prov:Collection', prov:type='RobertsCourt', dcterms:description='copied-string'])
   wasGeneratedBy(todays-us-supreme-court, -, -, [dcterms:date="2012" %% xsd:gYear])
   
-  hadMember(todays-us-supreme-court, dbpedia:John_Glover_Roberts,\_Jr.)
+  hadMember(todays-us-supreme-court, dbpedia:John_Glover_Roberts\,_Jr.)
   hadMember(todays-us-supreme-court, dbpedia:Antonin_Scalia)
   hadMember(todays-us-supreme-court, dbpedia:Anthony_Kennedy)
   hadMember(todays-us-supreme-court, dbpedia:Clarence_Thomas)

--- a/testcases/provo/prov-o-property-hadMember-PASS.provn	Wed Jan 09 13:33:44 2013 +0000
+++ b/testcases/provo/prov-o-property-hadMember-PASS.provn	Wed Jan 09 16:11:26 2013 +0000
@@ -8,7 +8,7 @@
   entity(todays-us-supreme-court, [prov:type='prov:Collection', prov:type='RobertsCourt', dcterms:description='copied-string'])
   wasGeneratedBy(todays-us-supreme-court, -, -, [dcterms:date="2012" %% xsd:gYear])
   
-  hadMember(todays-us-supreme-court, dbpedia:John_Glover_Roberts,_Jr.)
+  hadMember(todays-us-supreme-court, dbpedia:John_Glover_Roberts\,_Jr.)
   hadMember(todays-us-supreme-court, dbpedia:Antonin_Scalia)
   hadMember(todays-us-supreme-court, dbpedia:Anthony_Kennedy)
   hadMember(todays-us-supreme-court, dbpedia:Clarence_Thomas)
@@ -20,7 +20,7 @@
 
   wasDerivedFrom(todays-us-supreme-court, the-first-us-supreme-court)
 
-  entity(copied-string, [prov:value="2010–present: A. Scalia A. Kennedy C. Thomas R.B. Ginsburg\nS. Breyer S. Alito S. Sotomayor E. Kagan"];
+  entity(copied-string, [prov:value="2010–present: A. Scalia A. Kennedy C. Thomas R.B. Ginsburg\nS. Breyer S. Alito S. Sotomayor E. Kagan"]);
   entity(page-by-seat, [prov:type='ex:WikipediaPage'])
   entity(page-by-composition, [prov:type='ex:WikipediaPage'])
   

--- a/testcases/provo/prov-o-property-hadUsage-FAIL.provn	Wed Jan 09 13:33:44 2013 +0000
+++ b/testcases/provo/prov-o-property-hadUsage-FAIL.provn	Wed Jan 09 16:11:26 2013 +0000
@@ -3,6 +3,6 @@
 
   entity(proteinSample)
   entity(digestedProteinSample1)
-  wasDerivedFrom(digestedProteinSample1, proteinSample, -, u1)
+  wasDerivedFrom(digestedProteinSample1, proteinSample, -, u1, -)
   used(u1; -, Trypsin, -,[prov:role='treatmentEnzyme'])
 endDocument

--- a/testcases/provo/prov-o-property-qualifiedDerivation-FAIL.provn	Wed Jan 09 13:33:44 2013 +0000
+++ b/testcases/provo/prov-o-property-qualifiedDerivation-FAIL.provn	Wed Jan 09 16:11:26 2013 +0000
@@ -2,6 +2,7 @@
 prefix def <http://example.com/>
 activity(def:chart_creation,2011-07-16T01:52:02Z,2011-07-16T03:00:02Z)
 entity(def:bar_chart)
-wasAssociatedWith(def:chat_plotting;def:chart_creation,def:derek,2011-07-16T03:00:02Z)
+wasAssociatedWith(def:chart_creation,def:derek,-)
+wasGeneratedBy(def:chat_plotting;-,-,2011-07-16T03:00:02Z)
 wasDerivedFrom(def:bar_chart, def:aggregatedByRegions, def:chart_creation, def:chat_plotting, -)
 endDocument