diff --git a/source/activitydefinition/invariant-tests/adf-2.p1.pass.json b/source/activitydefinition/invariant-tests/adf-2.p1.pass.json
new file mode 100644
index 00000000000..98a348270d6
--- /dev/null
+++ b/source/activitydefinition/invariant-tests/adf-2.p1.pass.json
@@ -0,0 +1,13 @@
+{
+  "resourceType": "ActivityDefinition",
+  "status": "active",
+  "relatedArtifact": [
+    {
+      "type": "depends-on",
+      "resource": "http://x/Library/a",
+      "resourceReference": {
+        "reference": "Library/a"
+      }
+    }
+  ]
+}
diff --git a/source/activitydefinition/structuredefinition-ActivityDefinition.xml b/source/activitydefinition/structuredefinition-ActivityDefinition.xml
index d208689589e..c2fc4fad9f8 100644
--- a/source/activitydefinition/structuredefinition-ActivityDefinition.xml
+++ b/source/activitydefinition/structuredefinition-ActivityDefinition.xml
@@ -830,7 +830,7 @@
 				<key value="adf-2"/>
 				<severity value="warning"/>
 				<human value="Dependencies of an ActivityDefinition should reference a resource"/>
-				<expression value="type in ('depends-on' | 'part-of') implies ((resource.exists() xor resourceReference.exists()) or (artifact is canonical xor artifact is Reference))"/>
+				<expression value="type in ('depends-on' | 'part-of') implies (resource.exists() or resourceReference.exists())"/>
 				<source value="http://hl7.org/fhir/StructureDefinition/ActivityDefinition"/>
 			</constraint>
 			<constraint>
diff --git a/source/bundle/invariant-tests/bdl-14.f2.fail.json b/source/bundle/invariant-tests/bdl-14.f2.fail.json
new file mode 100644
index 00000000000..17a9dd1802f
--- /dev/null
+++ b/source/bundle/invariant-tests/bdl-14.f2.fail.json
@@ -0,0 +1,30 @@
+{
+  "resourceType": "Bundle",
+  "type": "history",
+  "entry": [
+    {
+      "fullUrl": "http://x/Patient/1",
+      "request": {
+        "method": "GET",
+        "url": "Patient/1"
+      },
+      "response": {
+        "status": "200"
+      }
+    },
+    {
+      "fullUrl": "http://x/Patient/2",
+      "request": {
+        "method": "PATCH",
+        "url": "Patient/2"
+      },
+      "resource": {
+        "resourceType": "Patient",
+        "id": "2"
+      },
+      "response": {
+        "status": "200"
+      }
+    }
+  ]
+}
diff --git a/source/bundle/invariant-tests/bdl-16.p2.pass.json b/source/bundle/invariant-tests/bdl-16.p2.pass.json
new file mode 100644
index 00000000000..3b4c00886bf
--- /dev/null
+++ b/source/bundle/invariant-tests/bdl-16.p2.pass.json
@@ -0,0 +1,24 @@
+{
+  "resourceType": "Bundle",
+  "type": "batch-response",
+  "entry": [
+    {
+      "response": {
+        "status": "200"
+      }
+    }
+  ],
+  "issues": {
+    "resourceType": "OperationOutcome",
+    "issue": [
+      {
+        "severity": "warning",
+        "code": "informational"
+      },
+      {
+        "severity": "warning",
+        "code": "informational"
+      }
+    ]
+  }
+}
diff --git a/source/bundle/invariant-tests/bdl-7.p1.pass.json b/source/bundle/invariant-tests/bdl-7.p1.pass.json
new file mode 100644
index 00000000000..6e3a9f61bee
--- /dev/null
+++ b/source/bundle/invariant-tests/bdl-7.p1.pass.json
@@ -0,0 +1,34 @@
+{
+  "resourceType": "Bundle",
+  "type": "collection",
+  "entry": [
+    {
+      "fullUrl": "http://x/Observation/123",
+      "resource": {
+        "resourceType": "Observation",
+        "id": "123",
+        "status": "final",
+        "code": {
+          "text": "t"
+        },
+        "meta": {
+          "versionId": "4"
+        }
+      }
+    },
+    {
+      "fullUrl": "http://x/Observation/12",
+      "resource": {
+        "resourceType": "Observation",
+        "id": "12",
+        "status": "final",
+        "code": {
+          "text": "t"
+        },
+        "meta": {
+          "versionId": "34"
+        }
+      }
+    }
+  ]
+}
diff --git a/source/bundle/structuredefinition-Bundle.xml b/source/bundle/structuredefinition-Bundle.xml
index f070fd3dd17..1c4a83e24b8 100644
--- a/source/bundle/structuredefinition-Bundle.xml
+++ b/source/bundle/structuredefinition-Bundle.xml
@@ -107,7 +107,7 @@
 			<constraint>
 				<key value="bdl-3b"/>
 				<severity value="error"/>
-				<human value="For collections of type history, all entries must contain request or response elements, and resources if the method is POST, PUT or PATCH"/>
+				<human value="For collections of type history, all entries must contain request and response elements, and resources if the method is POST, PUT or PATCH"/>
 				<expression value="type = 'history' implies entry.all(request.exists() and response.exists() and ((request.method in ('POST' | 'PATCH' | 'PUT')) = resource.exists()))"/>
 				<source value="http://hl7.org/fhir/StructureDefinition/Bundle"/>
 			</constraint>
@@ -129,7 +129,7 @@
 				<key value="bdl-7"/>
 				<severity value="error"/>
 				<human value="FullUrl must be unique in a bundle, or else entries with the same fullUrl must have different meta.versionId (except in history bundles)"/>
-				<expression value="(type = 'history') or entry.where(fullUrl.exists()).select(fullUrl&amp;iif(resource.meta.versionId.exists(), resource.meta.versionId, '')).isDistinct()"/>
+				<expression value="(type = 'history') or entry.where(fullUrl.exists()).select(fullUrl&amp;'|'&amp;iif(resource.meta.versionId.exists(), resource.meta.versionId, '')).isDistinct()"/>
 				<source value="http://hl7.org/fhir/StructureDefinition/Bundle"/>
 			</constraint>
 			<constraint>
