--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/testcases/constraints/unification-membership-f1-FAIL-DM.provn	Tue Dec 04 01:14:45 2012 +0000
@@ -0,0 +1,10 @@
+document
+
+prefix ex <http://example.org/>
+
+entity(ex:e1)
+entity(ex:e2)
+
+hadMember(ex:e2, -)
+
+endDocument
\ No newline at end of file

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/testcases/constraints/unification-specialization-f1-FAIL-DM.provn	Tue Dec 04 01:14:45 2012 +0000
@@ -0,0 +1,10 @@
+document
+
+prefix ex <http://example.org/>
+
+entity(ex:e1)
+entity(ex:e2)
+
+specializationOf(ex:e2, -)
+
+endDocument
\ No newline at end of file

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/testcases/constraints/unification-specialization-f2-FAIL-DM.provn	Tue Dec 04 01:14:45 2012 +0000
@@ -0,0 +1,10 @@
+document
+
+prefix ex <http://example.org/>
+
+entity(ex:e1)
+entity(ex:e2)
+
+specializationOf(-, ex:e1)
+
+endDocument
\ No newline at end of file

--- a/testcases/provo/prov-o-property-hadGeneration-PASS.provn	Mon Dec 03 19:28:45 2012 +0100
+++ b/testcases/provo/prov-o-property-hadGeneration-PASS.provn	Tue Dec 04 01:14:45 2012 +0000
@@ -1,11 +1,13 @@
 document
 prefix xsd <http://www.w3.org/2001/XMLSchema>
 prefix prim <http://openprovenance.org/primitives#>
+prefix ex <http://example.com/vocab#>
 prefix prov <http://www.w3.org/ns/prov#>
 prefix def <http://example.com/>
 prefix xsi <http://www.w3.org/2001/XMLSchema-instance>
 prefix pc1 <http://www.ipaw.info/pc1/>
-activity(def:illustrationActivity,-,2012-04-03T00:00:01Z)
+activity(def:illustrationActivity,2012-04-03T00:00:00Z,2012-04-03T00:00:25Z)
+entity(def:bar_chart,[prov:type='ex:Chart'])
 wasDerivedFrom(def:bar_chart, def:aggregatedByRegions, -, def:illustration, -)
-wasGeneratedBy(def:illustration;-,-,2012-04-03T00:00:01Z,[prov:type='prov:InstantaneousEvent'])
+wasGeneratedBy(def:illustration;-,def:illustrationActivity,2012-04-03T00:00:11Z,[prov:type='prov:InstantaneousEvent'])
 endDocument
\ No newline at end of file

--- a/testcases/provo/prov-o-property-hadGeneration-PASS.provx	Mon Dec 03 19:28:45 2012 +0100
+++ b/testcases/provo/prov-o-property-hadGeneration-PASS.provx	Tue Dec 04 01:14:45 2012 +0000
@@ -1,15 +1,20 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <prov:document xmlns:prov="http://www.w3.org/ns/prov#" xmlns:ns2="http://openprovenance.org/collection#" xmlns:ns3="http://openprovenance.org/validation#" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:prim="http://openprovenance.org/primitives#" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:pc1="http://www.ipaw.info/pc1/">
     <prov:activity xmlns:def="http://example.com/" prov:id="def:illustrationActivity">
-        <prov:endTime>2012-04-03T00:00:01Z</prov:endTime>
+        <prov:startTime>2012-04-03T00:00:00Z</prov:startTime>
+        <prov:endTime>2012-04-03T00:00:25Z</prov:endTime>
     </prov:activity>
-    <prov:wasGeneratedBy xmlns:def="http://example.com/" prov:id="def:illustration">
-        <prov:time>2012-04-03T00:00:01Z</prov:time>
-        <prov:type xsi:type="xsd:QName">prov:InstantaneousEvent</prov:type>
-    </prov:wasGeneratedBy>
+    <prov:entity xmlns:def="http://example.com/" prov:id="def:bar_chart">
+        <prov:type xmlns:ex="http://example.com/vocab#" xsi:type="xsd:QName">ex:Chart</prov:type>
+    </prov:entity>
     <prov:wasDerivedFrom>
         <prov:generation xmlns:def="http://example.com/" prov:ref="def:illustration"/>
         <prov:generatedEntity xmlns:def="http://example.com/" prov:ref="def:bar_chart"/>
         <prov:usedEntity xmlns:def="http://example.com/" prov:ref="def:aggregatedByRegions"/>
     </prov:wasDerivedFrom>
+    <prov:wasGeneratedBy xmlns:def="http://example.com/" prov:id="def:illustration">
+        <prov:time>2012-04-03T00:00:11Z</prov:time>
+        <prov:activity prov:ref="def:illustrationActivity"/>
+        <prov:type xsi:type="xsd:QName">prov:InstantaneousEvent</prov:type>
+    </prov:wasGeneratedBy>
 </prov:document>

--- a/testcases/provo/prov-o-property-hadGeneration-PASS.ttl	Mon Dec 03 19:28:45 2012 +0100
+++ b/testcases/provo/prov-o-property-hadGeneration-PASS.ttl	Tue Dec 04 01:14:45 2012 +0000
@@ -2,9 +2,11 @@
 @prefix xsd:  <http://www.w3.org/2001/XMLSchema#> .
 @prefix owl:  <http://www.w3.org/2002/07/owl#> .
 @prefix prov: <http://www.w3.org/ns/prov#> .
+@prefix ex:   <http://example.com/vocab#> .
 @prefix :     <http://example.com/> .
 
-:bar_chart   
+:bar_chart
+   a prov:Entity, ex:Chart;
    prov:wasDerivedFrom   :aggregatedByRegions;
    prov:qualifiedDerivation [
       a prov:Derivation;
@@ -13,20 +15,17 @@
    ];
 .
 
-:illustration   
-   a prov:Generation, 
+:aggregatedByRegions a ex:Dataset .
+
+:illustration
+   a prov:Generation,
      prov:InstantaneousEvent;
-   prov:atTime "2012-04-03T00:00:01Z"^^xsd:dateTime;
+   prov:activity :illustrationActivity;
+   prov:atTime   "2012-04-03T00:00:11Z"^^xsd:dateTime;
 .
 
-## An alternative way to express some of the above information
-
-:bar_chart   
-   prov:wasDerivedFrom :aggregatedByRegions;
-   prov:wasGeneratedBy :illustrationActivity;
+:illustrationActivity
+   a prov:Activity;
+   prov:startedAtTime "2012-04-03T00:00:00Z"^^xsd:dateTime;
+   prov:endedAtTime   "2012-04-03T00:00:25Z"^^xsd:dateTime;
 .
-
-:illustrationActivity   
-   a prov:Activity;
-   prov:endedAtTime "2012-04-03T00:00:01Z"^^xsd:dateTime;
-.