Start of Capitalisation Test of Marriage Certificates

src/main/java/scot/carricksoftware/grants/capitalisation/certificates/birthcertificate/CapitaliseBirthCertificate.java → src/main/java/scot/carricksoftware/grants/capitalisation/certificates/birthcertificates/CapitaliseBirthCertificate.java

@@ -3,7 +3,7 @@
  *
  */
 
-package scot.carricksoftware.grants.capitalisation.certificates.birthcertificate;
+package scot.carricksoftware.grants.capitalisation.certificates.birthcertificates;
 
 import scot.carricksoftware.grants.commands.certificates.birthcertificates.BirthCertificateCommand;
 

src/main/java/scot/carricksoftware/grants/capitalisation/certificates/birthcertificate/CapitaliseBirthCertificateImpl.java → src/main/java/scot/carricksoftware/grants/capitalisation/certificates/birthcertificates/CapitaliseBirthCertificateImpl.java

@@ -3,7 +3,7 @@
  *
  */
 
-package scot.carricksoftware.grants.capitalisation.certificates.birthcertificate;
+package scot.carricksoftware.grants.capitalisation.certificates.birthcertificates;
 
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;

src/main/java/scot/carricksoftware/grants/capitalisation/certificates/deathcertificate/CapitaliseDeathCertificate.java → src/main/java/scot/carricksoftware/grants/capitalisation/certificates/deathcertificates/CapitaliseDeathCertificate.java

@@ -3,7 +3,7 @@
  *
  */
 
-package scot.carricksoftware.grants.capitalisation.certificates.deathcertificate;
+package scot.carricksoftware.grants.capitalisation.certificates.deathcertificates;
 
 import scot.carricksoftware.grants.commands.certificates.deathcertificates.DeathCertificateCommand;
 

src/main/java/scot/carricksoftware/grants/capitalisation/certificates/deathcertificate/CapitaliseDeathCertificateImpl.java → src/main/java/scot/carricksoftware/grants/capitalisation/certificates/deathcertificates/CapitaliseDeathCertificateImpl.java

@@ -3,7 +3,7 @@
  *
  */
 
-package scot.carricksoftware.grants.capitalisation.certificates.deathcertificate;
+package scot.carricksoftware.grants.capitalisation.certificates.deathcertificates;
 
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;

src/main/java/scot/carricksoftware/grants/capitalisation/certificates/marriagecertificate/CapitaliseMarriageCertificate.java → src/main/java/scot/carricksoftware/grants/capitalisation/certificates/marriagecertificates/CapitaliseMarriageCertificate.java

@@ -3,7 +3,7 @@
  *
  */
 
-package scot.carricksoftware.grants.capitalisation.certificates.marriagecertificate;
+package scot.carricksoftware.grants.capitalisation.certificates.marriagecertificates;
 
 import scot.carricksoftware.grants.commands.certificates.marriagecertificates.MarriageCertificateCommand;
 

src/main/java/scot/carricksoftware/grants/capitalisation/certificates/marriagecertificate/CapitaliseMarriageCertificateImpl.java → src/main/java/scot/carricksoftware/grants/capitalisation/certificates/marriagecertificates/CapitaliseMarriageCertificateImpl.java

@@ -3,7 +3,7 @@
  *
  */
 
-package scot.carricksoftware.grants.capitalisation.certificates.marriagecertificate;
+package scot.carricksoftware.grants.capitalisation.certificates.marriagecertificates;
 
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;

src/main/java/scot/carricksoftware/grants/controllers/certificates/birthcertificates/BirthCertificateFormControllerImpl.java

@@ -15,7 +15,7 @@ import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.ModelAttribute;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.PostMapping;
-import scot.carricksoftware.grants.capitalisation.certificates.birthcertificate.CapitaliseBirthCertificate;
+import scot.carricksoftware.grants.capitalisation.certificates.birthcertificates.CapitaliseBirthCertificate;
 import scot.carricksoftware.grants.commands.certificates.birthcertificates.BirthCertificateCommand;
 import scot.carricksoftware.grants.commands.certificates.birthcertificates.BirthCertificateCommandImpl;
 import scot.carricksoftware.grants.constants.AttributeConstants;

src/main/java/scot/carricksoftware/grants/controllers/certificates/deathcertificates/DeathCertificateFormControllerImpl.java