@@ -171,7 +171,7 @@
 				<key value="bdl-14"/>
 				<severity value="error"/>
 				<human value="entry.request.method PATCH not allowed for history"/>
-				<expression value="type = 'history' implies entry.request.method != 'PATCH'"/>
+				<expression value="type = 'history' implies entry.request.all(method != 'PATCH')"/>
 				<source value="http://hl7.org/fhir/StructureDefinition/Bundle"/>
 			</constraint>
 			<constraint>
@@ -185,7 +185,7 @@
 				<key value="bdl-16"/>
 				<severity value="error"/>
 				<human value="Issue.severity for all issues within the OperationOutcome must be either 'information' or 'warning'."/>
-				<expression value="issues.exists() implies (issues.issue.severity = 'information' or issues.issue.severity = 'warning')"/>
+				<expression value="issues.exists() implies issues.issue.all(severity = 'information' or severity = 'warning')"/>
 			</constraint>
 			<constraint>
 				<key value="bdl-17"/>
diff --git a/source/codesystem/invariant-tests/csd-1.f2.fail.json b/source/codesystem/invariant-tests/csd-1.f2.fail.json
new file mode 100644
index 00000000000..84909ab93cd
--- /dev/null
+++ b/source/codesystem/invariant-tests/csd-1.f2.fail.json
@@ -0,0 +1,16 @@
+{
+  "resourceType": "CodeSystem",
+  "url": "http://example.org/cs/csd1nested",
+  "status": "draft",
+  "content": "complete",
+  "concept": [
+    {
+      "code": "parent",
+      "concept": [
+        {
+          "code": "parent"
+        }
+      ]
+    }
+  ]
+}
diff --git a/source/codesystem/invariant-tests/csd-3.f3.fail.json b/source/codesystem/invariant-tests/csd-3.f3.fail.json
new file mode 100644
index 00000000000..4f7b926825e
--- /dev/null
+++ b/source/codesystem/invariant-tests/csd-3.f3.fail.json
@@ -0,0 +1,34 @@
+{
+  "resourceType": "CodeSystem",
+  "url": "http://example.org/cs/csd3",
+  "status": "draft",
+  "content": "complete",
+  "property": [
+    {
+      "code": "parent",
+      "type": "code"
+    },
+    {
+      "code": "status",
+      "type": "string"
+    }
+  ],
+  "concept": [
+    {
+      "code": "root"
+    },
+    {
+      "code": "c1",
+      "property": [
+        {
+          "code": "status",
+          "valueString": "a"
+        },
+        {
+          "code": "parent",
+          "valueCode": "root"
+        }
+      ]
+    }
+  ]
+}
diff --git a/source/codesystem/invariant-tests/csd-6.p2.pass.json b/source/codesystem/invariant-tests/csd-6.p2.pass.json
new file mode 100644
index 00000000000..014ee3fbfde
--- /dev/null
+++ b/source/codesystem/invariant-tests/csd-6.p2.pass.json
@@ -0,0 +1,9 @@
+{
+  "resourceType": "CodeSystem", "url": "http://example.org/cs/csd6-multi", "status": "draft",
+  "caseSensitive": true, "content": "complete",
+  "concept": [
+    { "code": "A", "property": [ { "code": "alternateCode", "valueCode": "B" } ] },
+    { "code": "B", "property": [ { "code": "alternateCode", "valueCode": "A" }, { "code": "alternateCode", "valueCode": "C" } ] },
+    { "code": "C", "property": [ { "code": "alternateCode", "valueCode": "B" } ] }
+  ]
+}
diff --git a/source/codesystem/structuredefinition-CodeSystem.xml b/source/codesystem/structuredefinition-CodeSystem.xml
index 6e1603902ff..06ec615ae6c 100644
--- a/source/codesystem/structuredefinition-CodeSystem.xml
+++ b/source/codesystem/structuredefinition-CodeSystem.xml
@@ -92,7 +92,7 @@
 				<key value="csd-1"/>
 				<severity value="error"/>
 				<human value="Within a code system definition, all the codes SHALL be unique"/>
-				<expression value="concept.exists() implies concept.code.combine(%resource.concept.descendants().concept.code).isDistinct()"/>
+				<expression value="concept.exists() implies concept.code.combine(concept.combine(concept.descendants()).concept.code).isDistinct()"/>
 				<source value="http://hl7.org/fhir/StructureDefinition/CodeSystem"/>
 			</constraint>
 			<constraint>
@@ -106,7 +106,7 @@
 				<key value="csd-3"/>
 				<severity value="warning"/>
 				<human value="If there is an implicit hierarchy, a hierarchyMeaning should be provided"/>
-				<expression value="concept.where(property.code = 'parent' or property.code = 'child').exists() implies hierarchyMeaning.exists()"/>
+				<expression value="concept.where(property.where(code = 'parent' or code = 'child').exists()).exists() implies hierarchyMeaning.exists()"/>
 				<source value="http://hl7.org/fhir/StructureDefinition/CodeSystem"/>
 			</constraint>
 			<constraint>
@@ -881,7 +881,7 @@
 				<key value="csd-6"/>
 				<severity value="error"/>
 				<human value="If a concept identifies an alternate, there must be a reciprocal relationship"/>
-				<expression value="defineVariable('sc', code).property.all((code = 'alternateCode') implies defineVariable('ac', value).%resource.repeat(concept).where(code = %ac).exists(property.where(code = 'alternateCode').value = %sc))"/>
+				<expression value="defineVariable('sc', code).property.all((code = 'alternateCode') implies defineVariable('ac', value).%resource.repeat(concept).where(code = %ac).exists(property.where(code = 'alternateCode' and value = %sc).exists()))"/>
 				<source value="http://hl7.org/fhir/StructureDefinition/CodeSystem"/>
 			</constraint>
 		</element>
