diff --git a/fhir-path/src/main/java/com/ibm/fhir/path/patch/FHIRPathPatch.java b/fhir-path/src/main/java/com/ibm/fhir/path/patch/FHIRPathPatch.java
index 960357f2025..fc8934306f7 100644
--- a/fhir-path/src/main/java/com/ibm/fhir/path/patch/FHIRPathPatch.java
+++ b/fhir-path/src/main/java/com/ibm/fhir/path/patch/FHIRPathPatch.java
@@ -10,6 +10,7 @@
 import java.util.Collections;
 import java.util.List;
 import java.util.Objects;
+import java.util.UUID;
 
 import com.ibm.fhir.model.patch.FHIRPatch;
 import com.ibm.fhir.model.patch.exception.FHIRPatchException;
@@ -38,7 +39,7 @@ public <T extends Resource> T apply(T resource) throws FHIRPatchException {
      * Convert the FHIRPathPatch to a FHIR Parameters resource
      */
     public Parameters toParameters() {
-        Parameters.Builder builder = Parameters.builder();
+        Parameters.Builder builder = Parameters.builder().id(UUID.randomUUID().toString());
         for (FHIRPathPatchOperation operation : operations) {
             builder.parameter(operation.toParameter());
         }
@@ -127,14 +128,14 @@ public FHIRPathPatch build() {
     public static FHIRPathPatch from(Parameters params) {
         Objects.requireNonNull(params);
         Builder builder = FHIRPathPatch.builder();
-        
+
         for (Parameter param : params.getParameter()) {
             if (!FHIRPathPatchOperation.OPERATION.equals(param.getName().getValue())) {
                 throw new IllegalArgumentException("Each FHIRPath patch operation must have a name of 'operation'");
             }
             addOperation(builder, param);
         }
-        
+
         return builder.build();
     }
     
@@ -143,7 +144,7 @@ public static FHIRPathPatch from(Parameters params) {
      * 
      * @throws IllegalArgumentException if the Parameter object does not represent a valid FHIRPath Patch operation
      */
-    private static FHIRPathPatchOperation addOperation(Builder builder, Parameter operation) {
+    private static void addOperation(Builder builder, Parameter operation) {
         boolean foundType = false, foundPath = false, foundName = false, foundValue = false, foundIndex = false, foundSource = false, foundDestination = false;
         FHIRPathPatchType type = null;
         String fhirPath = null;
@@ -197,11 +198,21 @@ private static FHIRPathPatchOperation addOperation(Builder builder, Parameter op
         }
         try {
             switch (type) {
-            case ADD:       builder.add(fhirPath, name, value);
-            case DELETE:    builder.delete(fhirPath);
-            case INSERT:    builder.insert(fhirPath, value, index);
-            case MOVE:      builder.move(fhirPath, source, destination);
-            case REPLACE:   builder.replace(fhirPath, value);
+            case ADD:
+                builder.add(fhirPath, name, value);
+                break;
+            case DELETE:
+                builder.delete(fhirPath);
+                break;
+            case INSERT:
+                builder.insert(fhirPath, value, index);
+                break;
+            case MOVE:
+                builder.move(fhirPath, source, destination);
+                break;
+            case REPLACE:
+                builder.replace(fhirPath, value);
+                break;
             default:
                 throw new IllegalArgumentException("Invalid FHIRPath patch operation type: " + type.name());
             }
diff --git a/fhir-path/src/main/java/com/ibm/fhir/path/patch/FHIRPathPatchInsert.java b/fhir-path/src/main/java/com/ibm/fhir/path/patch/FHIRPathPatchInsert.java
index ada6c20360f..76c75dd2c08 100644
--- a/fhir-path/src/main/java/com/ibm/fhir/path/patch/FHIRPathPatchInsert.java
+++ b/fhir-path/src/main/java/com/ibm/fhir/path/patch/FHIRPathPatchInsert.java
@@ -44,20 +44,20 @@ public Parameter toParameter() {
                 .name(string(OPERATION))
                 .part(Parameter.builder()
                     .name(string(TYPE))
-                    .value(Code.of(FHIRPathPatchType.ADD.value()))
+                    .value(Code.of(FHIRPathPatchType.INSERT.value()))
                     .build())
                 .part(Parameter.builder()
                     .name(string(PATH))
                     .value(string(fhirPath))
                     .build())
-                .part(Parameter.builder()
-                    .name(string(VALUE))
-                    .value(value)
-                    .build())
                 .part(Parameter.builder()
                     .name(string(INDEX))
                     .value(com.ibm.fhir.model.type.Integer.of(index))
                     .build())
+                .part(Parameter.builder()
+                    .name(string(VALUE))
+                    .value(value)
+                    .build())
                 .build();
     }
 }
\ No newline at end of file
diff --git a/fhir-path/src/main/java/com/ibm/fhir/path/patch/FHIRPathPatchMove.java b/fhir-path/src/main/java/com/ibm/fhir/path/patch/FHIRPathPatchMove.java
index b551e3d15a0..e117461d9f6 100644
--- a/fhir-path/src/main/java/com/ibm/fhir/path/patch/FHIRPathPatchMove.java
+++ b/fhir-path/src/main/java/com/ibm/fhir/path/patch/FHIRPathPatchMove.java
@@ -43,7 +43,7 @@ public Parameter toParameter() {
                 .name(string(OPERATION))
                 .part(Parameter.builder()
                     .name(string(TYPE))
-                    .value(Code.of(FHIRPathPatchType.ADD.value()))
+                    .value(Code.of(FHIRPathPatchType.MOVE.value()))
                     .build())
                 .part(Parameter.builder()
                     .name(string(PATH))
diff --git a/fhir-path/src/main/java/com/ibm/fhir/path/patch/FHIRPathPatchReplace.java b/fhir-path/src/main/java/com/ibm/fhir/path/patch/FHIRPathPatchReplace.java
index 352ee570f34..e77fc145515 100644
--- a/fhir-path/src/main/java/com/ibm/fhir/path/patch/FHIRPathPatchReplace.java
+++ b/fhir-path/src/main/java/com/ibm/fhir/path/patch/FHIRPathPatchReplace.java
@@ -42,7 +42,7 @@ public Parameter toParameter() {
                 .name(string(OPERATION))
                 .part(Parameter.builder()
                     .name(string(TYPE))
-                    .value(Code.of(FHIRPathPatchType.ADD.value()))
+                    .value(Code.of(FHIRPathPatchType.REPLACE.value()))
                     .build())
                 .part(Parameter.builder()
                     .name(string(PATH))
diff --git a/fhir-path/src/test/java/com/ibm/fhir/path/patch/test/FHIRPathPatchSpecTest.java b/fhir-path/src/test/java/com/ibm/fhir/path/patch/test/FHIRPathPatchSpecTest.java
index e7814d12bc0..8d7b7cea1eb 100644
--- a/fhir-path/src/test/java/com/ibm/fhir/path/patch/test/FHIRPathPatchSpecTest.java
+++ b/fhir-path/src/test/java/com/ibm/fhir/path/patch/test/FHIRPathPatchSpecTest.java
@@ -79,7 +79,9 @@ private void executeTest() throws Exception {
         }
         try {
             FHIRPathPatch patch = FHIRPathPatch.from(params);
-            assertEquals(patch.toParameters(), params);
+            // Set the id to match the expected parameters object so we can do a normal compare
+            Parameters serializedPatch = patch.toParameters().toBuilder().id(params.getId()).build();
+            assertEquals(serializedPatch, params);
 
             Resource actualOutput = patch.apply(input);
             assertEquals(actualOutput, expectedOutput);
@@ -117,7 +119,7 @@ public static Object[][] provideAllTestData() throws Exception {
         domFactory.setIgnoringElementContentWhitespace(true);
         domFactory.setNamespaceAware(true);
         DocumentBuilder documentBuilder = domFactory.newDocumentBuilder();
-        try (InputStream in = FHIRPathPatchSpecTest.class.getClassLoader().getResourceAsStream("patch\\fhir-path-tests.xml")) {
+        try (InputStream in = FHIRPathPatchSpecTest.class.getClassLoader().getResourceAsStream("fhir-path-patch-tests.xml")) {
             Document testDoc = documentBuilder.parse(in);
             
             NodeList cases = testDoc.getDocumentElement().getElementsByTagName("case");
diff --git a/fhir-path/src/test/resources/fhir-path-patch-tests.CHANGELOG b/fhir-path/src/test/resources/fhir-path-patch-tests.CHANGELOG
index f16dbdca9dd..0f7df85259d 100644
--- a/fhir-path/src/test/resources/fhir-path-patch-tests.CHANGELOG
+++ b/fhir-path/src/test/resources/fhir-path-patch-tests.CHANGELOG
@@ -1,3 +1,4 @@
 Renamed file from "patch\fhir-path-tests.xml" to "fhir-path-patch-tests.xml" to avoid git error: invalid path 'fhir-path/src/test/resources/patch\fhir-path-tests.CHANGELOG'
 To workaround global-1 I added a Resource.id to all FHIR Resources in the file (except the "Full Resource" test case which already had one)
-I commented out the Patient.text.div replace operation in the test case Full Resource
\ No newline at end of file
+I commented out the Patient.text.div replace operation in the test case Full Resource
+Replace tabs with spaces and remove trailing whitespace
\ No newline at end of file
diff --git a/fhir-path/src/test/resources/fhir-path-patch-tests.xml b/fhir-path/src/test/resources/fhir-path-patch-tests.xml
index 94bb95f9d3d..e3a49dc2ac3 100644
--- a/fhir-path/src/test/resources/fhir-path-patch-tests.xml
+++ b/fhir-path/src/test/resources/fhir-path-patch-tests.xml
@@ -1,531 +1,531 @@
 <tests>
   <case name="No Difference" mode="both">
-    <input> 
-	  <Patient xmlns="http://hl7.org/fhir"><id value="test"/>
-	    <birthDate value="1920-01-01"/>
-	  </Patient>
-	</input>
-	<diff>
-	  <Parameters xmlns="http://hl7.org/fhir"><id value="test"/>
-	  </Parameters>	  
-	</diff>
-	<output>
-	  <Patient xmlns="http://hl7.org/fhir"><id value="test"/>
-	    <birthDate value="1920-01-01"/>
-	  </Patient>
-	</output>
+    <input>
+      <Patient xmlns="http://hl7.org/fhir"><id value="test"/>
+        <birthDate value="1920-01-01"/>
+      </Patient>
+    </input>
+    <diff>
+      <Parameters xmlns="http://hl7.org/fhir"><id value="test"/>
+      </Parameters>
+    </diff>
+    <output>
+      <Patient xmlns="http://hl7.org/fhir"><id value="test"/>
+        <birthDate value="1920-01-01"/>
+      </Patient>
+    </output>
   </case>
   
   <case name="Replace Primitive" mode="both">
-    <input> 
-	  <Patient xmlns="http://hl7.org/fhir"><id value="test"/>
-	    <birthDate value="1920-01-01"/>
-	  </Patient>
-	</input>
-	<diff>
-	  <Parameters xmlns="http://hl7.org/fhir"><id value="test"/>
-	    <parameter>
-		  <name value="operation"/>
-		  <part>
-		    <name value="type"/>
-			<valueCode value="replace"/>
-		  </part>
-		  <part>
-		    <name value="path"/>
-			<valueString value="Patient.birthDate"/>
-		  </part>
-		  <part>
-		    <name value="value"/>
-			<valueDate value="1930-01-01"/>
-		  </part>
-		</parameter>
-	  </Parameters>	  
-	</diff>
-	<output>
-	  <Patient xmlns="http://hl7.org/fhir"><id value="test"/>
-	    <birthDate value="1930-01-01"/>
-	  </Patient>
-	</output>
+    <input>
+      <Patient xmlns="http://hl7.org/fhir"><id value="test"/>
+        <birthDate value="1920-01-01"/>
+      </Patient>
+    </input>
+    <diff>
+      <Parameters xmlns="http://hl7.org/fhir"><id value="test"/>
+        <parameter>
+          <name value="operation"/>
+          <part>
+            <name value="type"/>
+            <valueCode value="replace"/>
+          </part>
+          <part>
+            <name value="path"/>
+            <valueString value="Patient.birthDate"/>
+          </part>
+          <part>
+            <name value="value"/>
+            <valueDate value="1930-01-01"/>
+          </part>
+        </parameter>
+      </Parameters>     
+    </diff>
+    <output>
+      <Patient xmlns="http://hl7.org/fhir"><id value="test"/>
+        <birthDate value="1930-01-01"/>
+      </Patient>
+    </output>
   </case>
 
   <case name="Delete Primitive" mode="both">
-    <input> 
-	  <Patient xmlns="http://hl7.org/fhir"><id value="test"/>
-	    <birthDate value="1920-01-01"/>
-	  </Patient>
-	</input>
-	<diff>
-	  <Parameters xmlns="http://hl7.org/fhir"><id value="test"/>
-	    <parameter>
-		  <name value="operation"/>
-		  <part>
-		    <name value="type"/>
-			<valueCode value="delete"/>
-		  </part>
-		  <part>
-		    <name value="path"/>
-			<valueString value="Patient.birthDate"/>
-		  </part>
-		</parameter>
-	  </Parameters>	  
-	</diff>
-	<output>
-	  <Patient xmlns="http://hl7.org/fhir"><id value="test"/>
-	  </Patient>
-	</output>
+    <input>
+      <Patient xmlns="http://hl7.org/fhir"><id value="test"/>
+        <birthDate value="1920-01-01"/>
+      </Patient>
+    </input>
+    <diff>
+      <Parameters xmlns="http://hl7.org/fhir"><id value="test"/>
+        <parameter>
+          <name value="operation"/>
+          <part>
+            <name value="type"/>
+            <valueCode value="delete"/>
+          </part>
+          <part>
+            <name value="path"/>
+            <valueString value="Patient.birthDate"/>
+          </part>
+        </parameter>
+      </Parameters>     
+    </diff>
+    <output>
+      <Patient xmlns="http://hl7.org/fhir"><id value="test"/>
+      </Patient>
+    </output>
   </case>
 
   <case name="Add Primitive" mode="both">
-    <input> 
-	  <Patient xmlns="http://hl7.org/fhir"><id value="test"/>
-	  </Patient>
-	</input>
-	<diff>
-	  <Parameters xmlns="http://hl7.org/fhir"><id value="test"/>
-	    <parameter>
-		  <name value="operation"/>
-		  <part>
-		    <name value="type"/>
-			<valueCode value="add"/>
-		  </part>
-		  <part>
-		    <name value="path"/>
-			<valueString value="Patient"/>
-		  </part>
-		  <part>
-		    <name value="name"/>
-			<valueString value="birthDate"/>
-		  </part>
-		  <part>
-		    <name value="value"/>
-			<valueDate value="1930-01-01"/>
-		  </part>
-		</parameter>
-	  </Parameters>	  
-	</diff>
-	<output>
-	  <Patient xmlns="http://hl7.org/fhir"><id value="test"/>
-	    <birthDate value="1930-01-01"/>
-	  </Patient>
-	</output>
+    <input>
+      <Patient xmlns="http://hl7.org/fhir"><id value="test"/>
+      </Patient>
+    </input>
+    <diff>
+      <Parameters xmlns="http://hl7.org/fhir"><id value="test"/>
+        <parameter>
+          <name value="operation"/>
+          <part>
+            <name value="type"/>
+            <valueCode value="add"/>
+          </part>
+          <part>
+            <name value="path"/>
+            <valueString value="Patient"/>
+          </part>
+          <part>
+            <name value="name"/>
+            <valueString value="birthDate"/>
+          </part>
+          <part>
+            <name value="value"/>
+            <valueDate value="1930-01-01"/>
+          </part>
+        </parameter>
+      </Parameters>     
+    </diff>
+    <output>
+      <Patient xmlns="http://hl7.org/fhir"><id value="test"/>
+        <birthDate value="1930-01-01"/>
+      </Patient>
+    </output>
   </case>
   
   <case name="Delete Primitive #2" mode="both">
-    <input> 
-	  <Patient xmlns="http://hl7.org/fhir"><id value="test"/>
-	    <birthDate value="1920-01-01"/>
-	  </Patient>
-	</input>
-	<diff>
-	  <Parameters xmlns="http://hl7.org/fhir"><id value="test"/>
-	    <parameter>
-		  <name value="operation"/>
-		  <part>
-		    <name value="type"/>
-			<valueCode value="delete"/>
-		  </part>
-		  <part>
-		    <name value="path"/>
-			<valueString value="Patient.birthDate"/>
-		  </part>
-		</parameter>
-	  </Parameters>	  
-	</diff>
-	<output>
-	  <Patient xmlns="http://hl7.org/fhir"><id value="test"/>
-	  </Patient>
-	</output>
+    <input>
+      <Patient xmlns="http://hl7.org/fhir"><id value="test"/>
+        <birthDate value="1920-01-01"/>
+      </Patient>
+    </input>
+    <diff>
+      <Parameters xmlns="http://hl7.org/fhir"><id value="test"/>
+        <parameter>
+          <name value="operation"/>
+          <part>
+            <name value="type"/>
+            <valueCode value="delete"/>
+          </part>
+          <part>
+            <name value="path"/>
+            <valueString value="Patient.birthDate"/>
+          </part>
+        </parameter>
+      </Parameters>     
+    </diff>
+    <output>
+      <Patient xmlns="http://hl7.org/fhir"><id value="test"/>
+      </Patient>
+    </output>
   </case>
 
   <!-- same operations, on a nested primitive -->
   <case name="Replace Nested Primitive #1" mode="both">
-    <input> 
-	  <Patient xmlns="http://hl7.org/fhir"><id value="test"/>
-	    <contact>
-		  <name>
-		    <text value="a name"/>
-		  </name>
-	      <gender value="male"/>
-		</contact>
-	  </Patient>
-	</input>
-	<diff>
-	  <Parameters xmlns="http://hl7.org/fhir"><id value="test"/>
-	    <parameter>
-		  <name value="operation"/>
-		  <part>
-		    <name value="type"/>
-			<valueCode value="replace"/>
-		  </part>
-		  <part>
-		    <name value="path"/>
-			<valueString value="Patient.contact[0].gender"/>
-		  </part>
-		  <part>
-		    <name value="value"/>
-			<valueCode value="female"/>
-		  </part>
-		</parameter>
-	  </Parameters>	  
-	</diff>
-	<output>
-	  <Patient xmlns="http://hl7.org/fhir"><id value="test"/>
-	    <contact>
-		  <name>
-		    <text value="a name"/>
-		  </name>
-	      <gender value="female"/>
-		</contact>
-	  </Patient>
-	</output>
+    <input>
+      <Patient xmlns="http://hl7.org/fhir"><id value="test"/>
+        <contact>
+          <name>
+            <text value="a name"/>
+          </name>
+          <gender value="male"/>
+        </contact>
+      </Patient>
+    </input>
+    <diff>
+      <Parameters xmlns="http://hl7.org/fhir"><id value="test"/>
+        <parameter>
+          <name value="operation"/>
+          <part>
+            <name value="type"/>
+            <valueCode value="replace"/>
+          </part>
+          <part>
+            <name value="path"/>
+            <valueString value="Patient.contact[0].gender"/>
+          </part>
+          <part>
+            <name value="value"/>
+            <valueCode value="female"/>
+          </part>
+        </parameter>
+      </Parameters>     
+    </diff>
+    <output>
+      <Patient xmlns="http://hl7.org/fhir"><id value="test"/>
+        <contact>
+          <name>
+            <text value="a name"/>
+          </name>
+          <gender value="female"/>
+        </contact>
+      </Patient>
+    </output>
   </case>
 
-  <case name="Replace Nested Primitive #2" mode="both"> 
-    <input> 
-	  <Patient xmlns="http://hl7.org/fhir"><id value="test"/>
-	    <contact>
-		  <name>
-		    <text value="a name"/>
-		  </name>
-	      <gender value="male"/>
-		</contact>
-	  </Patient>
-	</input>
-	<diff>
-	  <Parameters xmlns="http://hl7.org/fhir"><id value="test"/>
-	    <parameter>
-		  <name value="operation"/>
-		  <part>
-		    <name value="type"/>
-			<valueCode value="replace"/>
-		  </part>
-		  <part>
-		    <name value="path"/>
-			<valueString value="Patient.contact[0].name.text"/>
-		  </part>
-		  <part>
-		    <name value="value"/>
-			<valueString value="the name"/>
-		  </part>
-		</parameter>
-	  </Parameters>	  
-	</diff>
-	<output>
-	  <Patient xmlns="http://hl7.org/fhir"><id value="test"/>
-	    <contact>
-		  <name>
-		    <text value="the name"/>
-		  </name>
-	      <gender value="male"/>
-		</contact>
-	  </Patient>
-	</output>
+  <case name="Replace Nested Primitive #2" mode="both">
+    <input>
+      <Patient xmlns="http://hl7.org/fhir"><id value="test"/>
+        <contact>
+          <name>
+            <text value="a name"/>
+          </name>
+          <gender value="male"/>
+        </contact>
+      </Patient>
+    </input>
+    <diff>
+      <Parameters xmlns="http://hl7.org/fhir"><id value="test"/>
+        <parameter>
+          <name value="operation"/>
+          <part>
+            <name value="type"/>
+            <valueCode value="replace"/>
+          </part>
+          <part>
+            <name value="path"/>
+            <valueString value="Patient.contact[0].name.text"/>
+          </part>
+          <part>
+            <name value="value"/>
+            <valueString value="the name"/>
+          </part>
+        </parameter>
+      </Parameters>     
+    </diff>
+    <output>
+      <Patient xmlns="http://hl7.org/fhir"><id value="test"/>
+        <contact>
+          <name>
+            <text value="the name"/>
+          </name>
+          <gender value="male"/>
+        </contact>
+      </Patient>
+    </output>
   </case>
 
   <case name="Delete Nested Primitive #1" mode="both">
-    <input> 
-	  <Patient xmlns="http://hl7.org/fhir"><id value="test"/>
-	    <contact>
-		    <name>
-		      <text value="a name"/>
-		    </name>
-	      <gender value="male"/>
-		</contact>
-	  </Patient>
-	</input>
-	<diff>
-	  <Parameters xmlns="http://hl7.org/fhir"><id value="test"/>
-	    <parameter>
-		  <name value="operation"/>
-		  <part>
-		    <name value="type"/>
-			<valueCode value="delete"/>
-		  </part>
-		  <part>
-		    <name value="path"/>
-			<valueString value="Patient.contact[0].gender"/>
-		  </part>
-		</parameter>
-	  </Parameters>	  
-	</diff>
-	<output>
-	  <Patient xmlns="http://hl7.org/fhir"><id value="test"/>
-	    <contact>
-		  <name>
-		    <text value="a name"/>
-		  </name>
-		</contact>
-	  </Patient>
-	</output>
+    <input>
+      <Patient xmlns="http://hl7.org/fhir"><id value="test"/>
+        <contact>
+            <name>
+              <text value="a name"/>
+            </name>
+          <gender value="male"/>
+        </contact>
+      </Patient>
+    </input>
+    <diff>
+      <Parameters xmlns="http://hl7.org/fhir"><id value="test"/>
+        <parameter>
+          <name value="operation"/>
+          <part>
+            <name value="type"/>
+            <valueCode value="delete"/>
+          </part>
+          <part>
+            <name value="path"/>
+            <valueString value="Patient.contact[0].gender"/>
+          </part>
+        </parameter>
+      </Parameters>
+    </diff>
+    <output>
+      <Patient xmlns="http://hl7.org/fhir"><id value="test"/>
+        <contact>
+          <name>
+            <text value="a name"/>
+          </name>
+        </contact>
+      </Patient>
+    </output>
   </case>
 
   <case name="Delete Nested Primitive #2" mode="forwards"><!-- because skip level -->
-    <input> 
-	  <Patient xmlns="http://hl7.org/fhir"><id value="test"/>
-	    <contact>
-		  <name>
-		    <text value="a name"/>
-		  </name>
-	      <gender value="male"/>
-		</contact>
-	  </Patient>
-	</input>
-	<diff>
-	  <Parameters xmlns="http://hl7.org/fhir"><id value="test"/>
-	    <parameter>
-		  <name value="operation"/>
-		  <part>
-		    <name value="type"/>
-			<valueCode value="delete"/>
-		  </part>
-		  <part>
-		    <name value="path"/>
-			<valueString value="Patient.contact[0].name.text"/>
-		  </part>
-		</parameter>
-	  </Parameters>	  
-	</diff>
-	<output>
-	  <Patient xmlns="http://hl7.org/fhir"><id value="test"/>
-	    <contact>
-	      <gender value="male"/>
-		</contact>
-	  </Patient>
-	</output>
+    <input>
+      <Patient xmlns="http://hl7.org/fhir"><id value="test"/>
+        <contact>
+          <name>
+            <text value="a name"/>
+          </name>
+          <gender value="male"/>
+        </contact>
+      </Patient>
+    </input>
+    <diff>
+      <Parameters xmlns="http://hl7.org/fhir"><id value="test"/>
+        <parameter>
+          <name value="operation"/>
+          <part>
+            <name value="type"/>
+            <valueCode value="delete"/>
+          </part>
+          <part>
+            <name value="path"/>
+            <valueString value="Patient.contact[0].name.text"/>
+          </part>
+        </parameter>
+      </Parameters>
+    </diff>
+    <output>
+      <Patient xmlns="http://hl7.org/fhir"><id value="test"/>
+        <contact>
+          <gender value="male"/>
+        </contact>
+      </Patient>
+    </output>
   </case>
 
   <case name="Add Nested Primitive" mode="both">
-    <input> 
-	  <Patient xmlns="http://hl7.org/fhir"><id value="test"/>
-	    <contact>
-		  <name>
-		    <text value="a name"/>
-		  </name>
-		</contact>
-	  </Patient>
-	</input>
-	<diff>
-	  <Parameters xmlns="http://hl7.org/fhir"><id value="test"/>
-	    <parameter>
-		  <name value="operation"/>
-		  <part>
-		    <name value="type"/>
-			<valueCode value="add"/>
-		  </part>
-		  <part>
-		    <name value="path"/>
-			<valueString value="Patient.contact[0]"/>
-		  </part>
-		  <part>
-		    <name value="name"/>
-			<valueString value="gender"/>
-		  </part>
-		  <part>
-		    <name value="value"/>
-			<valueCode value="male"/>
-		  </part>
-		</parameter>
-	  </Parameters>	  
-	</diff>
-	<output>
-	  <Patient xmlns="http://hl7.org/fhir"><id value="test"/>
-	    <contact>
-		  <name>
-		    <text value="a name"/>
-		  </name>
-	      <gender value="male"/>
-		</contact>
-	  </Patient>
-	</output>
+    <input>
+      <Patient xmlns="http://hl7.org/fhir"><id value="test"/>
+        <contact>
+          <name>
+            <text value="a name"/>
+          </name>
+        </contact>
+      </Patient>
+    </input>
+    <diff>
+      <Parameters xmlns="http://hl7.org/fhir"><id value="test"/>
+        <parameter>
+          <name value="operation"/>
+          <part>
+            <name value="type"/>
+            <valueCode value="add"/>
+          </part>
+          <part>
+            <name value="path"/>
+            <valueString value="Patient.contact[0]"/>
+          </part>
+          <part>
+            <name value="name"/>
+            <valueString value="gender"/>
+          </part>
+          <part>
+            <name value="value"/>
+            <valueCode value="male"/>
+          </part>
+        </parameter>
+      </Parameters>
+    </diff>
+    <output>
+      <Patient xmlns="http://hl7.org/fhir"><id value="test"/>
+        <contact>
+          <name>
+            <text value="a name"/>
+          </name>
+          <gender value="male"/>
+        </contact>
+      </Patient>
+    </output>
   </case>
   
   <!-- moving on to operations on a complex -->
   <case name="Add Complex" mode="both">
-    <input> 
-	  <Patient xmlns="http://hl7.org/fhir"><id value="test"/>
-	  </Patient>
-	</input>
-	<diff>
-	  <Parameters xmlns="http://hl7.org/fhir"><id value="test"/>
-	    <parameter>
-		  <name value="operation"/>
-		  <part>
-		    <name value="type"/>
-			<valueCode value="add"/>
-		  </part>
-		  <part>
-		    <name value="path"/>
-			<valueString value="Patient"/>
-		  </part>
-		  <part>
-		    <name value="name"/>
-			<valueString value="maritalStatus"/>
-		  </part>
-		  <part>
-		    <name value="value"/>
-			<valueCodeableConcept>
-			  <text value="married"/>
-			</valueCodeableConcept>
-		  </part>
-		</parameter>
-	  </Parameters>	  
-	</diff>
-	<output>
-	  <Patient xmlns="http://hl7.org/fhir"><id value="test"/>
-	    <maritalStatus>
-		  <text value="married"/>
-		</maritalStatus>
-	  </Patient>
-	</output>
+    <input>
+      <Patient xmlns="http://hl7.org/fhir"><id value="test"/>
+      </Patient>
+    </input>
+    <diff>
+      <Parameters xmlns="http://hl7.org/fhir"><id value="test"/>
+        <parameter>
+          <name value="operation"/>
+          <part>
+            <name value="type"/>
+            <valueCode value="add"/>
+          </part>
+          <part>
+            <name value="path"/>
+            <valueString value="Patient"/>
+          </part>
+          <part>
+            <name value="name"/>
+            <valueString value="maritalStatus"/>
+          </part>
+          <part>
+            <name value="value"/>
+            <valueCodeableConcept>
+              <text value="married"/>
+            </valueCodeableConcept>
+          </part>
+        </parameter>
+      </Parameters>    
+    </diff>
+    <output>
+      <Patient xmlns="http://hl7.org/fhir"><id value="test"/>
+        <maritalStatus>
+          <text value="married"/>
+        </maritalStatus>
+      </Patient>
+    </output>
   </case>
 
   <case name="Replace Complex" mode="both">
-    <input> 
-	  <Patient xmlns="http://hl7.org/fhir"><id value="test"/>
-	    <maritalStatus id="1">
-		  <text value="married"/>
-		</maritalStatus>
-	  </Patient>
-	</input>
-	<diff>
-	  <Parameters xmlns="http://hl7.org/fhir"><id value="test"/>
-	    <parameter>
-		  <name value="operation"/>
-		  <part>
-		    <name value="type"/>
-			<valueCode value="replace"/>
-		  </part>
-		  <part>
-		    <name value="path"/>
-			<valueString value="Patient.maritalStatus"/>
-		  </part>
-		  <part>
-		    <name value="value"/>
-			<valueCodeableConcept id="2">
-			  <text value="not married"/>
-			</valueCodeableConcept>
-		  </part>
-		</parameter>
-	  </Parameters>	  
-	</diff>
-	<output>
-	  <Patient xmlns="http://hl7.org/fhir"><id value="test"/>
-	    <maritalStatus id="2">
-		  <text value="not married"/>
-		</maritalStatus>
-	  </Patient>
-	</output>
+    <input>
+      <Patient xmlns="http://hl7.org/fhir"><id value="test"/>
+        <maritalStatus id="1">
+          <text value="married"/>
+        </maritalStatus>
+      </Patient>
+    </input>
+    <diff>
+      <Parameters xmlns="http://hl7.org/fhir"><id value="test"/>
+        <parameter>
+          <name value="operation"/>
+          <part>
+            <name value="type"/>
+            <valueCode value="replace"/>
+          </part>
+          <part>
+            <name value="path"/>
+            <valueString value="Patient.maritalStatus"/>
+          </part>
+          <part>
+            <name value="value"/>
+            <valueCodeableConcept id="2">
+              <text value="not married"/>
+            </valueCodeableConcept>
+          </part>
+        </parameter>
+      </Parameters>    
+    </diff>
+    <output>
+      <Patient xmlns="http://hl7.org/fhir"><id value="test"/>
+        <maritalStatus id="2">
+          <text value="not married"/>
+        </maritalStatus>
+      </Patient>
+    </output>
   </case>
 
   <case name="Delete Complex" mode="both">
-    <input> 
-	  <Patient xmlns="http://hl7.org/fhir"><id value="test"/>
-	    <maritalStatus>
-		  <text value="married"/>
-		</maritalStatus>
-	  </Patient>
-	</input>
-	<diff>
-	  <Parameters xmlns="http://hl7.org/fhir"><id value="test"/>
-	    <parameter>
-		  <name value="operation"/>
-		  <part>
-		    <name value="type"/>
-			<valueCode value="delete"/>
-		  </part>
-		  <part>
-		    <name value="path"/>
-			<valueString value="Patient.maritalStatus"/>
-		  </part>
-		</parameter>
-	  </Parameters>	  
-	</diff>
-	<output>
-	  <Patient xmlns="http://hl7.org/fhir"><id value="test"/>
-	  </Patient>
-	</output>
+    <input>
+      <Patient xmlns="http://hl7.org/fhir"><id value="test"/>
+        <maritalStatus>
+          <text value="married"/>
+        </maritalStatus>
+      </Patient>
+    </input>
+    <diff>
+      <Parameters xmlns="http://hl7.org/fhir"><id value="test"/>
+        <parameter>
+          <name value="operation"/>
+          <part>
+            <name value="type"/>
+            <valueCode value="delete"/>
+          </part>
+          <part>
+            <name value="path"/>
+            <valueString value="Patient.maritalStatus"/>
+          </part>
+        </parameter>
+      </Parameters>    
+    </diff>
+    <output>
+      <Patient xmlns="http://hl7.org/fhir"><id value="test"/>
+      </Patient>
+    </output>
   </case>
 
   <!-- anonymous type -->
   <case name="Add Anonymous Type" mode="both">
-    <input> 
-	  <Patient xmlns="http://hl7.org/fhir"><id value="test"/>
-	  </Patient>
-	</input>
-	<diff>
-	  <Parameters xmlns="http://hl7.org/fhir"><id value="test"/>
-	    <parameter>
-		  <name value="operation"/>
-		  <part>
-		    <name value="type"/>
-			<valueCode value="add"/>
-		  </part>
-		  <part>
-		    <name value="path"/>
-			<valueString value="Patient"/>
-		  </part>
-		  <part>
-		    <name value="name"/>
-			<valueString value="contact"/>
-		  </part>
-		  <part>
-		    <name value="value"/>
-			<part>
-			  <name value="name"/>
-			  <valueHumanName>
-  		        <text value="a name"/>
-			  </valueHumanName>
-			</part>
-		  </part>
-		</parameter>
-	  </Parameters>	  
-	</diff>
-	<output>
-	  <Patient xmlns="http://hl7.org/fhir"><id value="test"/>
-	    <contact>
-		  <name>
-		    <text value="a name"/>
-		  </name>
-		</contact>
-	  </Patient>
-	</output>
+    <input>
+      <Patient xmlns="http://hl7.org/fhir"><id value="test"/>
+      </Patient>
+    </input>
+    <diff>
+      <Parameters xmlns="http://hl7.org/fhir"><id value="test"/>
+        <parameter>
+          <name value="operation"/>
+          <part>
+            <name value="type"/>
+            <valueCode value="add"/>
+          </part>
+          <part>
+            <name value="path"/>
+            <valueString value="Patient"/>
+          </part>
+          <part>
+            <name value="name"/>
+            <valueString value="contact"/>
+          </part>
+          <part>
+            <name value="value"/>
+            <part>
+              <name value="name"/>
+              <valueHumanName>
+                  <text value="a name"/>
+              </valueHumanName>
+            </part>
+          </part>
+        </parameter>
+      </Parameters>    
+    </diff>
+    <output>
+      <Patient xmlns="http://hl7.org/fhir"><id value="test"/>
+        <contact>
+          <name>
+            <text value="a name"/>
+          </name>
+        </contact>
+      </Patient>
+    </output>
   </case>
   
   <case name="Delete Anonymous Type" mode="both">
-    <input> 
-	  <Patient xmlns="http://hl7.org/fhir"><id value="test"/>
-	    <contact>
-		  <name>
-		    <text value="a name"/>
-		  </name>
-		</contact>
-	  </Patient>
-	</input>
-	<diff>
-	  <Parameters xmlns="http://hl7.org/fhir"><id value="test"/>
-	    <parameter>
-		  <name value="operation"/>
-		  <part>
-		    <name value="type"/>
-			<valueCode value="delete"/>
-		  </part>
-		  <part>
-		    <name value="path"/>
-			<valueString value="Patient.contact[0]"/>
-		  </part>
-		</parameter>
-	  </Parameters>	  
-	</diff>
-	<output>
-	  <Patient xmlns="http://hl7.org/fhir"><id value="test"/>
-	  </Patient>
-	</output>
+    <input>
+      <Patient xmlns="http://hl7.org/fhir"><id value="test"/>
+        <contact>
+          <name>
+            <text value="a name"/>
+          </name>
+        </contact>
+      </Patient>
+    </input>
+    <diff>
+      <Parameters xmlns="http://hl7.org/fhir"><id value="test"/>
+        <parameter>
+          <name value="operation"/>
+          <part>
+            <name value="type"/>
+            <valueCode value="delete"/>
+          </part>
+          <part>
+            <name value="path"/>
+            <valueString value="Patient.contact[0]"/>
+          </part>
+        </parameter>
+      </Parameters>    
+    </diff>
+    <output>
+      <Patient xmlns="http://hl7.org/fhir"><id value="test"/>
+      </Patient>
+    </output>
   </case>
   
   
   <!-- lists -->
   <case name="List unchanged" mode="both">
-    <input> 
+    <input>
       <Patient xmlns="http://hl7.org/fhir"><id value="test"/>
         <identifier>
           <system value="http://example.org"/>
@@ -539,7 +539,7 @@
     </input>
     <diff>
       <Parameters xmlns="http://hl7.org/fhir"><id value="test"/>
-      </Parameters>	  
+      </Parameters>    
     </diff>
     <output>
       <Patient xmlns="http://hl7.org/fhir"><id value="test"/>
@@ -556,7 +556,7 @@
   </case>
   
   <case name="List unchanged, contents changed" mode="both">
-    <input> 
+    <input>
       <Patient xmlns="http://hl7.org/fhir"><id value="test"/>
         <identifier id="a">
           <system value="http://example.org"/>
@@ -600,7 +600,7 @@
           <valueString value="value 1"/>
         </part>
         </parameter>
-      </Parameters>	  
+      </Parameters>
     </diff>
     <output>
       <Patient xmlns="http://hl7.org/fhir"><id value="test"/>
@@ -617,7 +617,7 @@
   </case>
 
   <case name="Add to list" mode="both">
-    <input> 
+    <input>
       <Patient xmlns="http://hl7.org/fhir"><id value="test"/>
         <identifier>
           <system value="http://example.org"/>
@@ -653,7 +653,7 @@
             </valueIdentifier>
           </part>
         </parameter>
-      </Parameters>    
+      </Parameters>  
     </diff>
     <output>
       <Patient xmlns="http://hl7.org/fhir"><id value="test"/>
@@ -674,7 +674,7 @@
   </case>
   
   <case name="Insert in list #1" mode="both">
-    <input> 
+    <input>
       <Patient xmlns="http://hl7.org/fhir"><id value="test"/>
         <identifier>
           <system value="http://example.org"/>
@@ -710,7 +710,7 @@
             </valueIdentifier>
           </part>
         </parameter>
-      </Parameters>    
+      </Parameters>   
     </diff>
     <output>
       <Patient xmlns="http://hl7.org/fhir"><id value="test"/>
@@ -731,7 +731,7 @@
   </case>
   
   <case name="Insert in list #2" mode="both">
-    <input> 
+    <input>
       <Patient xmlns="http://hl7.org/fhir"><id value="test"/>
         <identifier>
           <system value="http://example.org"/>
@@ -767,7 +767,7 @@
             </valueIdentifier>
           </part>
         </parameter>
-      </Parameters>    
+      </Parameters>   
     </diff>
     <output>
       <Patient xmlns="http://hl7.org/fhir"><id value="test"/>
@@ -788,7 +788,7 @@
   </case>
   
   <case name="Delete from List #1" mode="both">
-    <input> 
+    <input>
       <Patient xmlns="http://hl7.org/fhir"><id value="test"/>
         <identifier>
           <system value="http://example.org"/>
@@ -817,7 +817,7 @@
             <valueString value="Patient.identifier[0]"/>
           </part>
         </parameter>
-      </Parameters>    
+      </Parameters>   
     </diff>
     <output>
       <Patient xmlns="http://hl7.org/fhir"><id value="test"/>
@@ -834,7 +834,7 @@
   </case>
   
   <case name="Delete from List #2" mode="both">
-    <input> 
+    <input>
       <Patient xmlns="http://hl7.org/fhir"><id value="test"/>
         <identifier>
           <system value="http://example.org"/>
@@ -863,7 +863,7 @@
             <valueString value="Patient.identifier[1]"/>
           </part>
         </parameter>
-      </Parameters>    
+      </Parameters>   
     </diff>
     <output>
       <Patient xmlns="http://hl7.org/fhir"><id value="test"/>
@@ -880,7 +880,7 @@
   </case>
   
   <case name="Delete from List #3" mode="both">
-    <input> 
+    <input>
       <Patient xmlns="http://hl7.org/fhir"><id value="test"/>
         <identifier>
           <system value="http://example.org"/>
@@ -909,7 +909,7 @@
             <valueString value="Patient.identifier[2]"/>
           </part>
         </parameter>
-      </Parameters>    
+      </Parameters>   
     </diff>
     <output>
       <Patient xmlns="http://hl7.org/fhir"><id value="test"/>
@@ -926,7 +926,7 @@
   </case>
   
   <case name="Reorder List #1" mode="both">
-    <input> 
+    <input>
       <Patient xmlns="http://hl7.org/fhir"><id value="test"/>
         <identifier>
           <system value="http://example.org"/>
@@ -967,7 +967,7 @@
             <valueInteger value="1"/>
           </part>
         </parameter>
-      </Parameters>    
+      </Parameters>   
     </diff>
     <output>
       <Patient xmlns="http://hl7.org/fhir"><id value="test"/>
@@ -992,7 +992,7 @@
   </case>
   
   <case name="Reorder List #2" mode="both">
-    <input> 
+    <input>
       <Patient xmlns="http://hl7.org/fhir"><id value="test"/>
         <identifier>
           <system value="http://example.org"/>
@@ -1033,7 +1033,7 @@
             <valueInteger value="0"/>
           </part>
         </parameter>
-      </Parameters>    
+      </Parameters>   
     </diff>
     <output>
       <Patient xmlns="http://hl7.org/fhir"><id value="test"/>
@@ -1058,7 +1058,7 @@
   </case>
   
   <case name="Reorder List #3" mode="both">
-    <input> 
+    <input>
       <Patient xmlns="http://hl7.org/fhir"><id value="test"/>
         <identifier>
           <system value="http://example.org"/>
@@ -1099,7 +1099,7 @@
             <valueInteger value="2"/>
           </part>
         </parameter>
-      </Parameters>    
+      </Parameters>   
     </diff>
     <output>
       <Patient xmlns="http://hl7.org/fhir"><id value="test"/>
@@ -1124,7 +1124,7 @@
   </case>
 
   <case name="Reorder List #4" mode="forwards">
-    <input> 
+    <input>
       <Patient xmlns="http://hl7.org/fhir"><id value="test"/>
         <identifier>
           <system value="http://example.org"/>
@@ -1165,7 +1165,7 @@
             <valueInteger value="3"/>
           </part>
         </parameter>
-      </Parameters>    
+      </Parameters>
     </diff>
     <output>
       <Patient xmlns="http://hl7.org/fhir"><id value="test"/>
@@ -1190,7 +1190,7 @@
   </case>
 
   <case name="Reorder List #5" mode="both">
-    <input> 
+    <input>
       <Patient xmlns="http://hl7.org/fhir"><id value="test"/>
         <identifier>
           <system value="http://example.org"/>
@@ -1250,7 +1250,7 @@
             <valueInteger value="1"/>
           </part>
         </parameter>
-      </Parameters>    
+      </Parameters>   
     </diff>
     <output>
       <Patient xmlns="http://hl7.org/fhir"><id value="test"/>
@@ -1275,7 +1275,7 @@
   </case>
 
   <case name="Reorder List #6" mode="both">
-    <input> 
+    <input>
       <Patient xmlns="http://hl7.org/fhir"><id value="test"/>
         <identifier>
           <system value="http://example.org"/>
@@ -1354,7 +1354,7 @@
             <valueInteger value="2"/>
           </part>
         </parameter>
-      </Parameters>    
+      </Parameters>   
     </diff>
     <output>
       <Patient xmlns="http://hl7.org/fhir"><id value="test"/>
@@ -1379,7 +1379,7 @@
   </case>
 
   <case name="Full Resource" mode="both">
-    <input> 
+    <input>
       <Patient xmlns="http://hl7.org/fhir">
         <id value="example"/>
         <text>
@@ -1395,7 +1395,7 @@
                   <td>Name</td>
                   
                   <td>Peter James 
-                    <b>Chalmers</b> (&quot;Jim&quot;)
+                    <b>Chalmers</b>(&quot;Jim&quot;)
                   </td>
                 
                 </tr>
@@ -1426,7 +1426,7 @@
               
               </tbody>
             
-            </table>    
+            </table>   
           
           </div>
         </text>
@@ -1546,9 +1546,9 @@
           </part>
           <part>
             <name value="value"/>
-            <valueString value="&lt;div xmlns=&quot;http://www.w3.org/1999/xhtml&quot;>&#10;            &#10;            &lt;table>&#10;              &#10;              &lt;tbody>&#10;                &#10;                &lt;tr>&#10;                  &#10;                  &lt;td>Name&lt;/td>&#10;                  &#10;                  &lt;td>Peter James &#10;                    &lt;b>Chalmers1&lt;/b> (&quot;Jim&quot;)&#10;                  &lt;/td>&#10;                &#10;                &lt;/tr>&#10;                &#10;                &lt;tr>&#10;                  &#10;                  &lt;td>Address&lt;/td>&#10;                  &#10;                  &lt;td>534 Erewhon, Pleasantville, Vic, 3999&lt;/td>&#10;                &#10;                &lt;/tr>&#10;                &#10;                &lt;tr>&#10;                  &#10;                  &lt;td>Contacts&lt;/td>&#10;                  &#10;                  &lt;td>Home: unknown. Work: (03) 5555 6473&lt;/td>&#10;                &#10;                &lt;/tr>&#10;                &#10;                &lt;tr>&#10;                  &#10;                  &lt;td>Id&lt;/td>&#10;                  &#10;                  &lt;td>MRN: 12345 (Acme Healthcare)&lt;/td>&#10;                &#10;                &lt;/tr>&#10;              &#10;              &lt;/tbody>&#10;            &#10;            &lt;/table>    &#10;          &#10;          &lt;/div>"/>
+            <valueString value="&lt;div xmlns=&quot;http://www.w3.org/1999/xhtml&quot;>&#10;            &#10;            &lt;table>&#10;              &#10;              &lt;tbody>&#10;                &#10;                &lt;tr>&#10;                  &#10;                  &lt;td>Name&lt;/td>&#10;                  &#10;                  &lt;td>Peter James &#10;                    &lt;b>Chalmers1&lt;/b>(&quot;Jim&quot;)&#10;                  &lt;/td>&#10;                &#10;                &lt;/tr>&#10;                &#10;                &lt;tr>&#10;                  &#10;                  &lt;td>Address&lt;/td>&#10;                  &#10;                  &lt;td>534 Erewhon, Pleasantville, Vic, 3999&lt;/td>&#10;                &#10;                &lt;/tr>&#10;                &#10;                &lt;tr>&#10;                  &#10;                  &lt;td>Contacts&lt;/td>&#10;                  &#10;                  &lt;td>Home: unknown. Work: (03) 5555 6473&lt;/td>&#10;                &#10;                &lt;/tr>&#10;                &#10;                &lt;tr>&#10;                  &#10;                  &lt;td>Id&lt;/td>&#10;                  &#10;                  &lt;td>MRN: 12345 (Acme Healthcare)&lt;/td>&#10;                &#10;                &lt;/tr>&#10;              &#10;              &lt;/tbody>&#10;            &#10;            &lt;/table>   &#10;          &#10;          &lt;/div>"/>
           </part>
-        </parameter> -->
+        </parameter>-->
         <parameter>
           <name value="operation"/>
           <part>
@@ -1564,7 +1564,7 @@
             <valueString value="Chalmers1"/>
           </part>
         </parameter>
-      </Parameters>    
+      </Parameters>   
     </diff>
     <output>
       <Patient xmlns="http://hl7.org/fhir">
@@ -1582,7 +1582,7 @@
                   <td>Name</td>
                   
                   <td>Peter James 
-                    <b>Chalmers</b> (&quot;Jim&quot;)
+                    <b>Chalmers</b>(&quot;Jim&quot;)
                   </td>
                 
                 </tr>
@@ -1613,7 +1613,7 @@
               
               </tbody>
             
-            </table>    
+            </table>   
           
           </div>
         </text>
@@ -1719,5 +1719,5 @@
         </managingOrganization>
       </Patient>
     </output>
-  </case>  
+  </case>
 </tests>
\ No newline at end of file