@@ -15,7 +15,7 @@ import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.ModelAttribute;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.PostMapping;
-import scot.carricksoftware.grants.capitalisation.certificates.deathcertificate.CapitaliseDeathCertificate;
+import scot.carricksoftware.grants.capitalisation.certificates.deathcertificates.CapitaliseDeathCertificate;
 import scot.carricksoftware.grants.commands.certificates.deathcertificates.DeathCertificateCommand;
 import scot.carricksoftware.grants.commands.certificates.deathcertificates.DeathCertificateCommandImpl;
 import scot.carricksoftware.grants.constants.AttributeConstants;

src/main/java/scot/carricksoftware/grants/controllers/certificates/marriagecertificates/MarriageCertificateFormControllerImpl.java

@@ -15,7 +15,7 @@ import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.ModelAttribute;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.PostMapping;
-import scot.carricksoftware.grants.capitalisation.certificates.marriagecertificate.CapitaliseMarriageCertificate;
+import scot.carricksoftware.grants.capitalisation.certificates.marriagecertificates.CapitaliseMarriageCertificate;
 import scot.carricksoftware.grants.commands.certificates.marriagecertificates.MarriageCertificateCommand;
 import scot.carricksoftware.grants.commands.certificates.marriagecertificates.MarriageCertificateCommandImpl;
 import scot.carricksoftware.grants.constants.AttributeConstants;

src/test/java/scot/carricksoftware/grants/capitalisation/certificates/birthcertificates/CapitaliseBirthCertificatesPartOneTest.java

@@ -12,8 +12,6 @@ import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.Mock;
 import org.mockito.junit.jupiter.MockitoExtension;
 import scot.carricksoftware.grants.capitalisation.CapitaliseStringImpl;
-import scot.carricksoftware.grants.capitalisation.certificates.birthcertificate.CapitaliseBirthCertificate;
-import scot.carricksoftware.grants.capitalisation.certificates.birthcertificate.CapitaliseBirthCertificateImpl;
 import scot.carricksoftware.grants.commands.certificates.birthcertificates.BirthCertificateCommand;
 import scot.carricksoftware.grants.commands.certificates.birthcertificates.BirthCertificateCommandImpl;
 

src/test/java/scot/carricksoftware/grants/capitalisation/certificates/birthcertificates/CapitaliseBirthCertificatesPartThreeTest.java

@@ -12,8 +12,6 @@ import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.Mock;
 import org.mockito.junit.jupiter.MockitoExtension;
 import scot.carricksoftware.grants.capitalisation.CapitaliseStringImpl;
-import scot.carricksoftware.grants.capitalisation.certificates.birthcertificate.CapitaliseBirthCertificate;
-import scot.carricksoftware.grants.capitalisation.certificates.birthcertificate.CapitaliseBirthCertificateImpl;
 import scot.carricksoftware.grants.commands.certificates.birthcertificates.BirthCertificateCommand;
 import scot.carricksoftware.grants.commands.certificates.birthcertificates.BirthCertificateCommandImpl;
 

src/test/java/scot/carricksoftware/grants/capitalisation/certificates/birthcertificates/CapitaliseBirthCertificatesPartTwoTest.java

@@ -12,8 +12,6 @@ import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.Mock;
 import org.mockito.junit.jupiter.MockitoExtension;
 import scot.carricksoftware.grants.capitalisation.CapitaliseStringImpl;
-import scot.carricksoftware.grants.capitalisation.certificates.birthcertificate.CapitaliseBirthCertificate;
-import scot.carricksoftware.grants.capitalisation.certificates.birthcertificate.CapitaliseBirthCertificateImpl;
 import scot.carricksoftware.grants.commands.certificates.birthcertificates.BirthCertificateCommand;
 import scot.carricksoftware.grants.commands.certificates.birthcertificates.BirthCertificateCommandImpl;
 

src/test/java/scot/carricksoftware/grants/capitalisation/certificates/deathcertificates/CapitaliseDeathCertificatesPartOneTest.java

@@ -12,8 +12,6 @@ import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.Mock;
 import org.mockito.junit.jupiter.MockitoExtension;
 import scot.carricksoftware.grants.capitalisation.CapitaliseStringImpl;
