diff --git a/engines/aio/src/test/java/org/alfresco/transform/aio/AIOControllerHttpRequestTest.java b/engines/aio/src/test/java/org/alfresco/transform/aio/AIOHttpRequestTest.java
similarity index 77%
rename from engines/aio/src/test/java/org/alfresco/transform/aio/AIOControllerHttpRequestTest.java
rename to engines/aio/src/test/java/org/alfresco/transform/aio/AIOHttpRequestTest.java
index bc74896e..5776d4f7 100644
--- a/engines/aio/src/test/java/org/alfresco/transform/aio/AIOControllerHttpRequestTest.java
+++ b/engines/aio/src/test/java/org/alfresco/transform/aio/AIOHttpRequestTest.java
@@ -27,11 +27,11 @@
 package org.alfresco.transform.aio;
 
 import org.alfresco.transform.base.AbstractHttpRequestTest;
-import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.boot.test.context.SpringBootTest.WebEnvironment;
 
-@SpringBootTest(webEnvironment = WebEnvironment.RANDOM_PORT)
-public class AIOControllerHttpRequestTest extends AbstractHttpRequestTest
+/**
+ * Tests All-In-One with a server test harness that talks to the TransformController using http.
+ */
+public class AIOHttpRequestTest extends AbstractHttpRequestTest
 {
     @Override
     protected String getTransformerName() 
@@ -42,7 +42,6 @@ public class AIOControllerHttpRequestTest extends AbstractHttpRequestTest
     @Override
     protected String getSourceExtension() 
     {
-        // Currently using same extension as ImageMagick tests
         return "jpg";
     }
 }
diff --git a/engines/imagemagick/src/test/java/org/alfresco/transform/imagemagick/ImageMagickHttpRequestTest.java b/engines/imagemagick/src/test/java/org/alfresco/transform/imagemagick/ImageMagickHttpRequestTest.java
index bd864200..b02f362f 100644
--- a/engines/imagemagick/src/test/java/org/alfresco/transform/imagemagick/ImageMagickHttpRequestTest.java
+++ b/engines/imagemagick/src/test/java/org/alfresco/transform/imagemagick/ImageMagickHttpRequestTest.java
@@ -27,12 +27,10 @@
 package org.alfresco.transform.imagemagick;
 
 import org.alfresco.transform.base.AbstractHttpRequestTest;
-import org.springframework.boot.test.context.SpringBootTest;
 
 /**
- * Tests ImageMagickController with a server test harness.
+ * Tests ImageMagick with a server test harness that talks to the TransformController using http.
  */
