Fixed PROV-XML of constraint unit test cases
authorTrung Dong Huynh <tdh@ecs.soton.ac.uk>
Mon, 04 Feb 2013 14:05:43 +0000
changeset 5471 fa6fc013f0c0
parent 5470 96af68fc5261
child 5472 4aaaab8737ce
Fixed PROV-XML of constraint unit test cases
testcases/constraints/ordering-communication-PASS-c35.provx
testcases/constraints/ordering-delegation1-PASS-c49.provx
testcases/constraints/ordering-delegation2-PASS-c49.provx
testcases/constraints/prov-o-property-hadGeneration-FAIL-c51-DM.provx
testcases/constraints/prov-o-property-hadUsage-FAIL-c51-DM.provx
testcases/constraints/unification-attributes-end-s2-PASS-c23.provx
testcases/constraints/unification-attributes-start-s2-PASS-c23.provx
testcases/constraints/unification-communication-f1-FAIL-DM.provx
testcases/constraints/unification-communication-f2-FAIL-DM.provx
testcases/constraints/unification-communication-s1-PASS-c23.provx
testcases/constraints/unification-communication-s2-PASS-c23.provx
testcases/constraints/unification-communication-s3-PASS-c23.provx
testcases/constraints/unification-communication-s4-PASS-c23.provx
testcases/constraints/unification-delegation-f1-FAIL-c23.provx
testcases/constraints/unification-delegation-f2-FAIL-c23.provx
testcases/constraints/unification-delegation-f3-FAIL-c23.provx
testcases/constraints/unification-delegation-s1-PASS-c23.provx
testcases/constraints/unification-delegation-s2-PASS-c23.provx
testcases/constraints/unification-delegation-s3-PASS-c23.provx
testcases/constraints/unification-delegation-s4-PASS-c23.provx
testcases/constraints/unification-delegation-s5-PASS-c23.provx
testcases/constraints/unification-derivation-f1-FAIL-c23.provx
testcases/constraints/unification-end-f5-FAIL-c23.provx
testcases/constraints/unification-end-s3-PASS-c27.provx
testcases/constraints/unification-end-s6-PASS-c23-c27.provx
testcases/constraints/unification-generation-f4-FAIL-c23.provx
testcases/constraints/unification-generation-f5-FAIL-c23.provx
testcases/constraints/unification-generation-f6-FAIL-c23.provx
testcases/constraints/unification-generation-f7-FAIL-c23.provx
testcases/constraints/unification-generation-s5-PASS-c23.provx
testcases/constraints/unification-generation-s6-PASS-c23.provx
testcases/constraints/unification-generation-s7-PASS-c23-c24.provx
testcases/constraints/unification-generation-s8-PASS-c23-c24.provx
testcases/constraints/unification-invalidation-f4-FAIL-c23.provx
testcases/constraints/unification-invalidation-f5-FAIL-c23-c25.provx
testcases/constraints/unification-invalidation-f6-FAIL-c23-c25.provx
testcases/constraints/unification-invalidation-f7-FAIL-c23-c25.provx
testcases/constraints/unification-invalidation-s5-PASS-c23.provx
testcases/constraints/unification-invalidation-s6-PASS-c23.provx
testcases/constraints/unification-invalidation-s7-PASS-c23-c25.provx
testcases/constraints/unification-invalidation-s8-PASS-c23-c25.provx
testcases/constraints/unification-start-f1-FAIL-c23.provx
testcases/constraints/unification-start-f2-FAIL-c23.provx
testcases/constraints/unification-start-f3-FAIL-c23.provx
testcases/constraints/unification-start-f4-FAIL-c26.provx
testcases/constraints/unification-start-f5-FAIL-c23.provx
testcases/constraints/unification-start-f6-FAIL-c23.provx
testcases/constraints/unification-start-f7-FAIL-c23.provx
testcases/constraints/unification-start-f8-FAIL-c23.provx
testcases/constraints/unification-start-s1-PASS-c26.provx
testcases/constraints/unification-start-s2-PASS-c26.provx
testcases/constraints/unification-start-s3-PASS-c26.provx
testcases/constraints/unification-start-s4-PASS-c26.provx
testcases/constraints/unification-start-s5-PASS-c23-c26.provx
testcases/constraints/unification-start-s6-PASS-c23-c26.provx
testcases/constraints/unification-start-s7-PASS-c23-c26.provx
testcases/constraints/unification-start-s8-PASS-c23-c26.provx
testcases/constraints/unification-start-s9-PASS-c23-c26.provx
testcases/constraints/unification-usage-f2-FAIL-c23.provx
testcases/constraints/unification-usage-f3-FAIL-c23.provx
testcases/constraints/unification-usage-f4-FAIL-c23.provx
testcases/constraints/unification-usage-f5-PASS-c23.provx
testcases/constraints/unification-usage-f6-PASS-c23.provx
testcases/constraints/unification-usage-f7-PASS-c23.provx
testcases/constraints/unification-usage-s1-PASS-c23.provx
testcases/constraints/unification-usage-s2-PASS-c23.provx
testcases/constraints/unification-usage-s5-PASS-c23.provx
testcases/constraints/unification-usage-s6-PASS-c23.provx
testcases/constraints/unification-usage-s7-PASS-c23.provx
testcases/constraints/unification-usage-s8-PASS-c23.provx
--- a/testcases/constraints/ordering-communication-PASS-c35.provx	Mon Feb 04 13:12:32 2013 +0100
+++ b/testcases/constraints/ordering-communication-PASS-c35.provx	Mon Feb 04 14:05:43 2013 +0000
@@ -3,7 +3,7 @@
     <prov:activity xmlns:ex="http://example.org/" prov:id="ex:a1"/>
     <prov:activity xmlns:ex="http://example.org/" prov:id="ex:a2"/>
     <prov:wasInformedBy xmlns:ex="http://example.org/" prov:id="ex:inf1">
-        <prov:effect prov:ref="ex:a1"/>
-        <prov:cause prov:ref="ex:a2"/>
+        <prov:informed prov:ref="ex:a1"/>
+        <prov:informant prov:ref="ex:a2"/>
     </prov:wasInformedBy>
 </prov:document>
--- a/testcases/constraints/ordering-delegation1-PASS-c49.provx	Mon Feb 04 13:12:32 2013 +0100
+++ b/testcases/constraints/ordering-delegation1-PASS-c49.provx	Mon Feb 04 14:05:43 2013 +0000
@@ -16,7 +16,7 @@
 
 
             <prov:actedOnBehalfOf prov:id="ex:del">
-	      <prov:subordinate prov:ref="ex:ag2"/>
+	      <prov:delegate prov:ref="ex:ag2"/>
 	      <prov:responsible prov:ref="ex:ag1"/>
             </prov:actedOnBehalfOf>
 
--- a/testcases/constraints/ordering-delegation2-PASS-c49.provx	Mon Feb 04 13:12:32 2013 +0100
+++ b/testcases/constraints/ordering-delegation2-PASS-c49.provx	Mon Feb 04 14:05:43 2013 +0000
@@ -16,7 +16,7 @@
 
 
             <prov:actedOnBehalfOf prov:id="ex:del">
-	      <prov:subordinate prov:ref="ex:ag2"/>
+	      <prov:delegate prov:ref="ex:ag2"/>
 	      <prov:responsible prov:ref="ex:ag1"/>
             </prov:actedOnBehalfOf>
 
--- a/testcases/constraints/prov-o-property-hadGeneration-FAIL-c51-DM.provx	Mon Feb 04 13:12:32 2013 +0100
+++ b/testcases/constraints/prov-o-property-hadGeneration-FAIL-c51-DM.provx	Mon Feb 04 14:05:43 2013 +0000
@@ -8,13 +8,13 @@
         <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:generation xmlns:def="http://example.com/" prov:ref="def:illustration"/>
     </prov:wasDerivedFrom>
     <prov:wasGeneratedBy xmlns:def="http://example.com/" prov:id="def:illustration">
+        <prov:activity prov:ref="def:illustrationActivity"/>
         <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/constraints/prov-o-property-hadUsage-FAIL-c51-DM.provx	Mon Feb 04 13:12:32 2013 +0100
+++ b/testcases/constraints/prov-o-property-hadUsage-FAIL-c51-DM.provx	Mon Feb 04 14:05:43 2013 +0000
@@ -3,9 +3,9 @@
     <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:usage xmlns="" prov:ref="node17d8sv91ex2"/>
     </prov:wasDerivedFrom>
     <prov:used>
         <prov:entity xmlns:def="http://example.com/" prov:ref="def:Trypsin"/>
--- a/testcases/constraints/unification-attributes-end-s2-PASS-c23.provx	Mon Feb 04 13:12:32 2013 +0100
+++ b/testcases/constraints/unification-attributes-end-s2-PASS-c23.provx	Mon Feb 04 14:05:43 2013 +0000
@@ -8,11 +8,11 @@
         <prov:activity prov:id="ex:a2">
         </prov:activity>
 
-            <prov:wasEndedBy prov:id="ex:end1">
+        <prov:wasEndedBy prov:id="ex:end1">
+          <prov:activity prov:ref="ex:a1"/>
 	        <prov:time>2011-11-16T16:05:00</prov:time>
-                <prov:activity prov:ref="ex:a1"/>
-		<prov:type xsi:type="xsd:QName">ex:test1</prov:type>
-            </prov:wasEndedBy>
+          <prov:type xsi:type="xsd:QName">ex:test1</prov:type>
+        </prov:wasEndedBy>
 
             <prov:wasEndedBy>
                 <prov:activity prov:ref="ex:a1"/>
--- a/testcases/constraints/unification-attributes-start-s2-PASS-c23.provx	Mon Feb 04 13:12:32 2013 +0100
+++ b/testcases/constraints/unification-attributes-start-s2-PASS-c23.provx	Mon Feb 04 14:05:43 2013 +0000
@@ -9,9 +9,9 @@
         </prov:activity>
 
             <prov:wasStartedBy prov:id="ex:start1">
-	        <prov:time>2011-11-16T16:05:00</prov:time>
                 <prov:activity prov:ref="ex:a1"/>
-		<prov:type xsi:type="xsd:QName">ex:test1</prov:type>
+	          <prov:time>2011-11-16T16:05:00</prov:time>
+          	<prov:type xsi:type="xsd:QName">ex:test1</prov:type>
             </prov:wasStartedBy>
 
             <prov:wasStartedBy>
--- a/testcases/constraints/unification-communication-f1-FAIL-DM.provx	Mon Feb 04 13:12:32 2013 +0100
+++ b/testcases/constraints/unification-communication-f1-FAIL-DM.provx	Mon Feb 04 14:05:43 2013 +0000
@@ -5,7 +5,7 @@
         </prov:activity>
 
             <prov:wasInformedBy prov:id="ex:inf1">
-                <prov:effect prov:ref="ex:a1"/>
+                <prov:informed prov:ref="ex:a1"/>
             </prov:wasInformedBy>
 
 </prov:document>
--- a/testcases/constraints/unification-communication-f2-FAIL-DM.provx	Mon Feb 04 13:12:32 2013 +0100
+++ b/testcases/constraints/unification-communication-f2-FAIL-DM.provx	Mon Feb 04 14:05:43 2013 +0000
@@ -5,7 +5,7 @@
         </prov:activity>
 
             <prov:wasInformedBy prov:id="ex:inf1">
-                <prov:cause prov:ref="ex:a1"/>
+                <prov:informant prov:ref="ex:a1"/>
             </prov:wasInformedBy>
 
 </prov:document>
--- a/testcases/constraints/unification-communication-s1-PASS-c23.provx	Mon Feb 04 13:12:32 2013 +0100
+++ b/testcases/constraints/unification-communication-s1-PASS-c23.provx	Mon Feb 04 14:05:43 2013 +0000
@@ -5,12 +5,12 @@
         </prov:activity>
 
             <prov:wasInformedBy prov:id="ex:inf1">
-                <prov:effect prov:ref="ex:a1"/>
-                <prov:cause prov:ref="ex:a2"/>
+                <prov:informed prov:ref="ex:a1"/>
+                <prov:informant prov:ref="ex:a2"/>
             </prov:wasInformedBy>
             <prov:wasInformedBy prov:id="ex:inf1">
-                <prov:effect prov:ref="ex:a1"/>
-                <prov:cause prov:ref="ex:a2"/>
+                <prov:informed prov:ref="ex:a1"/>
+                <prov:informant prov:ref="ex:a2"/>
             </prov:wasInformedBy>
 
 </prov:document>
--- a/testcases/constraints/unification-communication-s2-PASS-c23.provx	Mon Feb 04 13:12:32 2013 +0100
+++ b/testcases/constraints/unification-communication-s2-PASS-c23.provx	Mon Feb 04 14:05:43 2013 +0000
@@ -5,12 +5,12 @@
         </prov:activity>
 
             <prov:wasInformedBy prov:id="ex:inf1">
-                <prov:effect prov:ref="ex:a1"/>
-                <prov:cause prov:ref="ex:a2"/>
+                <prov:informed prov:ref="ex:a1"/>
+                <prov:informant prov:ref="ex:a2"/>
             </prov:wasInformedBy>
             <prov:wasInformedBy prov:id="ex:inf2">
-                <prov:effect prov:ref="ex:a1"/>
-                <prov:cause prov:ref="ex:a2"/>
+                <prov:informed prov:ref="ex:a1"/>
+                <prov:informant prov:ref="ex:a2"/>
             </prov:wasInformedBy>
 
 </prov:document>
--- a/testcases/constraints/unification-communication-s3-PASS-c23.provx	Mon Feb 04 13:12:32 2013 +0100
+++ b/testcases/constraints/unification-communication-s3-PASS-c23.provx	Mon Feb 04 14:05:43 2013 +0000
@@ -5,12 +5,12 @@
         </prov:activity>
 
             <prov:wasInformedBy>