diff --git a/source/datatypes/count.xml b/source/datatypes/count.xml
index ba6630429b2..502860b60d9 100644
--- a/source/datatypes/count.xml
+++ b/source/datatypes/count.xml
@@ -3209,7 +3209,7 @@
     <Cell ss:StyleID="s106"><Data ss:Type="String">Count</Data><NamedCell ss:Name="_FilterDatabase"/></Cell>
     <Cell ss:StyleID="s106"><Data ss:Type="String">There SHALL be a code with a value of "1" if there is a value. If system is present, it SHALL be UCUM.  If present, the value SHALL be a whole number.</Data><NamedCell ss:Name="_FilterDatabase"/></Cell>
     <Cell ss:StyleID="s83"><NamedCell ss:Name="_FilterDatabase"/></Cell>
-    <Cell ss:StyleID="s106"><Data ss:Type="String">(code.exists() or value.empty()) and (system.empty() or system = %ucum) and (code.empty() or code = '1') and (value.empty() or value.hasValue().not() or value.toString().contains('.').not()) and (value.empty() or value.hasValue().not() or value &gt;= 0)</Data><NamedCell ss:Name="_FilterDatabase"/></Cell>
+    <Cell ss:StyleID="s106"><Data ss:Type="String">(code.exists() or value.empty()) and (system.empty() or system = %ucum) and (code.empty() or code = '1') and (value.empty() or value.hasValue().not() or value = value.round()) and (value.empty() or value.hasValue().not() or value &gt;= 0)</Data><NamedCell ss:Name="_FilterDatabase"/></Cell>
     <Cell ss:StyleID="s106"><Data ss:Type="String">(f:code or not(f:value)) and (not(exists(f:system)) or (f:system/@value='http://unitsofmeasure.org' and f:code/@value='1')) and not(contains(f:value/@value, '.')) </Data><NamedCell ss:Name="_FilterDatabase"/></Cell>
    </Row>
    <Row ss:AutoFitHeight="0">
diff --git a/source/datatypes/duration.xml b/source/datatypes/duration.xml
index 5ff9017279e..c1c1dcf0564 100644
--- a/source/datatypes/duration.xml
+++ b/source/datatypes/duration.xml
@@ -3302,7 +3302,7 @@
     <Cell ss:StyleID="s84"><Data ss:Type="String">Duration</Data><NamedCell ss:Name="_FilterDatabase"/></Cell>
     <Cell ss:StyleID="s107"><Data ss:Type="String">There SHALL be a code if there is a value and it SHALL be an expression of time.  If system is present, it SHALL be UCUM.</Data><NamedCell ss:Name="_FilterDatabase"/></Cell>
     <Cell ss:StyleID="s84"><NamedCell ss:Name="_FilterDatabase"/></Cell>
-    <Cell ss:StyleID="s107"><Data ss:Type="String">code.exists() implies ((system = %ucum) and value.exists())</Data><NamedCell ss:Name="_FilterDatabase"/></Cell>
+    <Cell ss:StyleID="s107"><Data ss:Type="String">(value.exists() implies code.exists()) and (system.exists() implies system = %ucum)</Data><NamedCell ss:Name="_FilterDatabase"/></Cell>
     <Cell ss:StyleID="s107"><Data ss:Type="String">(f:code or not(f:value)) and (not(exists(f:system)) or f:system/@value='http://unitsofmeasure.org')</Data><NamedCell ss:Name="_FilterDatabase"/></Cell>
    </Row>
    <Row ss:AutoFitHeight="0">
diff --git a/source/datatypes/elementdefinition.xml b/source/datatypes/elementdefinition.xml
index f2b8d45d0a6..7813162dc90 100644
--- a/source/datatypes/elementdefinition.xml
+++ b/source/datatypes/elementdefinition.xml
@@ -4699,7 +4699,7 @@
     <Cell ss:StyleID="s92"><Data ss:Type="String">ElementDefinition.binding</Data></Cell>
     <Cell ss:StyleID="s92"><Data ss:Type="String">ValueSet SHALL start with http:// or https:// or urn: or #</Data></Cell>
     <Cell ss:StyleID="s92"/>
-    <Cell ss:StyleID="s92"><Data ss:Type="String">valueSet.exists() implies (valueSet.startsWith('http:') or valueSet.startsWith('https') or valueSet.startsWith('urn:') or valueSet.startsWith('#'))</Data></Cell>
+    <Cell ss:StyleID="s92"><Data ss:Type="String">valueSet.exists() implies (valueSet.startsWith('http:') or valueSet.startsWith('https:') or valueSet.startsWith('urn:') or valueSet.startsWith('#'))</Data></Cell>
     <Cell ss:StyleID="s109"><Data ss:Type="String">(starts-with(string(f:valueSet/@value), 'http:') or starts-with(string(f:valueSet/@value), 'https:') or starts-with(string(f:valueSet/@value), 'urn:') or starts-with(string(f:valueSet/@value), 'x'))</Data></Cell>
    </Row>
    <Row ss:AutoFitHeight="0" ss:Height="60">
@@ -4789,7 +4789,7 @@
     <Cell ss:StyleID="s92"><Data ss:Type="String">ElementDefinition.constraint</Data></Cell>
     <Cell ss:StyleID="s92"><Data ss:Type="String">Constraints should have an expression or else validators will not be able to enforce them</Data></Cell>
     <Cell ss:StyleID="s92"/>
-    <Cell ss:StyleID="s92"><Data ss:Type="String">expression.exists()</Data></Cell>
+    <Cell ss:StyleID="s92"><Data ss:Type="String">expression.hasValue()</Data></Cell>
     <Cell ss:StyleID="s110"><Data ss:Type="String">exists(f:expression/@value)</Data></Cell>
    </Row>
    <Row ss:AutoFitHeight="0" ss:Height="30">
diff --git a/source/datatypes/expression.xml b/source/datatypes/expression.xml
index d3a44ce5ff9..311a4364356 100644
--- a/source/datatypes/expression.xml
+++ b/source/datatypes/expression.xml
@@ -3457,7 +3457,7 @@
     <Cell ss:StyleID="s84"><Data ss:Type="String">error</Data></Cell>
     <Cell ss:StyleID="s84"><Data ss:Type="String">Expression</Data></Cell>
     <Cell ss:StyleID="s84"><Data ss:Type="String">The name must be a valid variable name in most computer languages</Data></Cell>
