diff --git a/alfresco-transform-core-aio/alfresco-transform-core-aio-boot/src/main/java/org/alfresco/transformer/AIOController.java b/alfresco-transform-core-aio/alfresco-transform-core-aio-boot/src/main/java/org/alfresco/transformer/AIOController.java
index 6ab03ed7..d17c8e0d 100644
--- a/alfresco-transform-core-aio/alfresco-transform-core-aio-boot/src/main/java/org/alfresco/transformer/AIOController.java
+++ b/alfresco-transform-core-aio/alfresco-transform-core-aio-boot/src/main/java/org/alfresco/transformer/AIOController.java
@@ -128,9 +128,9 @@ public class AIOController extends AbstractTransformerController
     @PostMapping(value = "/transform", consumes = MULTIPART_FORM_DATA_VALUE)
     public ResponseEntity<Resource> transform(HttpServletRequest request,
         @RequestParam("file") MultipartFile sourceMultipartFile,
+        @RequestParam(TARGET_EXTENSION) String targetExtension,
         @RequestParam(SOURCE_MIMETYPE) String sourceMimetype,
         @RequestParam(TARGET_MIMETYPE) String targetMimetype,
-        @RequestParam(TARGET_EXTENSION) String targetExtension,
         @RequestParam Map<String, String> requestParameters,
         @RequestParam (value = TEST_DELAY, required = false) Long testDelay)
     {
diff --git a/alfresco-transform-core-aio/alfresco-transform-core-aio-boot/src/test/java/org/alfresco/transformer/AIOControllerImageMagickTest.java b/alfresco-transform-core-aio/alfresco-transform-core-aio-boot/src/test/java/org/alfresco/transformer/AIOControllerImageMagickTest.java
index d1d0ef70..8de44eb5 100644
--- a/alfresco-transform-core-aio/alfresco-transform-core-aio-boot/src/test/java/org/alfresco/transformer/AIOControllerImageMagickTest.java
+++ b/alfresco-transform-core-aio/alfresco-transform-core-aio-boot/src/test/java/org/alfresco/transformer/AIOControllerImageMagickTest.java
@@ -29,7 +29,7 @@ package org.alfresco.transformer;
 import java.io.IOException;
 import java.util.Map;
 
-import org.alfresco.transformer.transformers.AllInOneTransformer;
+import org.alfresco.transformer.AIOTransformRegistry;
 import org.alfresco.transformer.transformers.ImageMagickAdapter;
 import org.alfresco.transformer.transformers.Transformer;
 import org.junit.Before;
@@ -54,7 +54,7 @@ public class AIOControllerImageMagickTest extends ImageMagickControllerTestBase
     static ImageMagickAdapter adapter;
     
     @Autowired
-    AllInOneTransformer transformer;
+    AIOTransformRegistry transformRegistry;
 
     @SpyBean
     AIOController controller;
@@ -65,7 +65,7 @@ public class AIOControllerImageMagickTest extends ImageMagickControllerTestBase
         adapter = new ImageMagickAdapter();
     }
 
-    @Before @SuppressWarnings("unchecked")
+    @Before
     public void before() throws IOException, Exception
     {
         adapter = new ImageMagickAdapter();
@@ -73,11 +73,11 @@ public class AIOControllerImageMagickTest extends ImageMagickControllerTestBase
         ReflectionTestUtils.setField(commandExecutor, "checkCommand", mockCheckCommand);
         ReflectionTestUtils.setField(adapter, "commandExecutor", commandExecutor);
         //Need to wire in the mocked adpater into the controller...
-        if (ReflectionTestUtils.getField(transformer,"transformerTransformMapping") instanceof Map)
+        if (ReflectionTestUtils.getField(transformRegistry,"transformerTransformMapping") instanceof Map)
         {
-            Map<String,Transformer> transformers = (Map<String,Transformer>)ReflectionTestUtils.getField(transformer,"transformerTransformMapping");
+            Map<String,Transformer> transformers = transformRegistry.getTransformerTransformMapping();
             transformers.replace("imagemagick", adapter);
-            ReflectionTestUtils.setField(transformer, "transformerTransformMapping", transformers);
+            ReflectionTestUtils.setField(transformRegistry, "transformerTransformMapping", transformers);
         }
 
         mockTransformCommand("jpg", "png", "image/jpeg", true);
diff --git a/alfresco-transform-tika/alfresco-transform-tika/pom.xml b/alfresco-transform-tika/alfresco-transform-tika/pom.xml
index 80e983c6..5eca95e8 100644
--- a/alfresco-transform-tika/alfresco-transform-tika/pom.xml
+++ b/alfresco-transform-tika/alfresco-transform-tika/pom.xml
@@ -49,6 +49,10 @@
                     <groupId>org.quartz-scheduler</groupId>
                     <artifactId>quartz</artifactId>
                 </exclusion>
+                <exclusion>
+                    <groupId>xml-apis</groupId>
+                    <artifactId>xml-apis</artifactId>
+                </exclusion>
             </exclusions>
         </dependency>