-                <prov:effect prov:ref="ex:a1"/>
-                <prov:cause prov:ref="ex:a2"/>
+                <prov:informed prov:ref="ex:a1"/>
+                <prov:informant prov:ref="ex:a2"/>
             </prov:wasInformedBy>
             <prov:wasInformedBy prov:id="ex:inf2">
-                <prov:effect prov:ref="ex:a1"/>
-                <prov:cause prov:ref="ex:a2"/>
+                <prov:informed prov:ref="ex:a1"/>
+                <prov:informant prov:ref="ex:a2"/>
             </prov:wasInformedBy>
 
 </prov:document>
--- a/testcases/constraints/unification-communication-s4-PASS-c23.provx	Mon Feb 04 13:12:32 2013 +0100
+++ b/testcases/constraints/unification-communication-s4-PASS-c23.provx	Mon Feb 04 14:05:43 2013 +0000
@@ -5,12 +5,12 @@
         </prov:activity>
 
             <prov:wasInformedBy>
-                <prov:effect prov:ref="ex:a1"/>
-                <prov:cause prov:ref="ex:a2"/>
+                <prov:informed prov:ref="ex:a1"/>
+                <prov:informant prov:ref="ex:a2"/>
             </prov:wasInformedBy>
             <prov:wasInformedBy>
-                <prov:effect prov:ref="ex:a1"/>
-                <prov:cause prov:ref="ex:a2"/>
+                <prov:informed prov:ref="ex:a1"/>
+                <prov:informant prov:ref="ex:a2"/>
             </prov:wasInformedBy>
 
 </prov:document>
--- a/testcases/constraints/unification-delegation-f1-FAIL-c23.provx	Mon Feb 04 13:12:32 2013 +0100
+++ b/testcases/constraints/unification-delegation-f1-FAIL-c23.provx	Mon Feb 04 14:05:43 2013 +0000
@@ -9,12 +9,12 @@
         </prov:agent>
 
             <prov:actedOnBehalfOf prov:id="ex:del1">
-                <prov:subordinate prov:ref="ex:ag2"/>
+                <prov:delegate prov:ref="ex:ag2"/>
                 <prov:responsible prov:ref="ex:ag1"/>
                 <prov:activity prov:ref="ex:a2"/>
             </prov:actedOnBehalfOf>
             <prov:actedOnBehalfOf prov:id="ex:del1">
-                <prov:subordinate prov:ref="ex:ag2"/>
+                <prov:delegate prov:ref="ex:ag2"/>
                 <prov:responsible prov:ref="ex:ag1-other"/>
                 <prov:activity prov:ref="ex:a2"/>
             </prov:actedOnBehalfOf>
--- a/testcases/constraints/unification-delegation-f2-FAIL-c23.provx	Mon Feb 04 13:12:32 2013 +0100
+++ b/testcases/constraints/unification-delegation-f2-FAIL-c23.provx	Mon Feb 04 14:05:43 2013 +0000
@@ -9,12 +9,12 @@
         </prov:agent>
 
             <prov:actedOnBehalfOf prov:id="ex:del1">
-                <prov:subordinate prov:ref="ex:ag2"/>
+                <prov:delegate prov:ref="ex:ag2"/>
                 <prov:responsible prov:ref="ex:ag1"/>
                 <prov:activity prov:ref="ex:a2"/>
             </prov:actedOnBehalfOf>
             <prov:actedOnBehalfOf prov:id="ex:del1">
-                <prov:subordinate prov:ref="ex:ag2-other"/>
+                <prov:delegate prov:ref="ex:ag2-other"/>
                 <prov:responsible prov:ref="ex:ag1"/>
                 <prov:activity prov:ref="ex:a2"/>
             </prov:actedOnBehalfOf>
--- a/testcases/constraints/unification-delegation-f3-FAIL-c23.provx	Mon Feb 04 13:12:32 2013 +0100
+++ b/testcases/constraints/unification-delegation-f3-FAIL-c23.provx	Mon Feb 04 14:05:43 2013 +0000
@@ -9,12 +9,12 @@
         </prov:agent>
 
             <prov:actedOnBehalfOf prov:id="ex:del1">
-                <prov:subordinate prov:ref="ex:ag2"/>
+                <prov:delegate prov:ref="ex:ag2"/>
                 <prov:responsible prov:ref="ex:ag1"/>
                 <prov:activity prov:ref="ex:a2"/>
             </prov:actedOnBehalfOf>
             <prov:actedOnBehalfOf prov:id="ex:del1">
-                <prov:subordinate prov:ref="ex:ag2"/>
+                <prov:delegate prov:ref="ex:ag2"/>
                 <prov:responsible prov:ref="ex:ag1"/>
                 <prov:activity prov:ref="ex:a2-other"/>
             </prov:actedOnBehalfOf>
--- a/testcases/constraints/unification-delegation-s1-PASS-c23.provx	Mon Feb 04 13:12:32 2013 +0100
+++ b/testcases/constraints/unification-delegation-s1-PASS-c23.provx	Mon Feb 04 14:05:43 2013 +0000
@@ -9,12 +9,12 @@
         </prov:agent>
 
             <prov:actedOnBehalfOf prov:id="ex:del1">
-                <prov:subordinate prov:ref="ex:ag2"/>
+                <prov:delegate prov:ref="ex:ag2"/>
                 <prov:responsible prov:ref="ex:ag1"/>
                 <prov:activity prov:ref="ex:a2"/>
             </prov:actedOnBehalfOf>
             <prov:actedOnBehalfOf prov:id="ex:del1">
-                <prov:subordinate prov:ref="ex:ag2"/>
+                <prov:delegate prov:ref="ex:ag2"/>
                 <prov:responsible prov:ref="ex:ag1"/>
                 <prov:activity prov:ref="ex:a2"/>
             </prov:actedOnBehalfOf>
--- a/testcases/constraints/unification-delegation-s2-PASS-c23.provx	Mon Feb 04 13:12:32 2013 +0100
+++ b/testcases/constraints/unification-delegation-s2-PASS-c23.provx	Mon Feb 04 14:05:43 2013 +0000
@@ -9,12 +9,12 @@
         </prov:agent>
 
             <prov:actedOnBehalfOf prov:id="ex:del1">
-                <prov:subordinate prov:ref="ex:ag2"/>
+                <prov:delegate prov:ref="ex:ag2"/>
                 <prov:responsible prov:ref="ex:ag1"/>
                 <prov:activity prov:ref="ex:a2"/>
             </prov:actedOnBehalfOf>
             <prov:actedOnBehalfOf prov:id="ex:del2">
-                <prov:subordinate prov:ref="ex:ag2"/>
+                <prov:delegate prov:ref="ex:ag2"/>
                 <prov:responsible prov:ref="ex:ag1"/>
                 <prov:activity prov:ref="ex:a2"/>
             </prov:actedOnBehalfOf>
--- a/testcases/constraints/unification-delegation-s3-PASS-c23.provx	Mon Feb 04 13:12:32 2013 +0100
+++ b/testcases/constraints/unification-delegation-s3-PASS-c23.provx	Mon Feb 04 14:05:43 2013 +0000
@@ -9,12 +9,12 @@
         </prov:agent>
 
             <prov:actedOnBehalfOf prov:id="ex:del1">
-                <prov:subordinate prov:ref="ex:ag2"/>
+                <prov:delegate prov:ref="ex:ag2"/>
                 <prov:responsible prov:ref="ex:ag1"/>
                 <prov:activity prov:ref="ex:a2"/>
             </prov:actedOnBehalfOf>
             <prov:actedOnBehalfOf prov:id="ex:del1">
-                <prov:subordinate prov:ref="ex:ag2"/>
+                <prov:delegate prov:ref="ex:ag2"/>
                 <prov:activity prov:ref="ex:a2"/>
             </prov:actedOnBehalfOf>
 
--- a/testcases/constraints/unification-delegation-s4-PASS-c23.provx	Mon Feb 04 13:12:32 2013 +0100
+++ b/testcases/constraints/unification-delegation-s4-PASS-c23.provx	Mon Feb 04 14:05:43 2013 +0000
@@ -1,21 +1,18 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <prov:document xmlns:prov="http://www.w3.org/ns/prov#" xmlns:prim="http://openprovenance.org/primitives#" xmlns:ex="http://example.org/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
-        <prov:activity prov:id="ex:a2">
-	  
+        <prov:activity prov:id="ex:a2">	  
         </prov:activity>
         <prov:agent prov:id="ex:ag2">
         </prov:agent>
         <prov:agent prov:id="ex:ag1">
         </prov:agent>
-
-            <prov:actedOnBehalfOf prov:id="ex:del1">
-                <prov:subordinate prov:ref="ex:ag2"/>
-                <prov:responsible prov:ref="ex:ag1"/>
-                <prov:activity prov:ref="ex:a2"/>
-            </prov:actedOnBehalfOf>
-            <prov:actedOnBehalfOf prov:id="ex:del1">
-                <prov:subordinate prov:ref="ex:ag2"/>
-                <prov:activity prov:ref="ex:a2"/>
-            </prov:actedOnBehalfOf>
-
+		<prov:actedOnBehalfOf prov:id="ex:del1">
+			<prov:delegate prov:ref="ex:ag2"/>
+			<prov:responsible prov:ref="ex:ag1"/>
+			<prov:activity prov:ref="ex:a2"/>
+		</prov:actedOnBehalfOf>
+		<prov:actedOnBehalfOf prov:id="ex:del1">
+			<prov:delegate prov:ref="ex:ag2"/>
+			<prov:activity prov:ref="ex:a2"/>
+		</prov:actedOnBehalfOf>
 </prov:document>
--- a/testcases/constraints/unification-delegation-s5-PASS-c23.provx	Mon Feb 04 13:12:32 2013 +0100
+++ b/testcases/constraints/unification-delegation-s5-PASS-c23.provx	Mon Feb 04 14:05:43 2013 +0000
@@ -9,12 +9,12 @@
         </prov:agent>
 
             <prov:actedOnBehalfOf >
-                <prov:subordinate prov:ref="ex:ag2"/>
+                <prov:delegate prov:ref="ex:ag2"/>
                 <prov:responsible prov:ref="ex:ag1"/>
                 <prov:activity prov:ref="ex:a2"/>
             </prov:actedOnBehalfOf>
             <prov:actedOnBehalfOf >
-                <prov:subordinate prov:ref="ex:ag2"/>
+                <prov:delegate prov:ref="ex:ag2"/>
                 <prov:responsible prov:ref="ex:ag1"/>
                 <prov:activity prov:ref="ex:a2"/>
             </prov:actedOnBehalfOf>
--- a/testcases/constraints/unification-derivation-f1-FAIL-c23.provx	Mon Feb 04 13:12:32 2013 +0100
+++ b/testcases/constraints/unification-derivation-f1-FAIL-c23.provx	Mon Feb 04 14:05:43 2013 +0000
@@ -4,17 +4,15 @@
         </prov:entity>
         <prov:entity prov:id="ex:e2">
         </prov:entity>
-!
-            <prov:wasDerivedFrom prov:id="ex:der1">
-                <prov:generatedEntity prov:ref="ex:e2"/>
-                <prov:usedEntity prov:ref="ex:e1"/>
-		<prov:activity prov:ref="ex:a"/>
-		<prov:generation prov:ref="ex:gen"/>
-		<prov:usage prov:ref="ex:use"/>
-            </prov:wasDerivedFrom>
-            <prov:wasDerivedFrom prov:id="ex:der1">
-                <prov:generatedEntity prov:ref="ex:e2"/>
-                <prov:usedEntity prov:ref="ex:e1"/>
-            </prov:wasDerivedFrom>
-
+		<prov:wasDerivedFrom prov:id="ex:der1">
+			<prov:generatedEntity prov:ref="ex:e2"/>
+			<prov:usedEntity prov:ref="ex:e1"/>
+			<prov:activity prov:ref="ex:a"/>
+			<prov:generation prov:ref="ex:gen"/>
+			<prov:usage prov:ref="ex:use"/>
+		</prov:wasDerivedFrom>
+		<prov:wasDerivedFrom prov:id="ex:der1">
+			<prov:generatedEntity prov:ref="ex:e2"/>
+			<prov:usedEntity prov:ref="ex:e1"/>
+		</prov:wasDerivedFrom>
 </prov:document>
--- a/testcases/constraints/unification-end-f5-FAIL-c23.provx	Mon Feb 04 13:12:32 2013 +0100
+++ b/testcases/constraints/unification-end-f5-FAIL-c23.provx	Mon Feb 04 14:05:43 2013 +0000
@@ -1,24 +1,21 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <prov:document xmlns:prov="http://www.w3.org/ns/prov#" xmlns:prim="http://openprovenance.org/primitives#" xmlns:ex="http://example.org/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
-
         <prov:entity prov:id="ex:e1">
         </prov:entity>
         <prov:activity prov:id="ex:a1">
         </prov:activity>
         <prov:activity prov:id="ex:a2">
         </prov:activity>
-
-            <prov:wasEndedBy prov:id="ex:end1">
-	        <prov:time>2012-11-16T16:05:00</prov:time>
-                <prov:activity prov:ref="ex:a1"/>
-                <prov:trigger prov:ref="ex:e1"/>
-                <prov:ender prov:ref="ex:a2"/>
-            </prov:wasEndedBy>
-            <prov:wasEndedBy prov:id="ex:end1"> 
-	        <prov:time>2011-11-16T16:05:00</prov:time>  <!-- fails to unify -->
-                <prov:activity prov:ref="ex:a1"/>
-                <prov:trigger prov:ref="ex:e1"/>
-                <prov:ender prov:ref="ex:a2"/>
-            </prov:wasEndedBy>
-
+		<prov:wasEndedBy prov:id="ex:end1">
+			<prov:activity prov:ref="ex:a1"/>
+			<prov:trigger prov:ref="ex:e1"/>
+			<prov:ender prov:ref="ex:a2"/>
+			<prov:time>2012-11-16T16:05:00</prov:time>
+		</prov:wasEndedBy>
+		<prov:wasEndedBy prov:id="ex:end1"> 
+			<prov:activity prov:ref="ex:a1"/>
+			<prov:trigger prov:ref="ex:e1"/>
+			<prov:ender prov:ref="ex:a2"/>
+			<prov:time>2011-11-16T16:05:00</prov:time>  <!-- fails to unify -->
+		</prov:wasEndedBy>
 </prov:document>