-    <Cell ss:StyleID="s84"><Data ss:Type="String">name.hasValue() implies name.matches('[A-Za-z][A-Za-z0-9\\_]{0,63}')</Data></Cell>
+    <Cell ss:StyleID="s84"><Data ss:Type="String">name.hasValue() implies name.matches('^[A-Za-z][A-Za-z0-9\\_]{0,63}$')</Data></Cell>
     <Cell ss:StyleID="s102"><Data ss:Type="String">exists(f:expression) or exists(f:reference)</Data></Cell>
    </Row>
    <Row ss:AutoFitHeight="0">
diff --git a/source/documentreference/structuredefinition-DocumentReference.xml b/source/documentreference/structuredefinition-DocumentReference.xml
index 5c8d722ed2e..e77fc8146c3 100644
--- a/source/documentreference/structuredefinition-DocumentReference.xml
+++ b/source/documentreference/structuredefinition-DocumentReference.xml
@@ -106,7 +106,7 @@
       <constraint>
         <key value="docRef-2"/>
         <severity value="warning"/>
-        <human value="practiceSetting SHALL only be present if context is not present"/>
+        <human value="practiceSetting SHALL only be present if context is not an encounter"/>
         <expression value="practiceSetting.empty() or context.where(resolve() is Encounter).empty()"/>
         <source value="http://hl7.org/fhir/StructureDefinition/DocumentReference"/>
       </constraint>
diff --git a/source/event/event-spreadsheet.xml b/source/event/event-spreadsheet.xml
index 8f3ffa7de19..7d233ea4366 100644
--- a/source/event/event-spreadsheet.xml
+++ b/source/event/event-spreadsheet.xml
@@ -1762,7 +1762,7 @@
     <Cell ss:StyleID="s94"/>
     <Cell ss:StyleID="s119"><Data ss:Type="String">Event</Data></Cell>
     <Cell ss:StyleID="s94"><Data ss:Type="String">reason elements can only be specified if status is NOT 'not-done'</Data></Cell>
-    <Cell ss:StyleID="s94"><Data ss:Type="String">status!='not-done' or (reasonCode.exists().not() and reasonReference.exists().not())</Data></Cell>
+    <Cell ss:StyleID="s94"><Data ss:Type="String">status!='not-done' or reason.exists().not()</Data></Cell>
     <Cell ss:StyleID="s120"><Data ss:Type="String">not(f:status/@value='not-done') or not(exists(f:reasonCode) or exists(f:reasonReference))</Data></Cell>
    </Row>
    <Row ss:AutoFitHeight="0" ss:Height="62">
diff --git a/source/imagingselection/invariant-tests/isl-10.p1.pass.json b/source/imagingselection/invariant-tests/isl-10.p1.pass.json
new file mode 100644
index 00000000000..6b48659f68c
--- /dev/null
+++ b/source/imagingselection/invariant-tests/isl-10.p1.pass.json
@@ -0,0 +1,23 @@
+{
+  "resourceType": "ImagingSelection",
+  "status": "available",
+  "code": {
+    "text": "s"
+  },
+  "instance": [
+    {
+      "uid": "a",
+      "frameNumber": [
+        1,
+        2,
+        3
+      ]
+    },
+    {
+      "uid": "b",
+      "segmentNumber": [
+        1
+      ]
+    }
+  ]
+}
diff --git a/source/imagingselection/invariant-tests/isl-11.f2.fail.json b/source/imagingselection/invariant-tests/isl-11.f2.fail.json
new file mode 100644
index 00000000000..c513c1f7e53
--- /dev/null
+++ b/source/imagingselection/invariant-tests/isl-11.f2.fail.json
@@ -0,0 +1,23 @@
+{
+  "resourceType": "ImagingSelection",
+  "status": "available",
+  "code": {
+    "text": "r"
+  },
+  "instance": [
+    {
+      "uid": "a",
+      "waveFormChannel": [
+        1
+      ]
+    },
+    {
+      "uid": "b",
+      "waveFormChannel": [
+        1,
+        2,
+        3
+      ]
+    }
+  ]
+}
diff --git a/source/imagingselection/invariant-tests/isl-7.f2.fail.json b/source/imagingselection/invariant-tests/isl-7.f2.fail.json
new file mode 100644
index 00000000000..d6127647db1
--- /dev/null
+++ b/source/imagingselection/invariant-tests/isl-7.f2.fail.json
@@ -0,0 +1,32 @@
+{
+  "resourceType": "ImagingSelection",
+  "status": "available",
+  "code": {
+    "text": "r"
+  },
+  "instance": [
+    {
+      "uid": "i",
+      "imageRegion2D": [
+        {
+          "regionType": "polyline",
+          "coordinate": [
+            0.1,
+            0.2,
+            0.3
+          ]
+        },
+        {
+          "regionType": "polyline",
+          "coordinate": [
+            0.1,
+            0.2,
+            0.3,
+            0.4,
+            0.5
+          ]
+        }
+      ]
+    }
+  ]
+}
diff --git a/source/imagingselection/invariant-tests/isl-8.f2.fail.json b/source/imagingselection/invariant-tests/isl-8.f2.fail.json
new file mode 100644
index 00000000000..651785984c5
--- /dev/null
+++ b/source/imagingselection/invariant-tests/isl-8.f2.fail.json
@@ -0,0 +1,28 @@
+{
+  "resourceType": "ImagingSelection",
+  "status": "available",
+  "code": {
+    "text": "r"
+  },
+  "imageRegion3D": [
+    {
+      "regionType": "polygon",
+      "coordinate": [
+        1,
+        2,
+        3,
+        4
+      ]
+    },
+    {
+      "regionType": "polygon",
+      "coordinate": [
+        1,
+        2,
+        3,
+        4,
+        5
+      ]
+    }
+  ]
+}
diff --git a/source/imagingselection/structuredefinition-ImagingSelection.xml b/source/imagingselection/structuredefinition-ImagingSelection.xml
index ac810d99e43..f63f7f3ba95 100644
--- a/source/imagingselection/structuredefinition-ImagingSelection.xml
+++ b/source/imagingselection/structuredefinition-ImagingSelection.xml
@@ -126,14 +126,14 @@
         <key value="isl-7"/>
         <severity value="error"/>
         <human value="if present, instance.imageRegion2D.coordinate SHALL have a value count that is a multiple of 2"/>