-import scot.carricksoftware.grants.capitalisation.certificates.deathcertificate.CapitaliseDeathCertificate;
-import scot.carricksoftware.grants.capitalisation.certificates.deathcertificate.CapitaliseDeathCertificateImpl;
 import scot.carricksoftware.grants.commands.certificates.deathcertificates.DeathCertificateCommand;
 import scot.carricksoftware.grants.commands.certificates.deathcertificates.DeathCertificateCommandImpl;
 

src/test/java/scot/carricksoftware/grants/capitalisation/certificates/deathcertificates/CapitaliseDeathCertificatesPartThreeTest.java

@@ -12,8 +12,6 @@ import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.Mock;
 import org.mockito.junit.jupiter.MockitoExtension;
 import scot.carricksoftware.grants.capitalisation.CapitaliseStringImpl;
-import scot.carricksoftware.grants.capitalisation.certificates.deathcertificate.CapitaliseDeathCertificate;
-import scot.carricksoftware.grants.capitalisation.certificates.deathcertificate.CapitaliseDeathCertificateImpl;
 import scot.carricksoftware.grants.commands.certificates.deathcertificates.DeathCertificateCommand;
 import scot.carricksoftware.grants.commands.certificates.deathcertificates.DeathCertificateCommandImpl;
 

src/test/java/scot/carricksoftware/grants/capitalisation/certificates/deathcertificates/CapitaliseDeathCertificatesPartTwoTest.java

@@ -12,8 +12,6 @@ import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.Mock;
 import org.mockito.junit.jupiter.MockitoExtension;
 import scot.carricksoftware.grants.capitalisation.CapitaliseStringImpl;
-import scot.carricksoftware.grants.capitalisation.certificates.deathcertificate.CapitaliseDeathCertificate;
-import scot.carricksoftware.grants.capitalisation.certificates.deathcertificate.CapitaliseDeathCertificateImpl;
 import scot.carricksoftware.grants.commands.certificates.deathcertificates.DeathCertificateCommand;
 import scot.carricksoftware.grants.commands.certificates.deathcertificates.DeathCertificateCommandImpl;
 

src/test/java/scot/carricksoftware/grants/capitalisation/certificates/marriagecertificates/CapitaliseMarriageCertificatesPartOneTest.java

@@ -0,0 +1,56 @@
+/*
+ * Copyright (c) 2025.  Andrew Grant Carrick Software. All rights reserved
+ *
+ */
+
+package scot.carricksoftware.grants.capitalisation.certificates.marriagecertificates;
+
+
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.Mock;
+import org.mockito.junit.jupiter.MockitoExtension;
+import scot.carricksoftware.grants.capitalisation.CapitaliseStringImpl;
+import scot.carricksoftware.grants.commands.certificates.marriagecertificates.MarriageCertificateCommand;
+import scot.carricksoftware.grants.commands.certificates.marriagecertificates.MarriageCertificateCommandImpl;
+
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.when;
+
+
+@ExtendWith(MockitoExtension.class)
+class CapitaliseMarriageCertificatesPartOneTest {
+
+    private CapitaliseMarriageCertificate capitaliseMarriageCertificate;
+
+    @Mock
+    private CapitaliseStringImpl capitaliseStringMock;
+
+    private MarriageCertificateCommand marriageCertificateCommand;
+
+    @BeforeEach
+    void setUp() {
+        capitaliseMarriageCertificate = new CapitaliseMarriageCertificateImpl(capitaliseStringMock);
+        marriageCertificateCommand = new MarriageCertificateCommandImpl();
+        when(capitaliseStringMock.capitalise(any())).thenReturn("Lower");
+    }
+
+    @Test
+    void untrackedFirstWitnessTest() {
+        marriageCertificateCommand.setUntrackedFirstWitness("lower");
+        capitaliseMarriageCertificate.capitalise(marriageCertificateCommand);
+        assertEquals("Lower", marriageCertificateCommand.getUntrackedFirstWitness());
+    }
+
+    @Test
+    void untrackedSecondWitnessTest() {
+        marriageCertificateCommand.setUntrackedSecondWitness("lower");
+        capitaliseMarriageCertificate.capitalise(marriageCertificateCommand);
+        assertEquals("Lower", marriageCertificateCommand.getUntrackedSecondWitness());
+    }
+
+
+}

src/test/java/scot/carricksoftware/grants/commands/certificates/marriage/MarriageCertificateCommandBaseCertificateStringTest.java