--- a/testcases/constraints/unification-end-s3-PASS-c27.provx	Mon Feb 04 13:12:32 2013 +0100
+++ b/testcases/constraints/unification-end-s3-PASS-c27.provx	Mon Feb 04 14:05:43 2013 +0000
@@ -1,23 +1,22 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <prov:document xmlns:prov="http://www.w3.org/ns/prov#" xmlns:prim="http://openprovenance.org/primitives#" xmlns:ex="http://example.org/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
-        <prov:entity prov:id="ex:e1">
-        </prov:entity>
-        <prov:activity prov:id="ex:a1">
-        </prov:activity>
-        <prov:activity prov:id="ex:a2">
-        </prov:activity>
-
-        <prov:wasEndedBy prov:id="ex:end1">
-          <!-- able to unify time -->
-          <prov:activity prov:ref="ex:a1"/>
-          <prov:trigger prov:ref="ex:e1"/>
-          <prov:ender prov:ref="ex:a2"/>
-        </prov:wasEndedBy>
-        <prov:wasEndedBy>
-	  <prov:time>2011-11-16T16:05:00</prov:time>
-	  <!-- able to unify the end id -->
-          <prov:activity prov:ref="ex:a1"/>
-	  <!-- able to unify the trigger id -->
-          <prov:ender prov:ref="ex:a2"/>
-        </prov:wasEndedBy>
+	<prov:entity prov:id="ex:e1">
+	</prov:entity>
+	<prov:activity prov:id="ex:a1">
+	</prov:activity>
+	<prov:activity prov:id="ex:a2">
+	</prov:activity>
+	<prov:wasEndedBy prov:id="ex:end1">
+		<!-- able to unify time -->
+		<prov:activity prov:ref="ex:a1"/>
+		<prov:trigger prov:ref="ex:e1"/>
+		<prov:ender prov:ref="ex:a2"/>
+	</prov:wasEndedBy>
+	<prov:wasEndedBy>
+		<!-- able to unify the end id -->
+		<prov:activity prov:ref="ex:a1"/>
+		<!-- able to unify the trigger id -->
+		<prov:ender prov:ref="ex:a2"/>
+		<prov:time>2011-11-16T16:05:00</prov:time>
+	</prov:wasEndedBy>
 </prov:document>
--- a/testcases/constraints/unification-end-s6-PASS-c23-c27.provx	Mon Feb 04 13:12:32 2013 +0100
+++ b/testcases/constraints/unification-end-s6-PASS-c23-c27.provx	Mon Feb 04 14:05:43 2013 +0000
@@ -1,27 +1,22 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <prov:document xmlns:prov="http://www.w3.org/ns/prov#" xmlns:prim="http://openprovenance.org/primitives#" xmlns:ex="http://example.org/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
-
         <prov:entity prov:id="ex:e1">
         </prov:entity>
         <prov:activity prov:id="ex:a1">
         </prov:activity>
         <prov:activity prov:id="ex:a2">
         </prov:activity>
-
-            <prov:wasEndedBy prov:id="ex:end1">
-	        <prov:time>2011-11-16T16:05:00</prov:time>
-                <prov:activity prov:ref="ex:a1"/>
-            </prov:wasEndedBy>
-
-            <prov:wasEndedBy>
-                <prov:activity prov:ref="ex:a1"/>
-                <prov:trigger prov:ref="ex:e1"/>
-                <prov:ender prov:ref="ex:a2"/>
-            </prov:wasEndedBy>
-
-            <prov:wasEndedBy prov:id="ex:end1">
-                <prov:activity prov:ref="ex:a1"/>
-                <prov:ender prov:ref="ex:a2"/>
-            </prov:wasEndedBy>
-
+		<prov:wasEndedBy prov:id="ex:end1">
+			<prov:activity prov:ref="ex:a1"/>
+			<prov:time>2011-11-16T16:05:00</prov:time>
+		</prov:wasEndedBy>
+		<prov:wasEndedBy>
+			<prov:activity prov:ref="ex:a1"/>
+			<prov:trigger prov:ref="ex:e1"/>
+			<prov:ender prov:ref="ex:a2"/>
+		</prov:wasEndedBy>
+		<prov:wasEndedBy prov:id="ex:end1">
+			<prov:activity prov:ref="ex:a1"/>
+			<prov:ender prov:ref="ex:a2"/>
+		</prov:wasEndedBy>
 </prov:document>
--- a/testcases/constraints/unification-generation-f4-FAIL-c23.provx	Mon Feb 04 13:12:32 2013 +0100
+++ b/testcases/constraints/unification-generation-f4-FAIL-c23.provx	Mon Feb 04 14:05:43 2013 +0000
@@ -1,20 +1,17 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <prov:document xmlns:prov="http://www.w3.org/ns/prov#" xmlns:prim="http://openprovenance.org/primitives#" xmlns:ex="http://example.org/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
-
         <prov:entity prov:id="ex:e1">
         </prov:entity>
         <prov:activity prov:id="ex:a1">
         </prov:activity>
-
-            <prov:wasGeneratedBy prov:id="ex:gen1">
-                <prov:time>2012-11-16T16:05:00</prov:time>
-                <prov:entity prov:ref="ex:e1"/>
-                <prov:activity prov:ref="ex:a1"/>
-            </prov:wasGeneratedBy>
-            <prov:wasGeneratedBy prov:id="ex:gen1">
-                <prov:time>2011-11-16T16:05:00</prov:time>
-                <prov:entity prov:ref="ex:e1"/>
-                <prov:activity prov:ref="ex:a1"/>
-            </prov:wasGeneratedBy>
-
+		<prov:wasGeneratedBy prov:id="ex:gen1">
+			<prov:entity prov:ref="ex:e1"/>
+			<prov:activity prov:ref="ex:a1"/>
+			<prov:time>2012-11-16T16:05:00</prov:time>
+		</prov:wasGeneratedBy>
+		<prov:wasGeneratedBy prov:id="ex:gen1">
+			<prov:entity prov:ref="ex:e1"/>
+			<prov:activity prov:ref="ex:a1"/>
+			<prov:time>2011-11-16T16:05:00</prov:time>
+		</prov:wasGeneratedBy>
 </prov:document>
--- a/testcases/constraints/unification-generation-f5-FAIL-c23.provx	Mon Feb 04 13:12:32 2013 +0100
+++ b/testcases/constraints/unification-generation-f5-FAIL-c23.provx	Mon Feb 04 14:05:43 2013 +0000
@@ -1,19 +1,17 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <prov:document xmlns:prov="http://www.w3.org/ns/prov#" xmlns:prim="http://openprovenance.org/primitives#" xmlns:ex="http://example.org/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
-
         <prov:entity prov:id="ex:e1">
         </prov:entity>
         <prov:activity prov:id="ex:a1">
         </prov:activity>
-
-            <prov:wasGeneratedBy>
-                <prov:time>2012-11-16T16:05:00</prov:time>
-                <prov:entity prov:ref="ex:e1"/>
-                <prov:activity prov:ref="ex:a1"/>
-            </prov:wasGeneratedBy>
-            <prov:wasGeneratedBy prov:id="ex:gen1">
-                <prov:time>2011-11-16T16:05:00</prov:time>
-                <prov:entity prov:ref="ex:e1"/>
-                <prov:activity prov:ref="ex:a1"/>
-            </prov:wasGeneratedBy>
+		<prov:wasGeneratedBy>
+			<prov:entity prov:ref="ex:e1"/>
+			<prov:activity prov:ref="ex:a1"/>
+			<prov:time>2012-11-16T16:05:00</prov:time>
+		</prov:wasGeneratedBy>
+		<prov:wasGeneratedBy prov:id="ex:gen1">
+			<prov:entity prov:ref="ex:e1"/>
+			<prov:activity prov:ref="ex:a1"/>
+			<prov:time>2011-11-16T16:05:00</prov:time>
+		</prov:wasGeneratedBy>
 </prov:document>
--- a/testcases/constraints/unification-generation-f6-FAIL-c23.provx	Mon Feb 04 13:12:32 2013 +0100
+++ b/testcases/constraints/unification-generation-f6-FAIL-c23.provx	Mon Feb 04 14:05:43 2013 +0000
@@ -1,20 +1,17 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <prov:document xmlns:prov="http://www.w3.org/ns/prov#" xmlns:prim="http://openprovenance.org/primitives#" xmlns:ex="http://example.org/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
-
         <prov:entity prov:id="ex:e1">
         </prov:entity>
         <prov:activity prov:id="ex:a1">
         </prov:activity>
-
-            <prov:wasGeneratedBy>
-                <prov:time>2012-11-16T16:05:00</prov:time>
-                <prov:entity prov:ref="ex:e1"/>
-                <prov:activity prov:ref="ex:a1"/>
-            </prov:wasGeneratedBy>
-            <prov:wasGeneratedBy>
-                <prov:time>2011-11-16T16:05:00</prov:time>
-                <prov:entity prov:ref="ex:e1"/>
-                <prov:activity prov:ref="ex:a1"/>
-            </prov:wasGeneratedBy>
-
+		<prov:wasGeneratedBy>
+			<prov:entity prov:ref="ex:e1"/>
+			<prov:activity prov:ref="ex:a1"/>
+			<prov:time>2012-11-16T16:05:00</prov:time>
+		</prov:wasGeneratedBy>
+		<prov:wasGeneratedBy>
+			<prov:entity prov:ref="ex:e1"/>
+			<prov:activity prov:ref="ex:a1"/>
+			<prov:time>2011-11-16T16:05:00</prov:time>
+		</prov:wasGeneratedBy>
 </prov:document>
--- a/testcases/constraints/unification-generation-f7-FAIL-c23.provx	Mon Feb 04 13:12:32 2013 +0100
+++ b/testcases/constraints/unification-generation-f7-FAIL-c23.provx	Mon Feb 04 14:05:43 2013 +0000
@@ -1,24 +1,21 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <prov:document xmlns:prov="http://www.w3.org/ns/prov#" xmlns:prim="http://openprovenance.org/primitives#" xmlns:ex="http://example.org/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
-
         <prov:entity prov:id="ex:e1">
         </prov:entity>
         <prov:activity prov:id="ex:a1">
         </prov:activity>
-
-            <prov:wasGeneratedBy prov:id="ex:gen1">
-                <prov:entity prov:ref="ex:e1"/>
-                <prov:activity prov:ref="ex:a1"/>
-            </prov:wasGeneratedBy>
-            <prov:wasGeneratedBy prov:id="ex:gen1">
-                <prov:time>2012-11-16T16:05:00</prov:time>
-                <prov:entity prov:ref="ex:e1"/>
-                <prov:activity prov:ref="ex:a1"/>
-            </prov:wasGeneratedBy>
-            <prov:wasGeneratedBy>
-                <prov:time>2011-11-16T16:05:00</prov:time>
-                <prov:entity prov:ref="ex:e1"/>
-                <prov:activity prov:ref="ex:a1"/>
-            </prov:wasGeneratedBy>
-
+		<prov:wasGeneratedBy prov:id="ex:gen1">
+			<prov:entity prov:ref="ex:e1"/>
+			<prov:activity prov:ref="ex:a1"/>
+		</prov:wasGeneratedBy>
+		<prov:wasGeneratedBy prov:id="ex:gen1">
+			<prov:entity prov:ref="ex:e1"/>
+			<prov:activity prov:ref="ex:a1"/>
+			<prov:time>2012-11-16T16:05:00</prov:time>
+		</prov:wasGeneratedBy>
+		<prov:wasGeneratedBy>
+			<prov:entity prov:ref="ex:e1"/>
+			<prov:activity prov:ref="ex:a1"/>
+			<prov:time>2011-11-16T16:05:00</prov:time>
+		</prov:wasGeneratedBy>
 </prov:document>
--- a/testcases/constraints/unification-generation-s5-PASS-c23.provx	Mon Feb 04 13:12:32 2013 +0100
+++ b/testcases/constraints/unification-generation-s5-PASS-c23.provx	Mon Feb 04 14:05:43 2013 +0000
@@ -4,16 +4,14 @@
         </prov:entity>
         <prov:activity prov:id="ex:a1">
         </prov:activity>
-
-            <prov:wasGeneratedBy prov:id="ex:gen1">
-                <prov:time>2011-11-16T16:05:00</prov:time>
-                <prov:entity prov:ref="ex:e1"/>
-                <prov:activity prov:ref="ex:a1"/>
-            </prov:wasGeneratedBy>
-            <prov:wasGeneratedBy prov:id="ex:gen1">
-                <prov:time>2011-11-16T16:05:00</prov:time>
-                <prov:entity prov:ref="ex:e1"/>
-                <prov:activity prov:ref="ex:a1"/>
-            </prov:wasGeneratedBy>
-
+		<prov:wasGeneratedBy prov:id="ex:gen1">
+			<prov:entity prov:ref="ex:e1"/>
+			<prov:activity prov:ref="ex:a1"/>
+			<prov:time>2011-11-16T16:05:00</prov:time>
+		</prov:wasGeneratedBy>
+		<prov:wasGeneratedBy prov:id="ex:gen1">
+			<prov:entity prov:ref="ex:e1"/>
+			<prov:activity prov:ref="ex:a1"/>
+			<prov:time>2011-11-16T16:05:00</prov:time>
+		</prov:wasGeneratedBy>
 </prov:document>