-        <expression value="instance.imageRegion2D.coordinate.exists() implies instance.imageRegion2D.coordinate.count() mod 2 = 0"/>
+        <expression value="instance.imageRegion2D.all(coordinate.count() mod 2 = 0)"/>
         <source value="http://hl7.org/fhir/StructureDefinition/ImagingSelection"/>
       </constraint>
       <constraint>
         <key value="isl-8"/>
         <severity value="error"/>
         <human value="if present, imageRegion3D.coordinate SHALL have a value count that is a multiple of 3"/>
-        <expression value="imageRegion3D.coordinate.exists() implies imageRegion3D.coordinate.count() mod 3 = 0"/>
+        <expression value="imageRegion3D.all(coordinate.count() mod 3 = 0)"/>
         <source value="http://hl7.org/fhir/StructureDefinition/ImagingSelection"/>
       </constraint>
       <constraint>
@@ -149,14 +149,14 @@
         <human value="only one of instance.frameNumber, instance.referencedContentItemIdentifier, instance.segmentNumber, instance.regionOfInterest and instance.waveFormChannel SHALL be present"/>
 <!--        <expression value="instance.frameNumber.exists() xor instance.referencedContentItemIdentifier.exists() xor instance.segmentNumber.exists() xor instance.regionOfInterest.exists() xor instance.waveFormChannel.exists()"/> -->
 <!--        <expression value="(instance.frameNumber.exists() and not(instance.referencedContentItemIdentifier.exists() or instance.segmentNumber.exists() or instance.regionOfInterest.exists() or instance.waveFormChannel.exists())) or (instance.referencedContentItemIdentifier.exists() and not(instance.frameNumber.exists() or instance.segmentNumber.exists() or instance.regionOfInterest.exists() or instance.waveFormChannel.exists())) or (instance.segmentNumber.exists() and not(instance.frameNumber.exists() or instance.referencedContentItemIdentifier.exists() or instance.regionOfInterest.exists() or instance.waveFormChannel.exists())) or (instance.regionOfInterest.exists() and not(instance.frameNumber.exists() or instance.referencedContentItemIdentifier.exists() or instance.segmentNumber.exists() or instance.waveFormChannel.exists())) or (instance.waveFormChannel.exists() and not(instance.frameNumber.exists() or instance.referencedContentItemIdentifier.exists() or instance.segmentNumber.exists() or instance.regionOfInterest.exists()))"/> -->
-        <expression value="(instance.frameNumber.exists() implies (instance.referencedContentItemIdentifier.exists() or instance.segmentNumber.exists() or instance.regionOfInterest.exists() or instance.waveFormChannel.exists()).not()) and (instance.referencedContentItemIdentifier.exists() implies (instance.frameNumber.exists() or instance.segmentNumber.exists() or instance.regionOfInterest.exists() or instance.waveFormChannel.exists()).not()) and (instance.segmentNumber.exists() implies (instance.frameNumber.exists() or instance.referencedContentItemIdentifier.exists() or instance.regionOfInterest.exists() or instance.waveFormChannel.exists()).not()) and (instance.regionOfInterest.exists() implies (instance.frameNumber.exists() or instance.referencedContentItemIdentifier.exists() or instance.segmentNumber.exists() or instance.waveFormChannel.exists()).not()) and (instance.waveFormChannel.exists() implies (instance.frameNumber.exists() or instance.referencedContentItemIdentifier.exists() or instance.segmentNumber.exists() or instance.regionOfInterest.exists()).not())"/>
+        <expression value="instance.all((frameNumber.exists() implies (referencedContentItemIdentifier.exists() or segmentNumber.exists() or regionOfInterest.exists() or waveFormChannel.exists()).not()) and (referencedContentItemIdentifier.exists() implies (frameNumber.exists() or segmentNumber.exists() or regionOfInterest.exists() or waveFormChannel.exists()).not()) and (segmentNumber.exists() implies (frameNumber.exists() or referencedContentItemIdentifier.exists() or regionOfInterest.exists() or waveFormChannel.exists()).not()) and (regionOfInterest.exists() implies (frameNumber.exists() or referencedContentItemIdentifier.exists() or segmentNumber.exists() or waveFormChannel.exists()).not()) and (waveFormChannel.exists() implies (frameNumber.exists() or referencedContentItemIdentifier.exists() or segmentNumber.exists() or regionOfInterest.exists()).not()))"/>
         <source value="http://hl7.org/fhir/StructureDefinition/ImagingSelection"/>
       </constraint>
       <constraint>
         <key value="isl-11"/>
         <severity value="error"/>
         <human value="if present, instance.waveFormChannel SHALL have a value count that is a multiple of 2"/>
-        <expression value="instance.waveFormChannel.exists() implies instance.waveFormChannel.count() mod 2 = 0"/>
+        <expression value="instance.all(waveFormChannel.count() mod 2 = 0)"/>
         <source value="http://hl7.org/fhir/StructureDefinition/ImagingSelection"/>
       </constraint>
       <mapping>