-@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
 public class ImageMagickHttpRequestTest extends AbstractHttpRequestTest
 {
     @Override
diff --git a/engines/libreoffice/src/test/java/org/alfresco/transform/libreoffice/LibreOfficeHttpRequestTest.java b/engines/libreoffice/src/test/java/org/alfresco/transform/libreoffice/LibreOfficeHttpRequestTest.java
index be9f7387..955acd8a 100644
--- a/engines/libreoffice/src/test/java/org/alfresco/transform/libreoffice/LibreOfficeHttpRequestTest.java
+++ b/engines/libreoffice/src/test/java/org/alfresco/transform/libreoffice/LibreOfficeHttpRequestTest.java
@@ -27,12 +27,10 @@
 package org.alfresco.transform.libreoffice;
 
 import org.alfresco.transform.base.AbstractHttpRequestTest;
-import org.springframework.boot.test.context.SpringBootTest;
 
 /**
- * Tests LibreOfficeController with a server test harness.
+ * Tests LibreOffice with a server test harness that talks to the TransformController using http.
  */
-@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
 public class LibreOfficeHttpRequestTest extends AbstractHttpRequestTest
 {
     @Override
diff --git a/engines/misc/src/main/java/org/alfresco/transform/misc/metadataExtractors/HtmlMetadataExtractor.java b/engines/misc/src/main/java/org/alfresco/transform/misc/metadataExtractors/HtmlMetadataExtractor.java
index 72670748..ba839029 100644
--- a/engines/misc/src/main/java/org/alfresco/transform/misc/metadataExtractors/HtmlMetadataExtractor.java
+++ b/engines/misc/src/main/java/org/alfresco/transform/misc/metadataExtractors/HtmlMetadataExtractor.java
@@ -2,7 +2,7 @@
  * #%L
  * Alfresco Transform Core
  * %%
- * Copyright (C) 2005-2022 Alfresco Software Limited
+ * Copyright (C) 2005 - 2022 Alfresco Software Limited
  * %%
  * This file is part of the Alfresco software.
  * -
diff --git a/engines/misc/src/main/java/org/alfresco/transform/misc/metadataExtractors/RFC822MetadataExtractor.java b/engines/misc/src/main/java/org/alfresco/transform/misc/metadataExtractors/RFC822MetadataExtractor.java
index 7b228c6c..32575ccd 100644
--- a/engines/misc/src/main/java/org/alfresco/transform/misc/metadataExtractors/RFC822MetadataExtractor.java
+++ b/engines/misc/src/main/java/org/alfresco/transform/misc/metadataExtractors/RFC822MetadataExtractor.java
@@ -2,7 +2,7 @@
  * #%L
  * Alfresco Transform Core
  * %%
- * Copyright (C) 2005-2022 Alfresco Software Limited
+ * Copyright (C) 2005 - 2022 Alfresco Software Limited
  * %%
  * This file is part of the Alfresco software.
  * -
diff --git a/engines/misc/src/test/java/org/alfresco/transform/misc/MiscTransformerHttpRequestTest.java b/engines/misc/src/test/java/org/alfresco/transform/misc/MiscTransformerHttpRequestTest.java
index 23cf6eef..deb94014 100644
--- a/engines/misc/src/test/java/org/alfresco/transform/misc/MiscTransformerHttpRequestTest.java
+++ b/engines/misc/src/test/java/org/alfresco/transform/misc/MiscTransformerHttpRequestTest.java
@@ -27,12 +27,10 @@
 package org.alfresco.transform.misc;
 
 import org.alfresco.transform.base.AbstractHttpRequestTest;
-import org.springframework.boot.test.context.SpringBootTest;
 
 /**
- * Tests MiscController with a server test harness.
+ * Tests Misc with a server test harness that talks to the TransformController using http.
  */
-@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
 public class MiscTransformerHttpRequestTest extends AbstractHttpRequestTest
 {
     @Override
diff --git a/engines/pdfrenderer/src/test/java/org/alfresco/transform/pdfrenderer/AlfrescoPdfRendererHttpRequestTest.java b/engines/pdfrenderer/src/test/java/org/alfresco/transform/pdfrenderer/AlfrescoPdfRendererHttpRequestTest.java
index 8a6613dd..0446b4b4 100644
--- a/engines/pdfrenderer/src/test/java/org/alfresco/transform/pdfrenderer/AlfrescoPdfRendererHttpRequestTest.java
+++ b/engines/pdfrenderer/src/test/java/org/alfresco/transform/pdfrenderer/AlfrescoPdfRendererHttpRequestTest.java
@@ -31,9 +31,8 @@ import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.boot.test.context.SpringBootTest.WebEnvironment;
 
 /**
- * Tests AlfrescoPdfRendererController with a server test harness.
+ * Tests PdfRenderer with a server test harness that talks to the TransformController using http.
  */
-@SpringBootTest(webEnvironment = WebEnvironment.RANDOM_PORT)
 public class AlfrescoPdfRendererHttpRequestTest extends AbstractHttpRequestTest
 {
     @Override
diff --git a/engines/tika/src/test/java/org/alfresco/transform/tika/TikaHttpRequestTest.java b/engines/tika/src/test/java/org/alfresco/transform/tika/TikaHttpRequestTest.java
index 37e2456d..d2b63ce8 100644
--- a/engines/tika/src/test/java/org/alfresco/transform/tika/TikaHttpRequestTest.java
+++ b/engines/tika/src/test/java/org/alfresco/transform/tika/TikaHttpRequestTest.java
@@ -27,12 +27,10 @@
 package org.alfresco.transform.tika;
 
 import org.alfresco.transform.base.AbstractHttpRequestTest;
-import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.boot.test.context.SpringBootTest.WebEnvironment;
 import org.springframework.util.LinkedMultiValueMap;
 
 /**
- * Tests TikaController with a server test harness.
+ * Tests Tika with a server test harness that talks to the TransformController using http.
  */
 public class TikaHttpRequestTest extends AbstractHttpRequestTest
 {