--- a/testcases/constraints/unification-generation-s6-PASS-c23.provx	Mon Feb 04 13:12:32 2013 +0100
+++ b/testcases/constraints/unification-generation-s6-PASS-c23.provx	Mon Feb 04 14:05:43 2013 +0000
@@ -4,15 +4,13 @@
         </prov:entity>
         <prov:activity prov:id="ex:a1">
         </prov:activity>
-
             <prov:wasGeneratedBy prov:id="ex:gen1">
                 <prov:entity prov:ref="ex:e1"/>
                 <prov:activity prov:ref="ex:a1"/>
             </prov:wasGeneratedBy>
             <prov:wasGeneratedBy prov:id="ex:gen1">
-                <prov:time>2011-11-16T16:05:00</prov:time>
                 <prov:entity prov:ref="ex:e1"/>
                 <prov:activity prov:ref="ex:a1"/>
+                <prov:time>2011-11-16T16:05:00</prov:time>
             </prov:wasGeneratedBy>
-
 </prov:document>
--- a/testcases/constraints/unification-generation-s7-PASS-c23-c24.provx	Mon Feb 04 13:12:32 2013 +0100
+++ b/testcases/constraints/unification-generation-s7-PASS-c23-c24.provx	Mon Feb 04 14:05:43 2013 +0000
@@ -4,20 +4,18 @@
         </prov:entity>
         <prov:activity prov:id="ex:a1">
         </prov:activity>
-
-            <prov:wasGeneratedBy prov:id="ex:gen1">
-                <prov:entity prov:ref="ex:e1"/>
-                <prov:activity prov:ref="ex:a1"/>
-            </prov:wasGeneratedBy>
-            <prov:wasGeneratedBy prov:id="ex:gen1">
-                <prov:time>2011-11-16T16:05:00</prov:time>
-                <prov:entity prov:ref="ex:e1"/>
-                <prov:activity prov:ref="ex:a1"/>
-            </prov:wasGeneratedBy>
-            <prov:wasGeneratedBy>
-                <prov:time>2011-11-16T16:05:00</prov:time>
-                <prov:entity prov:ref="ex:e1"/>
-                <prov:activity prov:ref="ex:a1"/>
-            </prov:wasGeneratedBy>
-
+		<prov:wasGeneratedBy prov:id="ex:gen1">
+			<prov:entity prov:ref="ex:e1"/>
+			<prov:activity prov:ref="ex:a1"/>
+		</prov:wasGeneratedBy>
+		<prov:wasGeneratedBy prov:id="ex:gen1">
+			<prov:entity prov:ref="ex:e1"/>
+			<prov:activity prov:ref="ex:a1"/>
+			<prov:time>2011-11-16T16:05:00</prov:time>
+		</prov:wasGeneratedBy>
+		<prov:wasGeneratedBy>
+			<prov:entity prov:ref="ex:e1"/>
+			<prov:activity prov:ref="ex:a1"/>
+			<prov:time>2011-11-16T16:05:00</prov:time>
+		</prov:wasGeneratedBy>
 </prov:document>
--- a/testcases/constraints/unification-generation-s8-PASS-c23-c24.provx	Mon Feb 04 13:12:32 2013 +0100
+++ b/testcases/constraints/unification-generation-s8-PASS-c23-c24.provx	Mon Feb 04 14:05:43 2013 +0000
@@ -4,19 +4,17 @@
         </prov:entity>
         <prov:activity prov:id="ex:a1">
         </prov:activity>
-
-            <prov:wasGeneratedBy prov:id="ex:gen1">
-                <prov:entity prov:ref="ex:e1"/>
-                <prov:activity prov:ref="ex:a1"/>
-            </prov:wasGeneratedBy>
-            <prov:wasGeneratedBy prov:id="ex:gen1">
-                <prov:entity prov:ref="ex:e1"/>
-                <prov:activity prov:ref="ex:a1"/>
-            </prov:wasGeneratedBy>
-            <prov:wasGeneratedBy>
-                <prov:time>2011-11-16T16:05:00</prov:time>
-                <prov:entity prov:ref="ex:e1"/>
-                <prov:activity prov:ref="ex:a1"/>
-            </prov:wasGeneratedBy>
-
+		<prov:wasGeneratedBy prov:id="ex:gen1">
+			<prov:entity prov:ref="ex:e1"/>
+			<prov:activity prov:ref="ex:a1"/>
+		</prov:wasGeneratedBy>
+		<prov:wasGeneratedBy prov:id="ex:gen1">
+			<prov:entity prov:ref="ex:e1"/>
+			<prov:activity prov:ref="ex:a1"/>
+		</prov:wasGeneratedBy>
+		<prov:wasGeneratedBy>
+			<prov:entity prov:ref="ex:e1"/>
+			<prov:activity prov:ref="ex:a1"/>
+			<prov:time>2011-11-16T16:05:00</prov:time>
+		</prov:wasGeneratedBy>
 </prov:document>
--- a/testcases/constraints/unification-invalidation-f4-FAIL-c23.provx	Mon Feb 04 13:12:32 2013 +0100
+++ b/testcases/constraints/unification-invalidation-f4-FAIL-c23.provx	Mon Feb 04 14:05:43 2013 +0000
@@ -1,20 +1,17 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <prov:document xmlns:prov="http://www.w3.org/ns/prov#" xmlns:prim="http://openprovenance.org/primitives#" xmlns:ex="http://example.org/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
-
         <prov:entity prov:id="ex:e1">
         </prov:entity>
         <prov:activity prov:id="ex:a1">
         </prov:activity>
-
-            <prov:wasInvalidatedBy prov:id="ex:gen1">
-                <prov:time>2012-11-16T16:05:00</prov:time>
-                <prov:entity prov:ref="ex:e1"/>
-                <prov:activity prov:ref="ex:a1"/>
-            </prov:wasInvalidatedBy>
-            <prov:wasInvalidatedBy prov:id="ex:gen1">
-                <prov:time>2011-11-16T16:05:00</prov:time>
-                <prov:entity prov:ref="ex:e1"/>
-                <prov:activity prov:ref="ex:a1"/>
-            </prov:wasInvalidatedBy>
-
+		<prov:wasInvalidatedBy prov:id="ex:gen1">
+			<prov:entity prov:ref="ex:e1"/>
+			<prov:activity prov:ref="ex:a1"/>
+			<prov:time>2012-11-16T16:05:00</prov:time>
+		</prov:wasInvalidatedBy>
+		<prov:wasInvalidatedBy prov:id="ex:gen1">
+			<prov:entity prov:ref="ex:e1"/>
+			<prov:activity prov:ref="ex:a1"/>
+			<prov:time>2011-11-16T16:05:00</prov:time>
+		</prov:wasInvalidatedBy>
 </prov:document>
--- a/testcases/constraints/unification-invalidation-f5-FAIL-c23-c25.provx	Mon Feb 04 13:12:32 2013 +0100
+++ b/testcases/constraints/unification-invalidation-f5-FAIL-c23-c25.provx	Mon Feb 04 14:05:43 2013 +0000
@@ -1,19 +1,17 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <prov:document xmlns:prov="http://www.w3.org/ns/prov#" xmlns:prim="http://openprovenance.org/primitives#" xmlns:ex="http://example.org/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
-
         <prov:entity prov:id="ex:e1">
         </prov:entity>
         <prov:activity prov:id="ex:a1">
         </prov:activity>
-
-            <prov:wasInvalidatedBy>
-                <prov:time>2012-11-16T16:05:00</prov:time>
-                <prov:entity prov:ref="ex:e1"/>
-                <prov:activity prov:ref="ex:a1"/>
-            </prov:wasInvalidatedBy>
-            <prov:wasInvalidatedBy prov:id="ex:gen1">
-                <prov:time>2011-11-16T16:05:00</prov:time>
-                <prov:entity prov:ref="ex:e1"/>
-                <prov:activity prov:ref="ex:a1"/>
-            </prov:wasInvalidatedBy>
+		<prov:wasInvalidatedBy>
+			<prov:entity prov:ref="ex:e1"/>
+			<prov:activity prov:ref="ex:a1"/>
+			<prov:time>2012-11-16T16:05:00</prov:time>
+		</prov:wasInvalidatedBy>
+		<prov:wasInvalidatedBy prov:id="ex:gen1">
+			<prov:entity prov:ref="ex:e1"/>
+			<prov:activity prov:ref="ex:a1"/>
+			<prov:time>2011-11-16T16:05:00</prov:time>
+		</prov:wasInvalidatedBy>
 </prov:document>
--- a/testcases/constraints/unification-invalidation-f6-FAIL-c23-c25.provx	Mon Feb 04 13:12:32 2013 +0100
+++ b/testcases/constraints/unification-invalidation-f6-FAIL-c23-c25.provx	Mon Feb 04 14:05:43 2013 +0000
@@ -1,20 +1,17 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <prov:document xmlns:prov="http://www.w3.org/ns/prov#" xmlns:prim="http://openprovenance.org/primitives#" xmlns:ex="http://example.org/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
-
         <prov:entity prov:id="ex:e1">
         </prov:entity>
         <prov:activity prov:id="ex:a1">
         </prov:activity>
-
-            <prov:wasInvalidatedBy>
-                <prov:time>2012-11-16T16:05:00</prov:time>
-                <prov:entity prov:ref="ex:e1"/>
-                <prov:activity prov:ref="ex:a1"/>
-            </prov:wasInvalidatedBy>
-            <prov:wasInvalidatedBy>
-                <prov:time>2011-11-16T16:05:00</prov:time>
-                <prov:entity prov:ref="ex:e1"/>
-                <prov:activity prov:ref="ex:a1"/>
-            </prov:wasInvalidatedBy>
-
+		<prov:wasInvalidatedBy>
+			<prov:entity prov:ref="ex:e1"/>
+			<prov:activity prov:ref="ex:a1"/>
+			<prov:time>2012-11-16T16:05:00</prov:time>
+		</prov:wasInvalidatedBy>
+		<prov:wasInvalidatedBy>
+			<prov:entity prov:ref="ex:e1"/>
+			<prov:activity prov:ref="ex:a1"/>
+			<prov:time>2011-11-16T16:05:00</prov:time>
+		</prov:wasInvalidatedBy>
 </prov:document>
--- a/testcases/constraints/unification-invalidation-f7-FAIL-c23-c25.provx	Mon Feb 04 13:12:32 2013 +0100
+++ b/testcases/constraints/unification-invalidation-f7-FAIL-c23-c25.provx	Mon Feb 04 14:05:43 2013 +0000
@@ -1,24 +1,21 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <prov:document xmlns:prov="http://www.w3.org/ns/prov#" xmlns:prim="http://openprovenance.org/primitives#" xmlns:ex="http://example.org/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
-
         <prov:entity prov:id="ex:e1">
         </prov:entity>
         <prov:activity prov:id="ex:a1">
         </prov:activity>
-
-            <prov:wasInvalidatedBy prov:id="ex:gen1">
-                <prov:entity prov:ref="ex:e1"/>
-                <prov:activity prov:ref="ex:a1"/>
-            </prov:wasInvalidatedBy>
-            <prov:wasInvalidatedBy prov:id="ex:gen1">
-                <prov:time>2012-11-16T16:05:00</prov:time>
-                <prov:entity prov:ref="ex:e1"/>
-                <prov:activity prov:ref="ex:a1"/>
-            </prov:wasInvalidatedBy>
-            <prov:wasInvalidatedBy>
-                <prov:time>2011-11-16T16:05:00</prov:time>
-                <prov:entity prov:ref="ex:e1"/>
-                <prov:activity prov:ref="ex:a1"/>
-            </prov:wasInvalidatedBy>
-
+		<prov:wasInvalidatedBy prov:id="ex:gen1">
+			<prov:entity prov:ref="ex:e1"/>
+			<prov:activity prov:ref="ex:a1"/>
+		</prov:wasInvalidatedBy>
+		<prov:wasInvalidatedBy prov:id="ex:gen1">
+			<prov:entity prov:ref="ex:e1"/>
+			<prov:activity prov:ref="ex:a1"/>
+			<prov:time>2012-11-16T16:05:00</prov:time>
+		</prov:wasInvalidatedBy>
+		<prov:wasInvalidatedBy>
+			<prov:entity prov:ref="ex:e1"/>
+			<prov:activity prov:ref="ex:a1"/>
+			<prov:time>2011-11-16T16:05:00</prov:time>
+		</prov:wasInvalidatedBy>
 </prov:document>
--- a/testcases/constraints/unification-invalidation-s5-PASS-c23.provx	Mon Feb 04 13:12:32 2013 +0100
+++ b/testcases/constraints/unification-invalidation-s5-PASS-c23.provx	Mon Feb 04 14:05:43 2013 +0000
@@ -4,16 +4,14 @@
         </prov:entity>
         <prov:activity prov:id="ex:a1">
         </prov:activity>
-
-            <prov:wasInvalidatedBy prov:id="ex:gen1">
-                <prov:time>2011-11-16T16:05:00</prov:time>
-                <prov:entity prov:ref="ex:e1"/>
-                <prov:activity prov:ref="ex:a1"/>
-            </prov:wasInvalidatedBy>
-            <prov:wasInvalidatedBy prov:id="ex:gen1">
-                <prov:time>2011-11-16T16:05:00</prov:time>
-                <prov:entity prov:ref="ex:e1"/>
-                <prov:activity prov:ref="ex:a1"/>
-            </prov:wasInvalidatedBy>
-
+		<prov:wasInvalidatedBy prov:id="ex:gen1">
+			<prov:entity prov:ref="ex:e1"/>
+			<prov:activity prov:ref="ex:a1"/>
+			<prov:time>2011-11-16T16:05:00</prov:time>
+		</prov:wasInvalidatedBy>
+		<prov:wasInvalidatedBy prov:id="ex:gen1">
+			<prov:entity prov:ref="ex:e1"/>
+			<prov:activity prov:ref="ex:a1"/>
+			<prov:time>2011-11-16T16:05:00</prov:time>
+		</prov:wasInvalidatedBy>
 </prov:document>