diff --git a/source/imagingstudy/invariant-tests/ist-4.p1.pass.json b/source/imagingstudy/invariant-tests/ist-4.p1.pass.json
new file mode 100644
index 00000000000..23388e413dd
--- /dev/null
+++ b/source/imagingstudy/invariant-tests/ist-4.p1.pass.json
@@ -0,0 +1,21 @@
+{
+  "resourceType": "ImagingStudy",
+  "status": "available",
+  "subject": {
+    "reference": "Patient/x"
+  },
+  "numberOfInstances": 5,
+  "series": [
+    {
+      "uid": "1.2.3",
+      "modality": {
+        "coding": [
+          {
+            "system": "http://dicom.nema.org/resources/ontology/DCM",
+            "code": "CT"
+          }
+        ]
+      }
+    }
+  ]
+}
diff --git a/source/imagingstudy/structuredefinition-ImagingStudy.xml b/source/imagingstudy/structuredefinition-ImagingStudy.xml
index a230d0e8571..c2e58f17672 100644
--- a/source/imagingstudy/structuredefinition-ImagingStudy.xml
+++ b/source/imagingstudy/structuredefinition-ImagingStudy.xml
@@ -110,7 +110,7 @@
         <key value="ist-4"/>
         <severity value="error"/>
         <human value="If numberOfInstances and series.instance are both present, the numberOfInstances value SHALL match the total number of series.instance elements"/>
-        <expression value="numberOfInstances.exists() and series.exists() implies numberOfInstances = series.instance.count()"/>
+        <expression value="numberOfInstances.exists() and series.instance.exists() implies numberOfInstances = series.instance.count()"/>
       </constraint>
       <constraint>
         <key value="ist-5"/>
diff --git a/source/measurereport/invariant-tests/mrp-3.p1.pass.json b/source/measurereport/invariant-tests/mrp-3.p1.pass.json
new file mode 100644
index 00000000000..2523d661928
--- /dev/null
+++ b/source/measurereport/invariant-tests/mrp-3.p1.pass.json
@@ -0,0 +1,21 @@
+{
+  "resourceType": "MeasureReport",
+  "status": "complete",
+  "type": "individual",
+  "measure": "http://x/Measure/m",
+  "period": {
+    "start": "2013-01-01",
+    "end": "2013-12-31"
+  },
+  "group": [
+    {
+      "population": [
+        {
+          "code": {
+            "text": "initial-population"
+          }
+        }
+      ]
+    }
+  ]
+}
diff --git a/source/measurereport/invariant-tests/mrp-4.p1.pass.json b/source/measurereport/invariant-tests/mrp-4.p1.pass.json
new file mode 100644
index 00000000000..a3541f01342
--- /dev/null
+++ b/source/measurereport/invariant-tests/mrp-4.p1.pass.json
@@ -0,0 +1,29 @@
+{
+  "resourceType": "MeasureReport",
+  "status": "complete",
+  "type": "individual",
+  "measure": "http://x/Measure/m",
+  "period": {
+    "start": "2013-01-01",
+    "end": "2013-12-31"
+  },
+  "group": [
+    {
+      "stratifier": [
+        {
+          "stratum": [
+            {
+              "population": [
+                {
+                  "code": {
+                    "text": "numerator"
+                  }
+                }
+              ]
+            }
+          ]
+        }
+      ]
+    }
+  ]
+}
diff --git a/source/measurereport/structuredefinition-MeasureReport.xml b/source/measurereport/structuredefinition-MeasureReport.xml
index 62504280ebd..3bad82846c4 100644
--- a/source/measurereport/structuredefinition-MeasureReport.xml
+++ b/source/measurereport/structuredefinition-MeasureReport.xml
@@ -662,7 +662,7 @@
         <key value="mrp-3"/>
         <severity value="error"/>
         <human value="The count and countQuantity elements SHALL be mutually exclusive"/>
-        <expression value="count.exists() xor countQuantity.exists()"/>
+        <expression value="(count.exists() and countQuantity.exists()).not()"/>
         <source value="http://hl7.org/fhir/StructureDefinition/MeasureReport"/>
       </constraint>         
       <type>
@@ -1104,7 +1104,7 @@
         <key value="mrp-4"/>
         <severity value="error"/>
         <human value="The count and countQuantity elements for a statum population SHALL be mutually exclusive"/>
-        <expression value="count.exists() xor countQuantity.exists()"/>
+        <expression value="(count.exists() and countQuantity.exists()).not()"/>
         <source value="http://hl7.org/fhir/StructureDefinition/MeasureReport"/>
       </constraint>         
       <mapping>