@@ -87,6 +87,5 @@ class MarriageCertificateCommandBaseCertificateStringTest {
     }
 
 
-
 }
     

src/test/java/scot/carricksoftware/grants/controllers/certificates/birthcertificates/BirthCertificateFormControllerCapitalisationTest.java

@@ -13,7 +13,7 @@ import org.mockito.Mock;
 import org.mockito.junit.jupiter.MockitoExtension;
 import org.springframework.ui.Model;
 import org.springframework.validation.BindingResult;
-import scot.carricksoftware.grants.capitalisation.certificates.birthcertificate.CapitaliseBirthCertificate;
+import scot.carricksoftware.grants.capitalisation.certificates.birthcertificates.CapitaliseBirthCertificate;
 import scot.carricksoftware.grants.commands.certificates.birthcertificates.BirthCertificateCommand;
 import scot.carricksoftware.grants.commands.certificates.birthcertificates.BirthCertificateCommandImpl;
 import scot.carricksoftware.grants.converters.certificates.birthcertificates.BirthCertificateCommandConverterImpl;

src/test/java/scot/carricksoftware/grants/controllers/certificates/birthcertificates/BirthCertificateFormControllerSaveOrUpdateTest.java

@@ -12,7 +12,7 @@ import org.mockito.Mock;
 import org.mockito.junit.jupiter.MockitoExtension;
 import org.springframework.ui.Model;
 import org.springframework.validation.BindingResult;
-import scot.carricksoftware.grants.capitalisation.certificates.birthcertificate.CapitaliseBirthCertificate;
+import scot.carricksoftware.grants.capitalisation.certificates.birthcertificates.CapitaliseBirthCertificate;
 import scot.carricksoftware.grants.commands.certificates.birthcertificates.BirthCertificateCommandImpl;
 import scot.carricksoftware.grants.commands.certificates.birthcertificates.BirthCertificateCommand;
 import scot.carricksoftware.grants.converters.certificates.birthcertificates.BirthCertificateCommandConverterImpl;

src/test/java/scot/carricksoftware/grants/controllers/certificates/birthcertificates/BirthCertificateFormControllerTest.java

@@ -13,7 +13,7 @@ import org.mockito.ArgumentCaptor;
 import org.mockito.Mock;
 import org.mockito.junit.jupiter.MockitoExtension;
 import org.springframework.ui.Model;
-import scot.carricksoftware.grants.capitalisation.certificates.birthcertificate.CapitaliseBirthCertificate;
+import scot.carricksoftware.grants.capitalisation.certificates.birthcertificates.CapitaliseBirthCertificate;
 import scot.carricksoftware.grants.commands.certificates.birthcertificates.BirthCertificateCommand;
 import scot.carricksoftware.grants.constants.AttributeConstants;
 import scot.carricksoftware.grants.converters.certificates.birthcertificates.BirthCertificateCommandConverterImpl;

src/test/java/scot/carricksoftware/grants/controllers/certificates/birthcertificates/BirthCertificateFormControllerUpdateTest.java

@@ -13,7 +13,7 @@ import org.mockito.Mock;
 import org.mockito.junit.jupiter.MockitoExtension;
 import org.springframework.ui.Model;
 import org.springframework.validation.BindingResult;
-import scot.carricksoftware.grants.capitalisation.certificates.birthcertificate.CapitaliseBirthCertificate;
+import scot.carricksoftware.grants.capitalisation.certificates.birthcertificates.CapitaliseBirthCertificate;
 import scot.carricksoftware.grants.commands.certificates.birthcertificates.BirthCertificateCommand;
 import scot.carricksoftware.grants.commands.certificates.birthcertificates.BirthCertificateCommandImpl;
 import scot.carricksoftware.grants.converters.certificates.birthcertificates.BirthCertificateCommandConverterImpl;

src/test/java/scot/carricksoftware/grants/controllers/certificates/birthcertificates/BirthCertificateFormControllerValidationTest.java

@@ -13,7 +13,7 @@ import org.mockito.Mock;
 import org.mockito.junit.jupiter.MockitoExtension;
 import org.springframework.ui.Model;
 import org.springframework.validation.BindingResult;