--- a/testcases/constraints/unification-invalidation-s6-PASS-c23.provx	Mon Feb 04 13:12:32 2013 +0100
+++ b/testcases/constraints/unification-invalidation-s6-PASS-c23.provx	Mon Feb 04 14:05:43 2013 +0000
@@ -4,15 +4,13 @@
         </prov:entity>
         <prov:activity prov:id="ex:a1">
         </prov:activity>
-
-            <prov:wasInvalidatedBy prov:id="ex:gen1">
-                <prov:entity prov:ref="ex:e1"/>
-                <prov:activity prov:ref="ex:a1"/>
-            </prov:wasInvalidatedBy>
-            <prov:wasInvalidatedBy prov:id="ex:gen1">
-                <prov:time>2011-11-16T16:05:00</prov:time>
-                <prov:entity prov:ref="ex:e1"/>
-                <prov:activity prov:ref="ex:a1"/>
-            </prov:wasInvalidatedBy>
-
+		<prov:wasInvalidatedBy prov:id="ex:gen1">
+			<prov:entity prov:ref="ex:e1"/>
+			<prov:activity prov:ref="ex:a1"/>
+		</prov:wasInvalidatedBy>
+		<prov:wasInvalidatedBy prov:id="ex:gen1">
+			<prov:entity prov:ref="ex:e1"/>
+			<prov:activity prov:ref="ex:a1"/>
+			<prov:time>2011-11-16T16:05:00</prov:time>
+		</prov:wasInvalidatedBy>
 </prov:document>
--- a/testcases/constraints/unification-invalidation-s7-PASS-c23-c25.provx	Mon Feb 04 13:12:32 2013 +0100
+++ b/testcases/constraints/unification-invalidation-s7-PASS-c23-c25.provx	Mon Feb 04 14:05:43 2013 +0000
@@ -4,20 +4,18 @@
         </prov:entity>
         <prov:activity prov:id="ex:a1">
         </prov:activity>
-
-            <prov:wasInvalidatedBy prov:id="ex:gen1">
-                <prov:entity prov:ref="ex:e1"/>
-                <prov:activity prov:ref="ex:a1"/>
-            </prov:wasInvalidatedBy>
-            <prov:wasInvalidatedBy prov:id="ex:gen1">
-                <prov:time>2011-11-16T16:05:00</prov:time>
-                <prov:entity prov:ref="ex:e1"/>
-                <prov:activity prov:ref="ex:a1"/>
-            </prov:wasInvalidatedBy>
-            <prov:wasInvalidatedBy>
-                <prov:time>2011-11-16T16:05:00</prov:time>
-                <prov:entity prov:ref="ex:e1"/>
-                <prov:activity prov:ref="ex:a1"/>
-            </prov:wasInvalidatedBy>
-
+		<prov:wasInvalidatedBy prov:id="ex:gen1">
+			<prov:entity prov:ref="ex:e1"/>
+			<prov:activity prov:ref="ex:a1"/>
+		</prov:wasInvalidatedBy>
+		<prov:wasInvalidatedBy prov:id="ex:gen1">
+			<prov:entity prov:ref="ex:e1"/>
+			<prov:activity prov:ref="ex:a1"/>
+			<prov:time>2011-11-16T16:05:00</prov:time>
+		</prov:wasInvalidatedBy>
+		<prov:wasInvalidatedBy>
+			<prov:entity prov:ref="ex:e1"/>
+			<prov:activity prov:ref="ex:a1"/>
+			<prov:time>2011-11-16T16:05:00</prov:time>
+		</prov:wasInvalidatedBy>
 </prov:document>
--- a/testcases/constraints/unification-invalidation-s8-PASS-c23-c25.provx	Mon Feb 04 13:12:32 2013 +0100
+++ b/testcases/constraints/unification-invalidation-s8-PASS-c23-c25.provx	Mon Feb 04 14:05:43 2013 +0000
@@ -4,7 +4,6 @@
         </prov:entity>
         <prov:activity prov:id="ex:a1">
         </prov:activity>
-
             <prov:wasInvalidatedBy prov:id="ex:gen1">
                 <prov:entity prov:ref="ex:e1"/>
                 <prov:activity prov:ref="ex:a1"/>
@@ -14,9 +13,8 @@
                 <prov:activity prov:ref="ex:a1"/>
             </prov:wasInvalidatedBy>
             <prov:wasInvalidatedBy>
-                <prov:time>2011-11-16T16:05:00</prov:time>
                 <prov:entity prov:ref="ex:e1"/>
                 <prov:activity prov:ref="ex:a1"/>
+                <prov:time>2011-11-16T16:05:00</prov:time>
             </prov:wasInvalidatedBy>
-
 </prov:document>
--- a/testcases/constraints/unification-start-f1-FAIL-c23.provx	Mon Feb 04 13:12:32 2013 +0100
+++ b/testcases/constraints/unification-start-f1-FAIL-c23.provx	Mon Feb 04 14:05:43 2013 +0000
@@ -1,23 +1,19 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <prov:document xmlns:prov="http://www.w3.org/ns/prov#" xmlns:prim="http://openprovenance.org/primitives#" xmlns:ex="http://example.org/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
-
         <prov:entity prov:id="ex:e1">
         </prov:entity>
         <prov:activity prov:id="ex:a1">
         </prov:activity>
         <prov:activity prov:id="ex:a2">
         </prov:activity>
-
-            <prov:wasStartedBy prov:id="ex:start1">
-                <prov:activity prov:ref="ex:a1"/>
-                <prov:trigger prov:ref="ex:e1"/>
-                <prov:starter prov:ref="ex:a2"/>
-            </prov:wasStartedBy>
-            <prov:wasStartedBy prov:id="ex:start1"> 
-                <prov:activity prov:ref="ex:a1-other"/>  <!-- unable to unify -->
-                <prov:trigger prov:ref="ex:e1"/>
-                <prov:starter prov:ref="ex:a2"/>
-            </prov:wasStartedBy>
-
-
+		<prov:wasStartedBy prov:id="ex:start1">
+			<prov:activity prov:ref="ex:a1"/>
+			<prov:trigger prov:ref="ex:e1"/>
+			<prov:starter prov:ref="ex:a2"/>
+		</prov:wasStartedBy>
+		<prov:wasStartedBy prov:id="ex:start1"> 
+			<prov:activity prov:ref="ex:a1-other"/>  <!-- unable to unify -->
+			<prov:trigger prov:ref="ex:e1"/>
+			<prov:starter prov:ref="ex:a2"/>
+		</prov:wasStartedBy>
 </prov:document>
--- a/testcases/constraints/unification-start-f2-FAIL-c23.provx	Mon Feb 04 13:12:32 2013 +0100
+++ b/testcases/constraints/unification-start-f2-FAIL-c23.provx	Mon Feb 04 14:05:43 2013 +0000
@@ -1,22 +1,19 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <prov:document xmlns:prov="http://www.w3.org/ns/prov#" xmlns:prim="http://openprovenance.org/primitives#" xmlns:ex="http://example.org/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
-
         <prov:entity prov:id="ex:e1">
         </prov:entity>
         <prov:activity prov:id="ex:a1">
         </prov:activity>
         <prov:activity prov:id="ex:a2">
         </prov:activity>
-
-            <prov:wasStartedBy prov:id="ex:start1">
-                <prov:activity prov:ref="ex:a1"/>
-                <prov:trigger prov:ref="ex:e1"/>
-                <prov:starter prov:ref="ex:a2"/>
-            </prov:wasStartedBy>
-            <prov:wasStartedBy prov:id="ex:start1"> 
-                <prov:activity prov:ref="ex:a1"/>  
-                <prov:trigger prov:ref="ex:e1-other"/><!-- unable to unify -->
-                <prov:starter prov:ref="ex:a2"/>
-            </prov:wasStartedBy>
-
+		<prov:wasStartedBy prov:id="ex:start1">
+			<prov:activity prov:ref="ex:a1"/>
+			<prov:trigger prov:ref="ex:e1"/>
+			<prov:starter prov:ref="ex:a2"/>
+		</prov:wasStartedBy>
+		<prov:wasStartedBy prov:id="ex:start1"> 
+			<prov:activity prov:ref="ex:a1"/>  
+			<prov:trigger prov:ref="ex:e1-other"/><!-- unable to unify -->
+			<prov:starter prov:ref="ex:a2"/>
+		</prov:wasStartedBy>
 </prov:document>
--- a/testcases/constraints/unification-start-f3-FAIL-c23.provx	Mon Feb 04 13:12:32 2013 +0100
+++ b/testcases/constraints/unification-start-f3-FAIL-c23.provx	Mon Feb 04 14:05:43 2013 +0000
@@ -1,22 +1,19 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <prov:document xmlns:prov="http://www.w3.org/ns/prov#" xmlns:prim="http://openprovenance.org/primitives#" xmlns:ex="http://example.org/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
-
         <prov:entity prov:id="ex:e1">
         </prov:entity>
         <prov:activity prov:id="ex:a1">
         </prov:activity>
         <prov:activity prov:id="ex:a2">
         </prov:activity>
-
-            <prov:wasStartedBy prov:id="ex:start1">
-                <prov:activity prov:ref="ex:a1"/>
-                <prov:trigger prov:ref="ex:e1"/>
-                <prov:starter prov:ref="ex:a2"/>
-            </prov:wasStartedBy>
-            <prov:wasStartedBy prov:id="ex:start1"> 
-                <prov:activity prov:ref="ex:a1"/>  
-                <prov:trigger prov:ref="ex:e1"/>
-                <prov:starter prov:ref="ex:a2-other"/><!-- unable to unify -->
-            </prov:wasStartedBy>
-
+		<prov:wasStartedBy prov:id="ex:start1">
+			<prov:activity prov:ref="ex:a1"/>
+			<prov:trigger prov:ref="ex:e1"/>
+			<prov:starter prov:ref="ex:a2"/>
+		</prov:wasStartedBy>
+		<prov:wasStartedBy prov:id="ex:start1"> 
+			<prov:activity prov:ref="ex:a1"/>  
+			<prov:trigger prov:ref="ex:e1"/>
+			<prov:starter prov:ref="ex:a2-other"/><!-- unable to unify -->
+		</prov:wasStartedBy>
 </prov:document>
--- a/testcases/constraints/unification-start-f4-FAIL-c26.provx	Mon Feb 04 13:12:32 2013 +0100
+++ b/testcases/constraints/unification-start-f4-FAIL-c26.provx	Mon Feb 04 14:05:43 2013 +0000
@@ -1,22 +1,19 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <prov:document xmlns:prov="http://www.w3.org/ns/prov#" xmlns:prim="http://openprovenance.org/primitives#" xmlns:ex="http://example.org/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
-
         <prov:entity prov:id="ex:e1">
         </prov:entity>
         <prov:activity prov:id="ex:a1">
         </prov:activity>
         <prov:activity prov:id="ex:a2">
         </prov:activity>
-
-            <prov:wasStartedBy prov:id="ex:start1">
-                <prov:activity prov:ref="ex:a1"/>
-                <prov:trigger prov:ref="ex:e1"/>
-                <prov:starter prov:ref="ex:a2"/>
-            </prov:wasStartedBy>
-            <prov:wasStartedBy prov:id="ex:start1-other">  <!-- unable to unify, simulatenous start -->
-                <prov:activity prov:ref="ex:a1"/>  
-                <prov:trigger prov:ref="ex:e1"/>
-                <prov:starter prov:ref="ex:a2"/>
-            </prov:wasStartedBy>
-
+		<prov:wasStartedBy prov:id="ex:start1">
+			<prov:activity prov:ref="ex:a1"/>
+			<prov:trigger prov:ref="ex:e1"/>
+			<prov:starter prov:ref="ex:a2"/>
+		</prov:wasStartedBy>
+		<prov:wasStartedBy prov:id="ex:start1-other">  <!-- unable to unify, simulatenous start -->
+			<prov:activity prov:ref="ex:a1"/>  
+			<prov:trigger prov:ref="ex:e1"/>
+			<prov:starter prov:ref="ex:a2"/>
+		</prov:wasStartedBy>
 </prov:document>
--- a/testcases/constraints/unification-start-f5-FAIL-c23.provx	Mon Feb 04 13:12:32 2013 +0100
+++ b/testcases/constraints/unification-start-f5-FAIL-c23.provx	Mon Feb 04 14:05:43 2013 +0000
@@ -1,24 +1,21 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <prov:document xmlns:prov="http://www.w3.org/ns/prov#" xmlns:prim="http://openprovenance.org/primitives#" xmlns:ex="http://example.org/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
-
         <prov:entity prov:id="ex:e1">
         </prov:entity>
         <prov:activity prov:id="ex:a1">
         </prov:activity>
         <prov:activity prov:id="ex:a2">
         </prov:activity>