diff --git a/source/parameters/invariant-tests/cnt-3.p1.pass.json b/source/parameters/invariant-tests/cnt-3.p1.pass.json
new file mode 100644
index 00000000000..bc7d5ffb1d3
--- /dev/null
+++ b/source/parameters/invariant-tests/cnt-3.p1.pass.json
@@ -0,0 +1,6 @@
+{
+  "resourceType": "Parameters",
+  "parameter": [
+    { "name": "x", "valueCount": { "value": 5.0, "system": "http://unitsofmeasure.org", "code": "1" } }
+  ]
+}
diff --git a/source/parameters/invariant-tests/drt-1.f1.fail.json b/source/parameters/invariant-tests/drt-1.f1.fail.json
new file mode 100644
index 00000000000..1e2e14a321e
--- /dev/null
+++ b/source/parameters/invariant-tests/drt-1.f1.fail.json
@@ -0,0 +1,11 @@
+{
+  "resourceType": "Parameters",
+  "parameter": [
+    {
+      "name": "x",
+      "valueDuration": {
+        "value": 30
+      }
+    }
+  ]
+}
diff --git a/source/parameters/invariant-tests/drt-1.p1.pass.json b/source/parameters/invariant-tests/drt-1.p1.pass.json
new file mode 100644
index 00000000000..1093d51dec5
--- /dev/null
+++ b/source/parameters/invariant-tests/drt-1.p1.pass.json
@@ -0,0 +1,12 @@
+{
+  "resourceType": "Parameters",
+  "parameter": [
+    {
+      "name": "x",
+      "valueDuration": {
+        "value": 30,
+        "code": "min"
+      }
+    }
+  ]
+}
diff --git a/source/plandefinition/invariant-tests/exp-2.f1.fail.json b/source/plandefinition/invariant-tests/exp-2.f1.fail.json
new file mode 100644
index 00000000000..edf6d20f188
--- /dev/null
+++ b/source/plandefinition/invariant-tests/exp-2.f1.fail.json
@@ -0,0 +1,19 @@
+{
+  "resourceType": "PlanDefinition",
+  "status": "active",
+  "action": [
+    {
+      "title": "a",
+      "condition": [
+        {
+          "kind": "applicability",
+          "expression": {
+            "name": "9-bad name",
+            "language": "text/fhirpath",
+            "expression": "true"
+          }
+        }
+      ]
+    }
+  ]
+}
diff --git a/source/plandefinition/invariant-tests/pld-3.p1.pass.json b/source/plandefinition/invariant-tests/pld-3.p1.pass.json
new file mode 100644
index 00000000000..73157beef88
--- /dev/null
+++ b/source/plandefinition/invariant-tests/pld-3.p1.pass.json
@@ -0,0 +1,27 @@
+{
+  "resourceType": "PlanDefinition",
+  "status": "active",
+  "goal": [
+    {
+      "id": "g1",
+      "description": {
+        "text": "x"
+      }
+    },
+    {
+      "id": "g2",
+      "description": {
+        "text": "y"
+      }
+    }
+  ],
+  "action": [
+    {
+      "title": "a",
+      "goalId": [
+        "g1",
+        "g2"
+      ]
+    }
+  ]
+}
diff --git a/source/plandefinition/invariant-tests/pld-6.p1.pass.json b/source/plandefinition/invariant-tests/pld-6.p1.pass.json
new file mode 100644
index 00000000000..7b9f0d4ac8d
--- /dev/null
+++ b/source/plandefinition/invariant-tests/pld-6.p1.pass.json
@@ -0,0 +1,13 @@
+{
+  "resourceType": "PlanDefinition",
+  "status": "active",
+  "relatedArtifact": [
+    {
+      "type": "depends-on",
+      "resource": "http://x/Library/a",
+      "resourceReference": {
+        "reference": "Library/a"
+      }
+    }
+  ]
+}
diff --git a/source/plandefinition/structuredefinition-PlanDefinition.xml b/source/plandefinition/structuredefinition-PlanDefinition.xml
index bc0cd485bc7..8655c7ee7b3 100644
--- a/source/plandefinition/structuredefinition-PlanDefinition.xml
+++ b/source/plandefinition/structuredefinition-PlanDefinition.xml
@@ -99,7 +99,7 @@
 				<key value="pld-3"/>
 				<severity value="warning"/>
 				<human value="goalid should reference the id of a goal definition"/>
-				<expression value="%context.repeat(action).where((goalId in %context.goal.id).not()).exists().not()"/>
+				<expression value="%context.repeat(action).goalId.all($this in %context.goal.id)"/>
 			</constraint>
 			<constraint>
 				<key value="pld-4"/>
@@ -874,7 +874,7 @@
 				<key value="pld-6"/>
 				<severity value="warning"/>
 				<human value="Dependencies of a PlanDefinition should reference a resource"/>
-				<expression value="type in ('depends-on' | 'part-of') implies ((resource.exists() xor resourceReference.exists()) or (artifact is canonical xor artifact is Reference))"/>
+				<expression value="type in ('depends-on' | 'part-of') implies (resource.exists() or resourceReference.exists())"/>
 				<source value="http://hl7.org/fhir/StructureDefinition/PlanDefinition"/>
 			</constraint>
 			<constraint>
diff --git a/source/questionnaire/invariant-tests/que-16.f1.fail.json b/source/questionnaire/invariant-tests/que-16.f1.fail.json
new file mode 100644
index 00000000000..82b49b5748a
--- /dev/null
+++ b/source/questionnaire/invariant-tests/que-16.f1.fail.json
@@ -0,0 +1,10 @@
+{
+  "resourceType": "Questionnaire",
+  "status": "active",
+  "item": [
+    {
+      "linkId": "double  space",
+      "type": "string"
+    }
+  ]
+}
diff --git a/source/questionnaire/invariant-tests/que-5.p1.pass.json b/source/questionnaire/invariant-tests/que-5.p1.pass.json
new file mode 100644
index 00000000000..36d9f92bd29
--- /dev/null
+++ b/source/questionnaire/invariant-tests/que-5.p1.pass.json
@@ -0,0 +1,15 @@
+{
+  "resourceType": "Questionnaire",
+  "status": "active",
+  "item": [
+    {
+      "linkId": "u",
+      "type": "url",
+      "answerOption": [
+        {
+          "valueUri": "http://example.org/a"
+        }
+      ]
+    }
+  ]
+}
diff --git a/source/questionnaire/invariant-tests/que-5b.p1.pass.json b/source/questionnaire/invariant-tests/que-5b.p1.pass.json
new file mode 100644
index 00000000000..fb3c002ff22
--- /dev/null
+++ b/source/questionnaire/invariant-tests/que-5b.p1.pass.json
@@ -0,0 +1,11 @@
+{
+  "resourceType": "Questionnaire",
+  "status": "active",
+  "item": [
+    {
+      "linkId": "u",
+      "type": "url",
+      "answerValueSet": "http://example.org/vs"
+    }
+  ]
+}
diff --git a/source/questionnaire/structuredefinition-Questionnaire.xml b/source/questionnaire/structuredefinition-Questionnaire.xml
index 3e9554fe9a9..99043f551ae 100644
--- a/source/questionnaire/structuredefinition-Questionnaire.xml
+++ b/source/questionnaire/structuredefinition-Questionnaire.xml
@@ -762,14 +762,14 @@
 				<key value="que-5"/>
 				<severity value="error"/>
 				<human value="Only coding, decimal, integer, date, dateTime, time, string, quantity, reference, or uri items can have answerOption"/>
-				<expression value="(('coding' | 'decimal' | 'integer' | 'date' | 'dateTime' | 'time' | 'string' | 'quantity' | 'reference' | 'uri') contains type) or answerOption.empty()"/>
+				<expression value="(('coding' | 'decimal' | 'integer' | 'date' | 'dateTime' | 'time' | 'string' | 'quantity' | 'reference' | 'url') contains type) or answerOption.empty()"/>
 				<source value="http://hl7.org/fhir/StructureDefinition/Questionnaire"/>
 			</constraint>
 			<constraint>
 				<key value="que-5b"/>
 				<severity value="error"/>