-import scot.carricksoftware.grants.capitalisation.certificates.birthcertificate.CapitaliseBirthCertificate;
+import scot.carricksoftware.grants.capitalisation.certificates.birthcertificates.CapitaliseBirthCertificate;
 import scot.carricksoftware.grants.commands.certificates.birthcertificates.BirthCertificateCommand;
 import scot.carricksoftware.grants.commands.certificates.birthcertificates.BirthCertificateCommandImpl;
 import scot.carricksoftware.grants.converters.certificates.birthcertificates.BirthCertificateCommandConverterImpl;

src/test/java/scot/carricksoftware/grants/controllers/certificates/deathcertificates/DeathCertificateFormControllerSaveOrUpdateTest.java

@@ -12,7 +12,7 @@ import org.mockito.Mock;
 import org.mockito.junit.jupiter.MockitoExtension;
 import org.springframework.ui.Model;
 import org.springframework.validation.BindingResult;
-import scot.carricksoftware.grants.capitalisation.certificates.deathcertificate.CapitaliseDeathCertificate;
+import scot.carricksoftware.grants.capitalisation.certificates.deathcertificates.CapitaliseDeathCertificate;
 import scot.carricksoftware.grants.commands.certificates.deathcertificates.DeathCertificateCommand;
 import scot.carricksoftware.grants.commands.certificates.deathcertificates.DeathCertificateCommandImpl;
 import scot.carricksoftware.grants.converters.certificates.deathcertificates.DeathCertificateCommandConverterImpl;

src/test/java/scot/carricksoftware/grants/controllers/certificates/deathcertificates/DeathCertificateFormControllerTest.java

@@ -13,7 +13,7 @@ import org.mockito.ArgumentCaptor;
 import org.mockito.Mock;
 import org.mockito.junit.jupiter.MockitoExtension;
 import org.springframework.ui.Model;
-import scot.carricksoftware.grants.capitalisation.certificates.deathcertificate.CapitaliseDeathCertificate;
+import scot.carricksoftware.grants.capitalisation.certificates.deathcertificates.CapitaliseDeathCertificate;
 import scot.carricksoftware.grants.commands.certificates.deathcertificates.DeathCertificateCommand;
 import scot.carricksoftware.grants.constants.AttributeConstants;
 import scot.carricksoftware.grants.converters.certificates.deathcertificates.DeathCertificateCommandConverterImpl;

src/test/java/scot/carricksoftware/grants/controllers/certificates/deathcertificates/DeathCertificateFormControllerValidationTest.java

@@ -13,7 +13,7 @@ import org.mockito.Mock;
 import org.mockito.junit.jupiter.MockitoExtension;
 import org.springframework.ui.Model;
 import org.springframework.validation.BindingResult;
-import scot.carricksoftware.grants.capitalisation.certificates.deathcertificate.CapitaliseDeathCertificate;
+import scot.carricksoftware.grants.capitalisation.certificates.deathcertificates.CapitaliseDeathCertificate;
 import scot.carricksoftware.grants.commands.certificates.deathcertificates.DeathCertificateCommand;
 import scot.carricksoftware.grants.commands.certificates.deathcertificates.DeathCertificateCommandImpl;
 import scot.carricksoftware.grants.converters.certificates.deathcertificates.DeathCertificateCommandConverter;

src/test/java/scot/carricksoftware/grants/controllers/certificates/marriagecertificates/MarriageCertificateFormControllerSaveOrUpdateTest.java

@@ -12,7 +12,7 @@ import org.mockito.Mock;
 import org.mockito.junit.jupiter.MockitoExtension;
 import org.springframework.ui.Model;
 import org.springframework.validation.BindingResult;
-import scot.carricksoftware.grants.capitalisation.certificates.marriagecertificate.CapitaliseMarriageCertificate;
+import scot.carricksoftware.grants.capitalisation.certificates.marriagecertificates.CapitaliseMarriageCertificate;
 import scot.carricksoftware.grants.commands.certificates.marriagecertificates.MarriageCertificateCommand;
 import scot.carricksoftware.grants.commands.certificates.marriagecertificates.MarriageCertificateCommandImpl;
 import scot.carricksoftware.grants.converters.certificates.marriagecertificates.MarriageCertificateCommandConverterImpl;

src/test/java/scot/carricksoftware/grants/controllers/certificates/marriagecertificates/MarriageCertificateFormControllerTest.java