-
-            <prov:wasStartedBy prov:id="ex:start1">
-	        <prov:time>2012-11-16T16:05:00</prov:time>
-                <prov:activity prov:ref="ex:a1"/>
-                <prov:trigger prov:ref="ex:e1"/>
-                <prov:starter prov:ref="ex:a2"/>
-            </prov:wasStartedBy>
-            <prov:wasStartedBy prov:id="ex:start1"> 
-	        <prov:time>2011-11-16T16:05:00</prov:time>  <!-- fails to unify -->
-                <prov:activity prov:ref="ex:a1"/>
-                <prov:trigger prov:ref="ex:e1"/>
-                <prov:starter prov:ref="ex:a2"/>
-            </prov:wasStartedBy>
-
+		<prov:wasStartedBy prov:id="ex:start1">
+			<prov:activity prov:ref="ex:a1"/>
+			<prov:trigger prov:ref="ex:e1"/>
+			<prov:starter prov:ref="ex:a2"/>
+			<prov:time>2012-11-16T16:05:00</prov:time>
+		</prov:wasStartedBy>
+		<prov:wasStartedBy prov:id="ex:start1"> 
+			<prov:activity prov:ref="ex:a1"/>
+			<prov:trigger prov:ref="ex:e1"/>
+			<prov:starter prov:ref="ex:a2"/>
+			<prov:time>2011-11-16T16:05:00</prov:time>  <!-- fails to unify -->
+		</prov:wasStartedBy>
 </prov:document>
--- a/testcases/constraints/unification-start-f6-FAIL-c23.provx	Mon Feb 04 13:12:32 2013 +0100
+++ b/testcases/constraints/unification-start-f6-FAIL-c23.provx	Mon Feb 04 14:05:43 2013 +0000
@@ -1,30 +1,23 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <prov:document xmlns:prov="http://www.w3.org/ns/prov#" xmlns:prim="http://openprovenance.org/primitives#" xmlns:ex="http://example.org/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
-
         <prov:entity prov:id="ex:e1">
         </prov:entity>
         <prov:activity prov:id="ex:a1">
         </prov:activity>
         <prov:activity prov:id="ex:a2">
         </prov:activity>
-
-            <prov:wasStartedBy prov:id="ex:start1">
-	        <prov:time>2012-11-16T16:05:00</prov:time>
-                <prov:activity prov:ref="ex:a1"/>
-                <prov:starter prov:ref="ex:a2"/>
-            </prov:wasStartedBy>
-
-
-            <prov:wasStartedBy prov:id="ex:start1">
-	        <prov:time>2011-11-16T16:05:00</prov:time>
-                <prov:activity prov:ref="ex:a1"/>
-
-            </prov:wasStartedBy>
-
-            <prov:wasStartedBy>
-                <prov:activity prov:ref="ex:a1"/>
-                <prov:trigger prov:ref="ex:e1"/>
-                <prov:starter prov:ref="ex:a2"/>
-            </prov:wasStartedBy>
-
+		<prov:wasStartedBy prov:id="ex:start1">
+			<prov:activity prov:ref="ex:a1"/>
+			<prov:starter prov:ref="ex:a2"/>
+			<prov:time>2012-11-16T16:05:00</prov:time>
+		</prov:wasStartedBy>
+		<prov:wasStartedBy prov:id="ex:start1">
+			<prov:activity prov:ref="ex:a1"/>
+			<prov:time>2011-11-16T16:05:00</prov:time>
+		</prov:wasStartedBy>
+		<prov:wasStartedBy>
+			<prov:activity prov:ref="ex:a1"/>
+			<prov:trigger prov:ref="ex:e1"/>
+			<prov:starter prov:ref="ex:a2"/>
+		</prov:wasStartedBy>
 </prov:document>
--- a/testcases/constraints/unification-start-f7-FAIL-c23.provx	Mon Feb 04 13:12:32 2013 +0100
+++ b/testcases/constraints/unification-start-f7-FAIL-c23.provx	Mon Feb 04 14:05:43 2013 +0000
@@ -1,29 +1,23 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <prov:document xmlns:prov="http://www.w3.org/ns/prov#" xmlns:prim="http://openprovenance.org/primitives#" xmlns:ex="http://example.org/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
-
         <prov:entity prov:id="ex:e1">
         </prov:entity>
         <prov:activity prov:id="ex:a1">
         </prov:activity>
         <prov:activity prov:id="ex:a2">
         </prov:activity>
-
-            <prov:wasStartedBy prov:id="ex:start1">
-                <prov:activity prov:ref="ex:a1"/>
-                <prov:starter prov:ref="ex:a2"/>
-            </prov:wasStartedBy>
-
-
-            <prov:wasStartedBy prov:id="ex:start1">
-	        <prov:time>2011-11-16T16:05:00</prov:time>  
-                <prov:activity prov:ref="ex:a1"/>
-
-            </prov:wasStartedBy>
-
-            <prov:wasStartedBy>
-	        <prov:time>2012-11-16T16:05:00</prov:time>  <!-- mismatch -->
-                <prov:activity prov:ref="ex:a1"/>
-                <prov:trigger prov:ref="ex:e1"/>
-                <prov:starter prov:ref="ex:a2"/>
-            </prov:wasStartedBy>
+		<prov:wasStartedBy prov:id="ex:start1">
+			<prov:activity prov:ref="ex:a1"/>
+			<prov:starter prov:ref="ex:a2"/>
+		</prov:wasStartedBy>
+		<prov:wasStartedBy prov:id="ex:start1">
+			<prov:activity prov:ref="ex:a1"/>
+			<prov:time>2011-11-16T16:05:00</prov:time>  
+		</prov:wasStartedBy>
+		<prov:wasStartedBy>
+			<prov:activity prov:ref="ex:a1"/>
+			<prov:trigger prov:ref="ex:e1"/>
+			<prov:starter prov:ref="ex:a2"/>
+			<prov:time>2012-11-16T16:05:00</prov:time>  <!-- mismatch -->
+		</prov:wasStartedBy>
 </prov:document>
--- a/testcases/constraints/unification-start-f8-FAIL-c23.provx	Mon Feb 04 13:12:32 2013 +0100
+++ b/testcases/constraints/unification-start-f8-FAIL-c23.provx	Mon Feb 04 14:05:43 2013 +0000
@@ -1,31 +1,24 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <prov:document xmlns:prov="http://www.w3.org/ns/prov#" xmlns:prim="http://openprovenance.org/primitives#" xmlns:ex="http://example.org/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
-
         <prov:entity prov:id="ex:e1">
         </prov:entity>
         <prov:activity prov:id="ex:a1">
         </prov:activity>
         <prov:activity prov:id="ex:a2">
         </prov:activity>
-
-            <prov:wasStartedBy prov:id="ex:start1">
-	        <prov:time>2013-11-16T16:05:00</prov:time>
-                <prov:activity prov:ref="ex:a1"/>
-                <prov:starter prov:ref="ex:a2"/>
-            </prov:wasStartedBy>
-
-
-            <prov:wasStartedBy prov:id="ex:start1">
-	        <prov:time>2011-11-16T16:05:00</prov:time> <!-- first failed unify -->
-                <prov:activity prov:ref="ex:a1"/>
-
-            </prov:wasStartedBy>
-
-            <prov:wasStartedBy>
-	        <prov:time>2012-11-16T16:05:00</prov:time> <!-- second failed unify -->
-                <prov:activity prov:ref="ex:a1"/>
-                <prov:trigger prov:ref="ex:e1"/>
-                <prov:starter prov:ref="ex:a2"/>
-            </prov:wasStartedBy>
-
+		<prov:wasStartedBy prov:id="ex:start1">
+			<prov:activity prov:ref="ex:a1"/>
+			<prov:starter prov:ref="ex:a2"/>
+			<prov:time>2013-11-16T16:05:00</prov:time>
+		</prov:wasStartedBy>
+		<prov:wasStartedBy prov:id="ex:start1">
+			<prov:activity prov:ref="ex:a1"/>
+			<prov:time>2011-11-16T16:05:00</prov:time> <!-- first failed unify -->
+		</prov:wasStartedBy>
+		<prov:wasStartedBy>
+			<prov:activity prov:ref="ex:a1"/>
+			<prov:trigger prov:ref="ex:e1"/>
+			<prov:starter prov:ref="ex:a2"/>
+			<prov:time>2012-11-16T16:05:00</prov:time> <!-- second failed unify -->
+		</prov:wasStartedBy>
 </prov:document>
--- a/testcases/constraints/unification-start-s1-PASS-c26.provx	Mon Feb 04 13:12:32 2013 +0100
+++ b/testcases/constraints/unification-start-s1-PASS-c26.provx	Mon Feb 04 14:05:43 2013 +0000
@@ -6,16 +6,14 @@
         </prov:activity>
         <prov:activity prov:id="ex:a2">
         </prov:activity>
-
-            <prov:wasStartedBy prov:id="ex:start1">
-                <prov:activity prov:ref="ex:a1"/>
-                <prov:trigger prov:ref="ex:e1"/>
-                <prov:starter prov:ref="ex:a2"/>
-            </prov:wasStartedBy>
-            <prov:wasStartedBy>  <!-- able to unify the start id -->
-                <prov:activity prov:ref="ex:a1"/>
-                <prov:trigger prov:ref="ex:e1"/>
-                <prov:starter prov:ref="ex:a2"/>
-            </prov:wasStartedBy>
-
+		<prov:wasStartedBy prov:id="ex:start1">
+			<prov:activity prov:ref="ex:a1"/>
+			<prov:trigger prov:ref="ex:e1"/>
+			<prov:starter prov:ref="ex:a2"/>
+		</prov:wasStartedBy>
+		<prov:wasStartedBy>  <!-- able to unify the start id -->
+			<prov:activity prov:ref="ex:a1"/>
+			<prov:trigger prov:ref="ex:e1"/>
+			<prov:starter prov:ref="ex:a2"/>
+		</prov:wasStartedBy>
 </prov:document>
--- a/testcases/constraints/unification-start-s2-PASS-c26.provx	Mon Feb 04 13:12:32 2013 +0100
+++ b/testcases/constraints/unification-start-s2-PASS-c26.provx	Mon Feb 04 14:05:43 2013 +0000
@@ -6,18 +6,16 @@
         </prov:activity>
         <prov:activity prov:id="ex:a2">
         </prov:activity>
-
         <prov:wasStartedBy prov:id="ex:start1">
-          <prov:activity prov:ref="ex:a1"/>
-          <prov:trigger prov:ref="ex:e1"/>
-          <prov:starter prov:ref="ex:a2"/>
+            <prov:activity prov:ref="ex:a1"/>
+            <prov:trigger prov:ref="ex:e1"/>
+            <prov:starter prov:ref="ex:a2"/>
         </prov:wasStartedBy>
-
         <prov:wasStartedBy>
-	  <!-- able to unify the start id -->
-          <prov:activity prov:ref="ex:a1"/>
-	  <!-- able to unify the trigger id -->
-          <prov:starter prov:ref="ex:a2"/>
+            <!-- able to unify the start id -->
+            <prov:activity prov:ref="ex:a1"/>
+	        <!-- able to unify the trigger id -->
+            <prov:starter prov:ref="ex:a2"/>
         </prov:wasStartedBy>
 
 </prov:document>
--- a/testcases/constraints/unification-start-s3-PASS-c26.provx	Mon Feb 04 13:12:32 2013 +0100
+++ b/testcases/constraints/unification-start-s3-PASS-c26.provx	Mon Feb 04 14:05:43 2013 +0000
@@ -6,18 +6,17 @@
         </prov:activity>
         <prov:activity prov:id="ex:a2">
         </prov:activity>
-
         <prov:wasStartedBy prov:id="ex:start1">
-          <!-- able to unify time -->
-          <prov:activity prov:ref="ex:a1"/>
-          <prov:trigger prov:ref="ex:e1"/>
-          <prov:starter prov:ref="ex:a2"/>
+			<!-- able to unify time -->
+			<prov:activity prov:ref="ex:a1"/>
+			<prov:trigger prov:ref="ex:e1"/>
+			<prov:starter prov:ref="ex:a2"/>
         </prov:wasStartedBy>
         <prov:wasStartedBy>
-	  <prov:time>2011-11-16T16:05:00</prov:time>
-	  <!-- able to unify the start id -->
-          <prov:activity prov:ref="ex:a1"/>
-	  <!-- able to unify the trigger id -->
-          <prov:starter prov:ref="ex:a2"/>
+			<!-- able to unify the start id -->
+			<prov:activity prov:ref="ex:a1"/>
+			<!-- able to unify the trigger id -->
+			<prov:starter prov:ref="ex:a2"/>
+			<prov:time>2011-11-16T16:05:00</prov:time>
         </prov:wasStartedBy>
 </prov:document>
--- a/testcases/constraints/unification-start-s4-PASS-c26.provx	Mon Feb 04 13:12:32 2013 +0100
+++ b/testcases/constraints/unification-start-s4-PASS-c26.provx	Mon Feb 04 14:05:43 2013 +0000
@@ -1,17 +1,15 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <prov:document xmlns:prov="http://www.w3.org/ns/prov#" xmlns:prim="http://openprovenance.org/primitives#" xmlns:ex="http://example.org/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
-
         <prov:entity prov:id="ex:e1">
         </prov:entity>
         <prov:activity prov:id="ex:a1">
         </prov:activity>
         <prov:activity prov:id="ex:a2">
         </prov:activity>
-
             <prov:wasStartedBy>
-	         <!-- able to unify the start id -->
+				<!-- able to unify the start id -->
                 <prov:activity prov:ref="ex:a1"/>
-		<!-- able to unify the trigger id -->
+				<!-- able to unify the trigger id -->
                 <prov:starter prov:ref="ex:a2"/>
             </prov:wasStartedBy>
             <prov:wasStartedBy prov:id="ex:start1">
@@ -19,5 +17,4 @@
                 <prov:trigger prov:ref="ex:e1"/>
                 <prov:starter prov:ref="ex:a2"/>
             </prov:wasStartedBy>
-
 </prov:document>
--- a/testcases/constraints/unification-start-s5-PASS-c23-c26.provx	Mon Feb 04 13:12:32 2013 +0100
+++ b/testcases/constraints/unification-start-s5-PASS-c23-c26.provx	Mon Feb 04 14:05:43 2013 +0000
@@ -1,27 +1,22 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <prov:document xmlns:prov="http://www.w3.org/ns/prov#" xmlns:prim="http://openprovenance.org/primitives#" xmlns:ex="http://example.org/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
-
         <prov:entity prov:id="ex:e1">
         </prov:entity>
         <prov:activity prov:id="ex:a1">
         </prov:activity>
         <prov:activity prov:id="ex:a2">
         </prov:activity>