-				<human value="Only coding, decimal, integer, date, dateTime, time, string or quantity  items can have answerOption"/>
-				<expression value="(('coding' | 'string' | 'uri') contains type) or answerValueSet.empty()"/>
+				<human value="Only coding, string or url items can have an answerValueSet"/>
+				<expression value="(('coding' | 'string' | 'url') contains type) or answerValueSet.empty()"/>
 				<source value="http://hl7.org/fhir/StructureDefinition/Questionnaire"/>
 			</constraint>
 			<constraint>
@@ -892,7 +892,7 @@
         <key value="que-16"/>
         <severity value="error"/>
         <human value="LinkId cannot have leading or trailing spaces or intevening whitespace other than single space characters"/>
-        <expression value="$this.matches('[^\\s]+( [^\\s]+)*')"/>
+        <expression value="$this.matches('^[^\\s]+( [^\\s]+)*$')"/>
       </constraint>
 			<mapping>
 				<identity value="rim"/>
diff --git a/source/questionnaireresponse/invariant-tests/qrs-2.f1.fail.json b/source/questionnaireresponse/invariant-tests/qrs-2.f1.fail.json
new file mode 100644
index 00000000000..c16480dd505
--- /dev/null
+++ b/source/questionnaireresponse/invariant-tests/qrs-2.f1.fail.json
@@ -0,0 +1,27 @@
+{
+  "resourceType": "QuestionnaireResponse",
+  "status": "completed",
+  "item": [
+    {
+      "linkId": "group",
+      "item": [
+        {
+          "linkId": "dup",
+          "answer": [
+            {
+              "valueString": "a"
+            }
+          ]
+        },
+        {
+          "linkId": "dup",
+          "answer": [
+            {
+              "valueString": "b"
+            }
+          ]
+        }
+      ]
+    }
+  ]
+}
diff --git a/source/questionnaireresponse/invariant-tests/qrs-3.f1.fail.json b/source/questionnaireresponse/invariant-tests/qrs-3.f1.fail.json
new file mode 100644
index 00000000000..fec29be9044
--- /dev/null
+++ b/source/questionnaireresponse/invariant-tests/qrs-3.f1.fail.json
@@ -0,0 +1,9 @@
+{
+  "resourceType": "QuestionnaireResponse",
+  "status": "completed",
+  "item": [
+    {
+      "linkId": "double  space"
+    }
+  ]
+}
diff --git a/source/questionnaireresponse/structuredefinition-QuestionnaireResponse.xml b/source/questionnaireresponse/structuredefinition-QuestionnaireResponse.xml
index 24273257684..02f352a1c2f 100644
--- a/source/questionnaireresponse/structuredefinition-QuestionnaireResponse.xml
+++ b/source/questionnaireresponse/structuredefinition-QuestionnaireResponse.xml
@@ -397,7 +397,7 @@
         <key value="qrs-2"/>
         <severity value="error"/>
         <human value="Repeated answers are combined in the answers array of a single item"/>
-        <expression value="repeat(answer|item).select(item.where(answer.value.exists()).linkId.isDistinct()).allTrue()"/>
+        <expression value="item.where(answer.value.exists()).linkId.isDistinct() and repeat(answer|item).select(item.where(answer.value.exists()).linkId.isDistinct()).allTrue()"/>
         <source value="http://hl7.org/fhir/StructureDefinition/QuestionnaireResponse"/>
       </constraint>
       <mapping>
@@ -421,7 +421,7 @@
         <key value="qrs-3"/>
         <severity value="error"/>
         <human value="LinkId cannot have leading or trailing spaces or intevening whitespace other than single space characters"/>
-        <expression value="$this.matches('[^\\s]+( [^\\s]+)*')"/>
+        <expression value="$this.matches('^[^\\s]+( [^\\s]+)*$')"/>
       </constraint>
       <mapping>
         <identity value="rim"/>
diff --git a/source/structuredefinition/invariant-tests/eld-12.f1.fail.json b/source/structuredefinition/invariant-tests/eld-12.f1.fail.json
new file mode 100644
index 00000000000..6c29ce98a77
--- /dev/null
+++ b/source/structuredefinition/invariant-tests/eld-12.f1.fail.json
@@ -0,0 +1,23 @@
+{
+  "resourceType": "StructureDefinition",
+  "url": "http://example.org/sd/eld12",
+  "name": "Eld12",
+  "status": "draft",
+  "kind": "resource",
+  "abstract": false,
+  "type": "Observation",
+  "baseDefinition": "http://hl7.org/fhir/StructureDefinition/Observation",
+  "derivation": "constraint",
+  "differential": {
+    "element": [
+      {
+        "id": "Observation.status",
+        "path": "Observation.status",
+        "binding": {
+          "strength": "required",
+          "valueSet": "httpsfoo"
+        }
+      }
+    ]
+  }
+}
diff --git a/source/structuredefinition/invariant-tests/eld-21.f1.fail.json b/source/structuredefinition/invariant-tests/eld-21.f1.fail.json
new file mode 100644
index 00000000000..0418f66273c
--- /dev/null
+++ b/source/structuredefinition/invariant-tests/eld-21.f1.fail.json
@@ -0,0 +1,34 @@
+{
+  "resourceType": "StructureDefinition",
+  "url": "http://example.org/sd/eld21",
+  "name": "Eld21",
+  "status": "draft",
+  "kind": "resource",
+  "abstract": false,
+  "type": "Patient",
+  "baseDefinition": "http://hl7.org/fhir/StructureDefinition/Patient",
+  "derivation": "constraint",
+  "differential": {
+    "element": [
+      {
+        "id": "Patient.name",
+        "path": "Patient.name",
+        "constraint": [
+          {
+            "key": "x-1",
+            "severity": "error",
+            "human": "must be set",
+            "_expression": {
+              "extension": [
+                {
+                  "url": "http://hl7.org/fhir/StructureDefinition/data-absent-reason",
+                  "valueCode": "unknown"
+                }
+              ]
+            }
+          }
+        ]
+      }
+    ]
+  }
+}