diff --git a/gp2gp-translator/src/test/java/uk/nhs/adaptors/pss/translator/mapper/CodeableConceptMapperTest.java b/gp2gp-translator/src/test/java/uk/nhs/adaptors/pss/translator/mapper/CodeableConceptMapperTest.java
index f3581b76c..eaf01500d 100644
--- a/gp2gp-translator/src/test/java/uk/nhs/adaptors/pss/translator/mapper/CodeableConceptMapperTest.java
+++ b/gp2gp-translator/src/test/java/uk/nhs/adaptors/pss/translator/mapper/CodeableConceptMapperTest.java
@@ -323,8 +323,7 @@ public void mapSnomedCodeWithDescriptionIdDescriptionIsPreferredTerm() {
             .isEqualTo(SNOMED_PREFERRED.getConceptid());
         assertThat(codeableConcept.getCoding().getFirst().getDisplay())
             .isEqualTo(SNOMED_PREFERRED.getTerm());
-        assertThat(codeableConcept.getCoding().getFirst().getExtension().getFirst().getExtension().size() == 1)
-            .isTrue();
+        assertTrue(codeableConcept.getCoding().getFirst().getExtension().getFirst().getExtension().size() == 1);
         assertThat(codeableConcept.getCoding().getFirst().getExtension().getFirst().getExtension().getFirst().getUrl())
             .isEqualTo(DESCRIPTION_ID);
         assertThat(codeableConcept.getCoding().getFirst().getExtension().getFirst().getExtension().getFirst().getValue())
@@ -349,8 +348,7 @@ public void mapSnomedCodeWithDescriptionIdPreferredTermDisplayMatchesTermNoOrigi
             .isEqualTo(SNOMED_PREFERRED.getConceptid());
         assertThat(codeableConcept.getCoding().getFirst().getDisplay())
             .isEqualTo(SNOMED_PREFERRED.getTerm());
-        assertThat(codeableConcept.getCoding().getFirst().getExtension().getFirst().getExtension().size() == 1)
-            .isTrue();
+        assertTrue(codeableConcept.getCoding().getFirst().getExtension().getFirst().getExtension().size() == 1);
         assertThat(codeableConcept.getCoding().getFirst().getExtension().getFirst().getExtension().getFirst().getUrl())
             .isEqualTo(DESCRIPTION_ID);
         assertThat(codeableConcept.getCoding().getFirst().getExtension().getFirst().getExtension().getFirst().getValue())
@@ -373,8 +371,7 @@ public void mapSnomedCodeWithDescriptionIdPreferredTermDisplayDoesNotMatchTermNo
 
         assertEquals(SNOMED_PREFERRED.getConceptid(), codeableConcept.getCoding().getFirst().getCode());
         assertEquals(SNOMED_PREFERRED.getTerm(), codeableConcept.getCoding().getFirst().getDisplay());
-        assertThat(codeableConcept.getCoding().getFirst().getExtension().getFirst().getExtension().size() == 1)
-            .isTrue();
+        assertTrue(codeableConcept.getCoding().getFirst().getExtension().getFirst().getExtension().size() == 1);
         assertThat(codeableConcept.getCoding().getFirst().getExtension().getFirst().getExtension().getFirst().getUrl())
             .isEqualTo(DESCRIPTION_ID);
         assertThat(codeableConcept.getCoding().getFirst().getExtension().getFirst().getExtension().getFirst().getValue())
@@ -401,8 +398,7 @@ public void mapSnomedCodeWithDescriptionIdDescriptionIsNotPreferredTerm() {
             .isEqualTo(SNOMED_DESCRIPTION.getConceptid());
         assertThat(codeableConcept.getCoding().getFirst().getDisplay())
             .isEqualTo(SNOMED_PREFERRED.getTerm());
-        assertThat(codeableConcept.getCoding().getFirst().getExtension().getFirst().getExtension().size() == 2)
-            .isTrue();
+        assertTrue(codeableConcept.getCoding().getFirst().getExtension().getFirst().getExtension().size() == 2);
         assertThat(codeableConcept.getCoding().getFirst().getExtension().getFirst().getExtension().getFirst().getUrl())
             .isEqualTo(DESCRIPTION_ID);
         assertThat(codeableConcept.getCoding().getFirst().getExtension().getFirst().getExtension().getFirst().getValue())
@@ -431,8 +427,7 @@ public void mapSnomedCodeWithDescriptionIdNotPreferredTermDisplayMatchesTermNoOr
             .isEqualTo(SNOMED_DESCRIPTION.getConceptid());
         assertThat(codeableConcept.getCoding().getFirst().getDisplay())
             .isEqualTo(SNOMED_PREFERRED.getTerm());
-        assertThat(codeableConcept.getCoding().getFirst().getExtension().getFirst().getExtension().size() == 2)
-            .isTrue();
+        assertTrue(codeableConcept.getCoding().getFirst().getExtension().getFirst().getExtension().size() == 2);
         assertThat(codeableConcept.getCoding().getFirst().getExtension().getFirst().getExtension().getFirst().getUrl())
             .isEqualTo(DESCRIPTION_ID);
         assertThat(codeableConcept.getCoding().getFirst().getExtension().getFirst().getExtension().getFirst().getValue())
@@ -460,8 +455,7 @@ public void mapSnomedCodeWithDescriptionIdNotPreferredTermDisplayDoesNotMatchTer
             .isEqualTo(SNOMED_DESCRIPTION.getConceptid());
         assertThat(codeableConcept.getCoding().getFirst().getDisplay())
             .isEqualTo(SNOMED_PREFERRED.getTerm());
-        assertThat(codeableConcept.getCoding().getFirst().getExtension().getFirst().getExtension().size() == 2)
-            .isTrue();
+        assertTrue(codeableConcept.getCoding().getFirst().getExtension().getFirst().getExtension().size() == 2);
         assertThat(codeableConcept.getCoding().getFirst().getExtension().getFirst().getExtension().getFirst().getUrl())
             .isEqualTo(DESCRIPTION_ID);
         assertThat(codeableConcept.getCoding().getFirst().getExtension().getFirst().getExtension().getFirst().getValue())
diff --git a/gp2gp-translator/src/test/java/uk/nhs/adaptors/pss/translator/mapper/diagnosticreport/SpecimenMapperTest.java b/gp2gp-translator/src/test/java/uk/nhs/adaptors/pss/translator/mapper/diagnosticreport/SpecimenMapperTest.java
index 279c770b1..2dbbae500 100644
--- a/gp2gp-translator/src/test/java/uk/nhs/adaptors/pss/translator/mapper/diagnosticreport/SpecimenMapperTest.java
+++ b/gp2gp-translator/src/test/java/uk/nhs/adaptors/pss/translator/mapper/diagnosticreport/SpecimenMapperTest.java
@@ -37,7 +37,7 @@
 import uk.nhs.adaptors.pss.translator.service.ConfidentialityService;
 
 @ExtendWith(MockitoExtension.class)
-public class SpecimenMapperTest {
+class SpecimenMapperTest {
 
     private static final String XML_RESOURCES_BASE = "xml/Specimen/";
     private static final String SPECIMEN_PREFIX = "Specimen/";
@@ -128,7 +128,7 @@ void testSpecimenIsMapped() {
         assertThat(specimen.getNote().getFirst().getText()).isEqualTo(NOTE_TEXT);
         assertThat(specimen.getAccessionIdentifier().getValue()).isEqualTo(ACCESSION_IDENTIFIER_VALUE);
         assertThat(specimen.getType().getText()).isEqualTo(SPECIMEN_TYPE_TEXT);
-        assertThat(specimen.getCollection().getCollected().toString()).isEqualTo(SPECIMEN_COLLECTED_DATETIME.toString());
+        assertThat(specimen.getCollection().getCollected()).hasToString(String.valueOf(SPECIMEN_COLLECTED_DATETIME));
     }
 
     @Test
diff --git a/gp2gp-translator/src/test/java/uk/nhs/adaptors/pss/translator/mapper/medication/MedicationRequestMapperTest.java b/gp2gp-translator/src/test/java/uk/nhs/adaptors/pss/translator/mapper/medication/MedicationRequestMapperTest.java
index 46d6d6aba..f65a20ebc 100644
--- a/gp2gp-translator/src/test/java/uk/nhs/adaptors/pss/translator/mapper/medication/MedicationRequestMapperTest.java
+++ b/gp2gp-translator/src/test/java/uk/nhs/adaptors/pss/translator/mapper/medication/MedicationRequestMapperTest.java
@@ -140,19 +140,19 @@ public void When_MappingMedicationStatement_Expect_CorrectMappersToBeCalled() {
                 .mapResources(ehrExtract, (Patient) new Patient().setId(PATIENT_ID), List.of(), PRACTISE_CODE);
 
         verify(medicationRequestPlanMapper, times(SINGLE_INVOCATION)).mapToPlanMedicationRequest(
-            eq(ehrExtract),
-            eq(ehrComposition),
-            eq(medicationStatement),
-            eq(medicationStatement.getComponent().getFirst().getEhrSupplyAuthorise()),
-            eq(PRACTISE_CODE)
+            ehrExtract,
+            ehrComposition,
+            medicationStatement,
+            medicationStatement.getComponent().getFirst().getEhrSupplyAuthorise(),
+            PRACTISE_CODE
         );
 
         verify(medicationRequestOrderMapper, times(SINGLE_INVOCATION)).mapToOrderMedicationRequest(
-            eq(ehrExtract),
-            eq(ehrComposition),
-            eq(medicationStatement),
-            eq(medicationStatement.getComponent().get(2).getEhrSupplyPrescribe()),
-            eq(PRACTISE_CODE)
+            ehrExtract,
+            ehrComposition,
+            medicationStatement,
+            medicationStatement.getComponent().get(2).getEhrSupplyPrescribe(),
+            PRACTISE_CODE
         );
 
         verify(medicationStatementMapper, times(SINGLE_INVOCATION)).mapToMedicationStatement(
diff --git a/gp2gp-translator/src/test/java/uk/nhs/adaptors/pss/translator/service/SkeletonProcessingServiceTests.java b/gp2gp-translator/src/test/java/uk/nhs/adaptors/pss/translator/service/SkeletonProcessingServiceTests.java
index 04218ab76..c180fb13a 100644
--- a/gp2gp-translator/src/test/java/uk/nhs/adaptors/pss/translator/service/SkeletonProcessingServiceTests.java
+++ b/gp2gp-translator/src/test/java/uk/nhs/adaptors/pss/translator/service/SkeletonProcessingServiceTests.java
@@ -39,7 +39,7 @@
 import uk.nhs.adaptors.pss.translator.util.XmlParseUtilService;
 
 @ExtendWith(MockitoExtension.class)
-public class SkeletonProcessingServiceTests {
+class SkeletonProcessingServiceTests {
 
     private static final String CONVERSATION_ID = randomUUID().toString();
     private static final String NHS_NUMBER = "1111";
@@ -112,7 +112,7 @@ private void prepareSkeletonRCMRMocks(InboundMessage inboundMessage) throws Tran
     }
 
     @Test
-    public void When_UpdateInboundMessageAttachmentHandlerServiceThrowsIllegalArgumentException_Expect_ThrowsException() {
+    void When_UpdateInboundMessageAttachmentHandlerServiceThrowsIllegalArgumentException_Expect_ThrowsException() {
 
         var inboundMessage = new InboundMessage();
         var attachmentLog = createSkeletonPatientAttachmentLog();
@@ -128,7 +128,7 @@ public void When_UpdateInboundMessageAttachmentHandlerServiceThrowsIllegalArgume
     }
 
     @Test
-    public void When_HappyPathWithSkeletonAsRCMRMessage_Expect_ThrowNoErrors() throws TransformerException,
+    void When_HappyPathWithSkeletonAsRCMRMessage_Expect_ThrowNoErrors() throws TransformerException,
         SAXException {
         var inboundMessage = new InboundMessage();
         var attachmentLog = createSkeletonPatientAttachmentLog();
@@ -142,7 +142,7 @@ public void When_HappyPathWithSkeletonAsRCMRMessage_Expect_ThrowNoErrors() throw
     }
 
     @Test
-    public void When_HappyPathWithSkeletonAsRCMRMessage_Expect_InboundMessagePayloadIsNewRCMRMessage()
+    void When_HappyPathWithSkeletonAsRCMRMessage_Expect_InboundMessagePayloadIsNewRCMRMessage()
         throws TransformerException, SAXException {
         var inboundMessage = new InboundMessage();
         var attachmentLog = createSkeletonPatientAttachmentLog();
@@ -159,7 +159,7 @@ public void When_HappyPathWithSkeletonAsRCMRMessage_Expect_InboundMessagePayload
     }
 
     @Test
-    public void When_HappyPathWithSkeletonAsSectionMessage_Expect_ThrowNoErrors()
+    void When_HappyPathWithSkeletonAsSectionMessage_Expect_ThrowNoErrors()
         throws TransformerException, SAXException {
         var inboundMessage = new InboundMessage();
         var attachmentLog = createSkeletonPatientAttachmentLog();
@@ -173,7 +173,7 @@ public void When_HappyPathWithSkeletonAsSectionMessage_Expect_ThrowNoErrors()
     }
 
     @Test
-    public void When_SkeletonAsSectionMessage_Expect_ThrowNoErrors() throws TransformerException, SAXException {
+    void When_SkeletonAsSectionMessage_Expect_ThrowNoErrors() throws TransformerException, SAXException {
         var inboundMessage = new InboundMessage();
         var attachmentLog = createSkeletonPatientAttachmentLog();
 
@@ -185,7 +185,7 @@ public void When_SkeletonAsSectionMessage_Expect_ThrowNoErrors() throws Transfor
     }
 
     @Test
-    public void When_SkeletonAsSectionMessageAndEBXMLSkeletonReferenceIsEmpty_Expect_IllegalArgumentException()
+    void When_SkeletonAsSectionMessageAndEBXMLSkeletonReferenceIsEmpty_Expect_IllegalArgumentException()
         throws SAXException {
         var inboundMessage = new InboundMessage();
         var attachmentLog = createSkeletonPatientAttachmentLog();
diff --git a/gpc-api-facade/src/test/java/uk/nhs/adaptors/pss/gpc/util/fhir/OperationOutcomeUtilsTest.java b/gpc-api-facade/src/test/java/uk/nhs/adaptors/pss/gpc/util/fhir/OperationOutcomeUtilsTest.java
index 920ecdf77..b060a7d6c 100644
--- a/gpc-api-facade/src/test/java/uk/nhs/adaptors/pss/gpc/util/fhir/OperationOutcomeUtilsTest.java
+++ b/gpc-api-facade/src/test/java/uk/nhs/adaptors/pss/gpc/util/fhir/OperationOutcomeUtilsTest.java
@@ -4,7 +4,9 @@
 import static org.hl7.fhir.dstu3.model.OperationOutcome.IssueSeverity.ERROR;
 import static org.hl7.fhir.dstu3.model.OperationOutcome.IssueType.NOTSUPPORTED;
 import static org.junit.jupiter.api.Assertions.assertEquals;
+
 import org.hl7.fhir.dstu3.model.CodeableConcept;
+import org.hl7.fhir.dstu3.model.OperationOutcome;
 import org.junit.jupiter.api.Test;
 
 import uk.nhs.adaptors.common.util.CodeableConceptUtils;
diff --git a/smoke-tests/src/test/java/Gp2GpAdaptorSmokeTest.java b/smoke-tests/src/test/java/Gp2GpAdaptorSmokeTest.java
index 3cdc36f73..6adf9fc15 100644
--- a/smoke-tests/src/test/java/Gp2GpAdaptorSmokeTest.java
+++ b/smoke-tests/src/test/java/Gp2GpAdaptorSmokeTest.java
@@ -36,7 +36,7 @@ public static void setup() {
     }
 
     @Test
-    public void expect_Gp2gpAdaptorIsAvailable() {
+    void expect_Gp2gpAdaptorIsAvailable() {
 
         Optional<String> responseBody = Optional.empty();