-
-            <prov:wasStartedBy prov:id="ex:start1">
-                <prov:activity prov:ref="ex:a1"/>
-                <prov:starter prov:ref="ex:a2"/>
-            </prov:wasStartedBy>
-
-
-            <prov:wasStartedBy prov:id="ex:start1">
-                <prov:activity prov:ref="ex:a1"/>
-	        <prov:time>2011-11-16T16:05:00</prov:time>
-            </prov:wasStartedBy>
-
-            <prov:wasStartedBy>
-                <prov:activity prov:ref="ex:a1"/>
-                <prov:trigger prov:ref="ex:e1"/>
-                <prov:starter prov:ref="ex:a2"/>
-            </prov:wasStartedBy>
+		<prov:wasStartedBy prov:id="ex:start1">
+			<prov:activity prov:ref="ex:a1"/>
+			<prov:starter prov:ref="ex:a2"/>
+		</prov:wasStartedBy>
+		<prov:wasStartedBy prov:id="ex:start1">
+			<prov:activity prov:ref="ex:a1"/>
+			<prov:time>2011-11-16T16:05:00</prov:time>
+		</prov:wasStartedBy>
+		<prov:wasStartedBy>
+			<prov:activity prov:ref="ex:a1"/>
+			<prov:trigger prov:ref="ex:e1"/>
+			<prov:starter prov:ref="ex:a2"/>
+		</prov:wasStartedBy>
 </prov:document>
--- a/testcases/constraints/unification-start-s6-PASS-c23-c26.provx	Mon Feb 04 13:12:32 2013 +0100
+++ b/testcases/constraints/unification-start-s6-PASS-c23-c26.provx	Mon Feb 04 14:05:43 2013 +0000
@@ -1,27 +1,22 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <prov:document xmlns:prov="http://www.w3.org/ns/prov#" xmlns:prim="http://openprovenance.org/primitives#" xmlns:ex="http://example.org/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
-
         <prov:entity prov:id="ex:e1">
         </prov:entity>
         <prov:activity prov:id="ex:a1">
         </prov:activity>
         <prov:activity prov:id="ex:a2">
         </prov:activity>
-
-            <prov:wasStartedBy prov:id="ex:start1">
-	        <prov:time>2011-11-16T16:05:00</prov:time>
-                <prov:activity prov:ref="ex:a1"/>
-            </prov:wasStartedBy>
-
-            <prov:wasStartedBy>
-                <prov:activity prov:ref="ex:a1"/>
-                <prov:trigger prov:ref="ex:e1"/>
-                <prov:starter prov:ref="ex:a2"/>
-            </prov:wasStartedBy>
-
-            <prov:wasStartedBy prov:id="ex:start1">
-                <prov:activity prov:ref="ex:a1"/>
-                <prov:starter prov:ref="ex:a2"/>
-            </prov:wasStartedBy>
-
+		<prov:wasStartedBy prov:id="ex:start1">
+			<prov:activity prov:ref="ex:a1"/>
+			<prov:time>2011-11-16T16:05:00</prov:time>
+		</prov:wasStartedBy>
+		<prov:wasStartedBy>
+			<prov:activity prov:ref="ex:a1"/>
+			<prov:trigger prov:ref="ex:e1"/>
+			<prov:starter prov:ref="ex:a2"/>
+		</prov:wasStartedBy>
+		<prov:wasStartedBy prov:id="ex:start1">
+			<prov:activity prov:ref="ex:a1"/>
+			<prov:starter prov:ref="ex:a2"/>
+		</prov:wasStartedBy>
 </prov:document>
--- a/testcases/constraints/unification-start-s7-PASS-c23-c26.provx	Mon Feb 04 13:12:32 2013 +0100
+++ b/testcases/constraints/unification-start-s7-PASS-c23-c26.provx	Mon Feb 04 14:05:43 2013 +0000
@@ -1,27 +1,23 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <prov:document xmlns:prov="http://www.w3.org/ns/prov#" xmlns:prim="http://openprovenance.org/primitives#" xmlns:ex="http://example.org/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
-
         <prov:entity prov:id="ex:e1">
         </prov:entity>
         <prov:activity prov:id="ex:a1">
         </prov:activity>
         <prov:activity prov:id="ex:a2">
         </prov:activity>
-
-            <prov:wasStartedBy prov:id="ex:start1">
-	        <prov:time>2011-11-16T16:05:00</prov:time>
-                <prov:activity prov:ref="ex:a1"/>
-            </prov:wasStartedBy>
-
-            <prov:wasStartedBy>
-	        <prov:time>2011-11-16T16:05:00</prov:time>
-                <prov:activity prov:ref="ex:a1"/>
-                <prov:trigger prov:ref="ex:e1"/>
-                <prov:starter prov:ref="ex:a2"/>
-            </prov:wasStartedBy>
-
-            <prov:wasStartedBy prov:id="ex:start1">
-                <prov:activity prov:ref="ex:a1"/>
-                <prov:starter prov:ref="ex:a2"/>
-            </prov:wasStartedBy>
+		<prov:wasStartedBy prov:id="ex:start1">
+			<prov:activity prov:ref="ex:a1"/>
+			<prov:time>2011-11-16T16:05:00</prov:time>
+		</prov:wasStartedBy>
+		<prov:wasStartedBy>
+			<prov:activity prov:ref="ex:a1"/>
+			<prov:trigger prov:ref="ex:e1"/>
+			<prov:starter prov:ref="ex:a2"/>
+			<prov:time>2011-11-16T16:05:00</prov:time>
+		</prov:wasStartedBy>
+		<prov:wasStartedBy prov:id="ex:start1">
+			<prov:activity prov:ref="ex:a1"/>
+			<prov:starter prov:ref="ex:a2"/>
+		</prov:wasStartedBy>
 </prov:document>
--- a/testcases/constraints/unification-start-s8-PASS-c23-c26.provx	Mon Feb 04 13:12:32 2013 +0100
+++ b/testcases/constraints/unification-start-s8-PASS-c23-c26.provx	Mon Feb 04 14:05:43 2013 +0000
@@ -1,28 +1,23 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <prov:document xmlns:prov="http://www.w3.org/ns/prov#" xmlns:prim="http://openprovenance.org/primitives#" xmlns:ex="http://example.org/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
-
         <prov:entity prov:id="ex:e1">
         </prov:entity>
         <prov:activity prov:id="ex:a1">
         </prov:activity>
         <prov:activity prov:id="ex:a2">
         </prov:activity>
-
-            <prov:wasStartedBy prov:id="ex:start1">
-	        <prov:time>2011-11-16T16:05:00</prov:time>
-                <prov:activity prov:ref="ex:a1"/>
-            </prov:wasStartedBy>
-
-            <prov:wasStartedBy>
-                <prov:activity prov:ref="ex:a1"/>
-                <prov:trigger prov:ref="ex:e1"/>
-                <prov:starter prov:ref="ex:a2"/>
-            </prov:wasStartedBy>
-
-            <prov:wasStartedBy prov:id="ex:start1">
-	        <prov:time>2011-11-16T16:05:00</prov:time>
-                <prov:activity prov:ref="ex:a1"/>
-                <prov:starter prov:ref="ex:a2"/>
-            </prov:wasStartedBy>
-
+		<prov:wasStartedBy prov:id="ex:start1">
+			<prov:activity prov:ref="ex:a1"/>
+			<prov:time>2011-11-16T16:05:00</prov:time>
+		</prov:wasStartedBy>
+		<prov:wasStartedBy>
+			<prov:activity prov:ref="ex:a1"/>
+			<prov:trigger prov:ref="ex:e1"/>
+			<prov:starter prov:ref="ex:a2"/>
+		</prov:wasStartedBy>
+		<prov:wasStartedBy prov:id="ex:start1">
+			<prov:activity prov:ref="ex:a1"/>
+			<prov:starter prov:ref="ex:a2"/>
+			<prov:time>2011-11-16T16:05:00</prov:time>
+		</prov:wasStartedBy>
 </prov:document>
--- a/testcases/constraints/unification-start-s9-PASS-c23-c26.provx	Mon Feb 04 13:12:32 2013 +0100
+++ b/testcases/constraints/unification-start-s9-PASS-c23-c26.provx	Mon Feb 04 14:05:43 2013 +0000
@@ -1,28 +1,23 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <prov:document xmlns:prov="http://www.w3.org/ns/prov#" xmlns:prim="http://openprovenance.org/primitives#" xmlns:ex="http://example.org/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
-
         <prov:entity prov:id="ex:e1">
         </prov:entity>
         <prov:activity prov:id="ex:a1">
         </prov:activity>
         <prov:activity prov:id="ex:a2">
         </prov:activity>
-
             <prov:wasStartedBy prov:id="ex:start1">
                 <prov:activity prov:ref="ex:a1"/>
             </prov:wasStartedBy>
-
             <prov:wasStartedBy>
-	        <prov:time>2011-11-16T16:05:00</prov:time>
                 <prov:activity prov:ref="ex:a1"/>
                 <prov:trigger prov:ref="ex:e1"/>
                 <prov:starter prov:ref="ex:a2"/>
+				<prov:time>2011-11-16T16:05:00</prov:time>
             </prov:wasStartedBy>
-
             <prov:wasStartedBy prov:id="ex:start1">
-	        <prov:time>2011-11-16T16:05:00</prov:time>
                 <prov:activity prov:ref="ex:a1"/>
                 <prov:starter prov:ref="ex:a2"/>
+				<prov:time>2011-11-16T16:05:00</prov:time>
             </prov:wasStartedBy>
-
 </prov:document>
--- a/testcases/constraints/unification-usage-f2-FAIL-c23.provx	Mon Feb 04 13:12:32 2013 +0100
+++ b/testcases/constraints/unification-usage-f2-FAIL-c23.provx	Mon Feb 04 14:05:43 2013 +0000
@@ -1,18 +1,15 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <prov:document xmlns:prov="http://www.w3.org/ns/prov#" xmlns:prim="http://openprovenance.org/primitives#" xmlns:ex="http://example.org/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
-
         <prov:activity prov:id="ex:e1">
         </prov:activity>
         <prov:entity prov:id="ex:a1">
         </prov:entity>
-
-            <prov:used prov:id="ex:use1">
-                <prov:activity prov:ref="ex:e1"/>
-                <prov:entity prov:ref="ex:a1"/>
-            </prov:used>
-            <prov:used prov:id="ex:use1">
-                <prov:activity prov:ref="ex:e1-other"/>  <!-- unable to unify -->
-                <prov:entity prov:ref="ex:a1"/>
-            </prov:used>
-
+		<prov:used prov:id="ex:use1">
+			<prov:activity prov:ref="ex:e1"/>
+			<prov:entity prov:ref="ex:a1"/>
+		</prov:used>
+		<prov:used prov:id="ex:use1">
+			<prov:activity prov:ref="ex:e1-other"/>  <!-- unable to unify -->
+			<prov:entity prov:ref="ex:a1"/>
+		</prov:used>
 </prov:document>
--- a/testcases/constraints/unification-usage-f3-FAIL-c23.provx	Mon Feb 04 13:12:32 2013 +0100
+++ b/testcases/constraints/unification-usage-f3-FAIL-c23.provx	Mon Feb 04 14:05:43 2013 +0000
@@ -1,17 +1,15 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <prov:document xmlns:prov="http://www.w3.org/ns/prov#" xmlns:prim="http://openprovenance.org/primitives#" xmlns:ex="http://example.org/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
-
         <prov:activity prov:id="ex:e1">
         </prov:activity>
         <prov:entity prov:id="ex:a1">
         </prov:entity>
-
-            <prov:used prov:id="ex:use1">
-                <prov:activity prov:ref="ex:e1"/>
-                <prov:entity prov:ref="ex:a1"/>
-            </prov:used>
-            <prov:used prov:id="ex:use1">
-                <prov:activity prov:ref="ex:e1"/>
-                <prov:entity prov:ref="ex:a1-other"/>  <!-- unable to unify -->
-            </prov:used>
+		<prov:used prov:id="ex:use1">
+			<prov:activity prov:ref="ex:e1"/>
+			<prov:entity prov:ref="ex:a1"/>
+		</prov:used>
+		<prov:used prov:id="ex:use1">
+			<prov:activity prov:ref="ex:e1"/>
+			<prov:entity prov:ref="ex:a1-other"/>  <!-- unable to unify -->
+		</prov:used>
 </prov:document>
--- a/testcases/constraints/unification-usage-f4-FAIL-c23.provx	Mon Feb 04 13:12:32 2013 +0100
+++ b/testcases/constraints/unification-usage-f4-FAIL-c23.provx	Mon Feb 04 14:05:43 2013 +0000
@@ -1,20 +1,17 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <prov:document xmlns:prov="http://www.w3.org/ns/prov#" xmlns:prim="http://openprovenance.org/primitives#" xmlns:ex="http://example.org/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
-
         <prov:activity prov:id="ex:e1">
         </prov:activity>
         <prov:entity prov:id="ex:a1">
         </prov:entity>
-
-            <prov:used prov:id="ex:use1">
-                <prov:time>2012-11-16T16:05:00</prov:time>
-                <prov:activity prov:ref="ex:e1"/>
-                <prov:entity prov:ref="ex:a1"/>
-            </prov:used>
-            <prov:used prov:id="ex:use1">
-                <prov:time>2011-11-16T16:05:00</prov:time>
-                <prov:activity prov:ref="ex:e1"/>
-                <prov:entity prov:ref="ex:a1"/>
-            </prov:used>
-
+		<prov:used prov:id="ex:use1">
+			<prov:activity prov:ref="ex:e1"/>
+			<prov:entity prov:ref="ex:a1"/>
+			<prov:time>2012-11-16T16:05:00</prov:time>
+		</prov:used>
+		<prov:used prov:id="ex:use1">
+			<prov:activity prov:ref="ex:e1"/>
+			<prov:entity prov:ref="ex:a1"/>
+			<prov:time>2011-11-16T16:05:00</prov:time>
+		</prov:used>
 </prov:document>