@@ -13,7 +13,7 @@ import org.mockito.ArgumentCaptor;
 import org.mockito.Mock;
 import org.mockito.junit.jupiter.MockitoExtension;
 import org.springframework.ui.Model;
-import scot.carricksoftware.grants.capitalisation.certificates.marriagecertificate.CapitaliseMarriageCertificate;
+import scot.carricksoftware.grants.capitalisation.certificates.marriagecertificates.CapitaliseMarriageCertificate;
 import scot.carricksoftware.grants.commands.certificates.marriagecertificates.MarriageCertificateCommand;
 import scot.carricksoftware.grants.constants.AttributeConstants;
 import scot.carricksoftware.grants.converters.certificates.marriagecertificates.MarriageCertificateCommandConverterImpl;

src/test/java/scot/carricksoftware/grants/controllers/certificates/marriagecertificates/MarriageCertificateFormControllerValidationTest.java

@@ -13,7 +13,7 @@ import org.mockito.Mock;
 import org.mockito.junit.jupiter.MockitoExtension;
 import org.springframework.ui.Model;
 import org.springframework.validation.BindingResult;
-import scot.carricksoftware.grants.capitalisation.certificates.marriagecertificate.CapitaliseMarriageCertificate;
+import scot.carricksoftware.grants.capitalisation.certificates.marriagecertificates.CapitaliseMarriageCertificate;
 import scot.carricksoftware.grants.commands.certificates.marriagecertificates.MarriageCertificateCommand;
 import scot.carricksoftware.grants.commands.certificates.marriagecertificates.MarriageCertificateCommandImpl;
 import scot.carricksoftware.grants.converters.certificates.marriagecertificates.MarriageCertificateCommandConverterImpl;

src/test/java/scot/carricksoftware/grants/converters/certificates/marriagecertificates/MarriageCertificateCommandConverterTest.java

@@ -69,7 +69,6 @@ class MarriageCertificateCommandConverterTest {
         source.setNumber(GetRandomString());
 
 
-
         MarriageCertificate target = converter.convert(source);
 
         assert target != null;

src/test/java/scot/carricksoftware/grants/domains/certificates/marriage/MarriageCertificateStringTest.java

@@ -127,7 +127,4 @@ class MarriageCertificateStringTest {
     }
 
 
-
-
-
 }

src/test/java/scot/carricksoftware/grants/validators/certificates/marriagecertificate/MarriageCertificateBaseFieldsValidatorTest.java

@@ -42,23 +42,23 @@ class MarriageCertificateBaseFieldsValidatorTest {
     @Test
     void validateNullFieldsTest() {
         verify(validateTypesMock).validateNullOrEmptyString(marriageCertificateCommand.getCertificateNumber(),
-                "certificateNumber","The certificate number cannot be null.", bindingResultMock);
+                "certificateNumber", "The certificate number cannot be null.", bindingResultMock);
         verify(validateTypesMock).validateNullOrEmptyString(marriageCertificateCommand.getVolume(),
-                "volume","The volume cannot be null.", bindingResultMock);
+                "volume", "The volume cannot be null.", bindingResultMock);
         verify(validateTypesMock).validateNullOrEmptyString(marriageCertificateCommand.getNumber(),
-                "number","The number cannot be null.", bindingResultMock);
+                "number", "The number cannot be null.", bindingResultMock);
         verify(validateTypesMock).validateOrganisation(marriageCertificateCommand.getCertificateSource(),
                 "certificateSource", "The certificate source cannot be null.", bindingResultMock);
         verify(validateTypesMock).validateOrganisation(marriageCertificateCommand.getRegistrationAuthority(),
-                "registrationAuthority","The registration authority cannot be null.", bindingResultMock);
+                "registrationAuthority", "The registration authority cannot be null.", bindingResultMock);
         verify(validateTypesMock).validateCertificateType(marriageCertificateCommand.getCertificateType(),
-                "certificateType","The certificate type cannot be null.", bindingResultMock);
+                "certificateType", "The certificate type cannot be null.", bindingResultMock);
     }
 
     @Test
     void validateCertificateDateTest() {
         verify(validateDateTypesMock).validatePastDate(marriageCertificateCommand.getCertificateDate(),
-                "certificateDate","The certificate date cannot be null.",
+                "certificateDate", "The certificate date cannot be null.",
                 "The certificate date is invalid or of the wrong format.",
                 "Date should not be in the future.",
                 bindingResultMock);