--- a/testcases/constraints/unification-usage-f5-PASS-c23.provx	Mon Feb 04 13:12:32 2013 +0100
+++ b/testcases/constraints/unification-usage-f5-PASS-c23.provx	Mon Feb 04 14:05:43 2013 +0000
@@ -1,19 +1,17 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <prov:document xmlns:prov="http://www.w3.org/ns/prov#" xmlns:prim="http://openprovenance.org/primitives#" xmlns:ex="http://example.org/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
-
         <prov:activity prov:id="ex:e1">
         </prov:activity>
         <prov:entity prov:id="ex:a1">
         </prov:entity>
-
-            <prov:used>
-                <prov:time>2012-11-16T16:05:00</prov:time>
-                <prov:activity prov:ref="ex:e1"/>
-                <prov:entity prov:ref="ex:a1"/>
-            </prov:used>
-            <prov:used prov:id="ex:use1">
-                <prov:time>2011-11-16T16:05:00</prov:time>
-                <prov:activity prov:ref="ex:e1"/>
-                <prov:entity prov:ref="ex:a1"/>
-            </prov:used>
+		<prov:used>
+			<prov:activity prov:ref="ex:e1"/>
+			<prov:entity prov:ref="ex:a1"/>
+			<prov:time>2012-11-16T16:05:00</prov:time>
+		</prov:used>
+		<prov:used prov:id="ex:use1">
+			<prov:activity prov:ref="ex:e1"/>
+			<prov:entity prov:ref="ex:a1"/>
+			<prov:time>2011-11-16T16:05:00</prov:time>
+		</prov:used>
 </prov:document>
--- a/testcases/constraints/unification-usage-f6-PASS-c23.provx	Mon Feb 04 13:12:32 2013 +0100
+++ b/testcases/constraints/unification-usage-f6-PASS-c23.provx	Mon Feb 04 14:05:43 2013 +0000
@@ -1,20 +1,17 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <prov:document xmlns:prov="http://www.w3.org/ns/prov#" xmlns:prim="http://openprovenance.org/primitives#" xmlns:ex="http://example.org/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
-
         <prov:activity prov:id="ex:e1">
         </prov:activity>
         <prov:entity prov:id="ex:a1">
         </prov:entity>
-
-            <prov:used>
-                <prov:time>2012-11-16T16:05:00</prov:time>
-                <prov:activity prov:ref="ex:e1"/>
-                <prov:entity prov:ref="ex:a1"/>
-            </prov:used>
-            <prov:used>
-                <prov:time>2011-11-16T16:05:00</prov:time>
-                <prov:activity prov:ref="ex:e1"/>
-                <prov:entity prov:ref="ex:a1"/>
-            </prov:used>
-
+		<prov:used>
+			<prov:activity prov:ref="ex:e1"/>
+			<prov:entity prov:ref="ex:a1"/>
+			<prov:time>2012-11-16T16:05:00</prov:time>
+		</prov:used>
+		<prov:used>
+			<prov:activity prov:ref="ex:e1"/>
+			<prov:entity prov:ref="ex:a1"/>
+			<prov:time>2011-11-16T16:05:00</prov:time>
+		</prov:used>
 </prov:document>
--- a/testcases/constraints/unification-usage-f7-PASS-c23.provx	Mon Feb 04 13:12:32 2013 +0100
+++ b/testcases/constraints/unification-usage-f7-PASS-c23.provx	Mon Feb 04 14:05:43 2013 +0000
@@ -1,24 +1,21 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <prov:document xmlns:prov="http://www.w3.org/ns/prov#" xmlns:prim="http://openprovenance.org/primitives#" xmlns:ex="http://example.org/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
-
         <prov:activity prov:id="ex:e1">
         </prov:activity>
         <prov:entity prov:id="ex:a1">
         </prov:entity>
-
-            <prov:used prov:id="ex:use1">
-                <prov:activity prov:ref="ex:e1"/>
-                <prov:entity prov:ref="ex:a1"/>
-            </prov:used>
-            <prov:used prov:id="ex:use1">
-                <prov:time>2012-11-16T16:05:00</prov:time>
-                <prov:activity prov:ref="ex:e1"/>
-                <prov:entity prov:ref="ex:a1"/>
-            </prov:used>
-            <prov:used>
-                <prov:time>2011-11-16T16:05:00</prov:time>
-                <prov:activity prov:ref="ex:e1"/>
-                <prov:entity prov:ref="ex:a1"/>
-            </prov:used>
-
+		<prov:used prov:id="ex:use1">
+			<prov:activity prov:ref="ex:e1"/>
+			<prov:entity prov:ref="ex:a1"/>
+		</prov:used>
+		<prov:used prov:id="ex:use1">
+			<prov:activity prov:ref="ex:e1"/>
+			<prov:entity prov:ref="ex:a1"/>
+			<prov:time>2012-11-16T16:05:00</prov:time>
+		</prov:used>
+		<prov:used>
+			<prov:activity prov:ref="ex:e1"/>
+			<prov:entity prov:ref="ex:a1"/>
+			<prov:time>2011-11-16T16:05:00</prov:time>
+		</prov:used>
 </prov:document>
--- a/testcases/constraints/unification-usage-s1-PASS-c23.provx	Mon Feb 04 13:12:32 2013 +0100
+++ b/testcases/constraints/unification-usage-s1-PASS-c23.provx	Mon Feb 04 14:05:43 2013 +0000
@@ -4,14 +4,12 @@
         </prov:activity>
         <prov:entity prov:id="ex:a1">
         </prov:entity>
-
-            <prov:used prov:id="ex:use1">
-                <prov:activity prov:ref="ex:e1"/>
-                <prov:entity prov:ref="ex:a1"/>
-            </prov:used>
-            <prov:used prov:id="ex:use1">
-                <prov:activity prov:ref="ex:e1"/>
-                <prov:entity prov:ref="ex:a1"/>
-            </prov:used>
-
+		<prov:used prov:id="ex:use1">
+			<prov:activity prov:ref="ex:e1"/>
+			<prov:entity prov:ref="ex:a1"/>
+		</prov:used>
+		<prov:used prov:id="ex:use1">
+			<prov:activity prov:ref="ex:e1"/>
+			<prov:entity prov:ref="ex:a1"/>
+		</prov:used>
 </prov:document>
--- a/testcases/constraints/unification-usage-s2-PASS-c23.provx	Mon Feb 04 13:12:32 2013 +0100
+++ b/testcases/constraints/unification-usage-s2-PASS-c23.provx	Mon Feb 04 14:05:43 2013 +0000
@@ -4,14 +4,12 @@
         </prov:activity>
         <prov:entity prov:id="ex:a1">
         </prov:entity>
-
-            <prov:used prov:id="ex:use1">
-                <prov:activity prov:ref="ex:e1"/>
-                <prov:entity prov:ref="ex:a1"/>
-            </prov:used>
-            <prov:used prov:id="ex:use1">
-                <prov:activity prov:ref="ex:e1"/>
-		 <!-- able to unify entity -->
-            </prov:used>
-
+		<prov:used prov:id="ex:use1">
+			<prov:activity prov:ref="ex:e1"/>
+			<prov:entity prov:ref="ex:a1"/>
+		</prov:used>
+		<prov:used prov:id="ex:use1">
+			<prov:activity prov:ref="ex:e1"/>
+			<!-- able to unify entity -->
+		</prov:used>
 </prov:document>
--- a/testcases/constraints/unification-usage-s5-PASS-c23.provx	Mon Feb 04 13:12:32 2013 +0100
+++ b/testcases/constraints/unification-usage-s5-PASS-c23.provx	Mon Feb 04 14:05:43 2013 +0000
@@ -4,16 +4,14 @@
         </prov:activity>
         <prov:entity prov:id="ex:a1">
         </prov:entity>
-
-            <prov:used prov:id="ex:use1">
-                <prov:time>2011-11-16T16:05:00</prov:time>
-                <prov:activity prov:ref="ex:e1"/>
-                <prov:entity prov:ref="ex:a1"/>
-            </prov:used>
-            <prov:used prov:id="ex:use1">
-                <prov:time>2011-11-16T16:05:00</prov:time>
-                <prov:activity prov:ref="ex:e1"/>
-                <prov:entity prov:ref="ex:a1"/>
-            </prov:used>
-
+		<prov:used prov:id="ex:use1">
+			<prov:activity prov:ref="ex:e1"/>
+			<prov:entity prov:ref="ex:a1"/>
+			<prov:time>2011-11-16T16:05:00</prov:time>
+		</prov:used>
+		<prov:used prov:id="ex:use1">
+			<prov:activity prov:ref="ex:e1"/>
+			<prov:entity prov:ref="ex:a1"/>
+			<prov:time>2011-11-16T16:05:00</prov:time>
+		</prov:used>
 </prov:document>
--- a/testcases/constraints/unification-usage-s6-PASS-c23.provx	Mon Feb 04 13:12:32 2013 +0100
+++ b/testcases/constraints/unification-usage-s6-PASS-c23.provx	Mon Feb 04 14:05:43 2013 +0000
@@ -4,15 +4,13 @@
         </prov:activity>
         <prov:entity prov:id="ex:a1">
         </prov:entity>
-
-            <prov:used prov:id="ex:use1">
-                <prov:activity prov:ref="ex:e1"/>
-                <prov:entity prov:ref="ex:a1"/>
-            </prov:used>
-            <prov:used prov:id="ex:use1">
-                <prov:time>2011-11-16T16:05:00</prov:time>
-                <prov:activity prov:ref="ex:e1"/>
-                <prov:entity prov:ref="ex:a1"/>
-            </prov:used>
-
+		<prov:used prov:id="ex:use1">
+			<prov:activity prov:ref="ex:e1"/>
+			<prov:entity prov:ref="ex:a1"/>
+		</prov:used>
+		<prov:used prov:id="ex:use1">
+			<prov:activity prov:ref="ex:e1"/>
+			<prov:entity prov:ref="ex:a1"/>
+			<prov:time>2011-11-16T16:05:00</prov:time>
+		</prov:used>
 </prov:document>
--- a/testcases/constraints/unification-usage-s7-PASS-c23.provx	Mon Feb 04 13:12:32 2013 +0100
+++ b/testcases/constraints/unification-usage-s7-PASS-c23.provx	Mon Feb 04 14:05:43 2013 +0000
@@ -4,20 +4,18 @@
         </prov:activity>
         <prov:entity prov:id="ex:a1">
         </prov:entity>
-
-            <prov:used prov:id="ex:use1">
-                <prov:activity prov:ref="ex:e1"/>
-                <prov:entity prov:ref="ex:a1"/>
-            </prov:used>
-            <prov:used prov:id="ex:use1">
-                <prov:time>2011-11-16T16:05:00</prov:time>
-                <prov:activity prov:ref="ex:e1"/>
-                <prov:entity prov:ref="ex:a1"/>
-            </prov:used>
-            <prov:used>
-                <prov:time>2011-11-16T16:05:00</prov:time>
-                <prov:activity prov:ref="ex:e1"/>
-                <prov:entity prov:ref="ex:a1"/>
-            </prov:used>
-
+		<prov:used prov:id="ex:use1">
+			<prov:activity prov:ref="ex:e1"/>
+			<prov:entity prov:ref="ex:a1"/>
+		</prov:used>
+		<prov:used prov:id="ex:use1">
+			<prov:activity prov:ref="ex:e1"/>
+			<prov:entity prov:ref="ex:a1"/>
+			<prov:time>2011-11-16T16:05:00</prov:time>
+		</prov:used>
+		<prov:used>
+			<prov:activity prov:ref="ex:e1"/>
+			<prov:entity prov:ref="ex:a1"/>
+			<prov:time>2011-11-16T16:05:00</prov:time>
+		</prov:used>
 </prov:document>
--- a/testcases/constraints/unification-usage-s8-PASS-c23.provx	Mon Feb 04 13:12:32 2013 +0100
+++ b/testcases/constraints/unification-usage-s8-PASS-c23.provx	Mon Feb 04 14:05:43 2013 +0000
@@ -4,19 +4,17 @@
         </prov:activity>
         <prov:entity prov:id="ex:a1">
         </prov:entity>
-
-            <prov:used prov:id="ex:use1">
-                <prov:activity prov:ref="ex:e1"/>
-                <prov:entity prov:ref="ex:a1"/>
-            </prov:used>
-            <prov:used prov:id="ex:use1">
-                <prov:activity prov:ref="ex:e1"/>
-                <prov:entity prov:ref="ex:a1"/>
-            </prov:used>
-            <prov:used>
-                <prov:time>2011-11-16T16:05:00</prov:time>
-                <prov:activity prov:ref="ex:e1"/>
-                <prov:entity prov:ref="ex:a1"/>
-            </prov:used>
-
+		<prov:used prov:id="ex:use1">
+			<prov:activity prov:ref="ex:e1"/>
+			<prov:entity prov:ref="ex:a1"/>
+		</prov:used>
+		<prov:used prov:id="ex:use1">
+			<prov:activity prov:ref="ex:e1"/>
+			<prov:entity prov:ref="ex:a1"/>
+		</prov:used>
+		<prov:used>
+			<prov:activity prov:ref="ex:e1"/>
+			<prov:entity prov:ref="ex:a1"/>
+			<prov:time>2011-11-16T16:05:00</prov:time>
+		</prov:used>
 </prov:document>