diff --git a/src/main/java/uk/gov/dvsa/enums/CertificateTemplates.java b/src/main/java/uk/gov/dvsa/enums/CertificateTemplates.java
index 0064dbf8..1a0c7f18 100644
--- a/src/main/java/uk/gov/dvsa/enums/CertificateTemplates.java
+++ b/src/main/java/uk/gov/dvsa/enums/CertificateTemplates.java
@@ -20,6 +20,7 @@ public enum CertificateTemplates {
     VT29("MOT/VT29"),
 
     VTP20("CommercialVehicles/pass"),
+    VTP20W("CommercialVehicles/passWelsh"),
     VTP30("CommercialVehicles/fail"),
 
     VTG5("CommercialVehicles/passNoSeatbeltFields"),
diff --git a/src/main/java/uk/gov/dvsa/enums/CertificateTypes.java b/src/main/java/uk/gov/dvsa/enums/CertificateTypes.java
index b1ef81cc..f3fe9ed3 100644
--- a/src/main/java/uk/gov/dvsa/enums/CertificateTypes.java
+++ b/src/main/java/uk/gov/dvsa/enums/CertificateTypes.java
@@ -25,6 +25,8 @@ public enum CertificateTypes {
 
 
     CVS_PASS("CVS/VTP20"),
+    CVS_PASS_WELSH("CVS/VTP20W"),
+    CVS_PASS_BILINGUAL("CVS/VTP20_BILINGUAL"),
     CVS_FAIL("CVS/VTP30"),
     CVS_PSV_PRS("CVS/PSV_PRS"),
 
diff --git a/src/main/java/uk/gov/dvsa/enums/DocumentsConfig.java b/src/main/java/uk/gov/dvsa/enums/DocumentsConfig.java
index 85d4e65c..d9a8d732 100644
--- a/src/main/java/uk/gov/dvsa/enums/DocumentsConfig.java
+++ b/src/main/java/uk/gov/dvsa/enums/DocumentsConfig.java
@@ -46,6 +46,8 @@ public enum DocumentsConfig {
             new String[]{CertificateTemplates.VTP20.getCertificateTemplateName(), CertificateTemplates.VTP30.getCertificateTemplateName()}),
     VTP20(CertificateTypes.CVS_PASS.getCertificateType(), uk.gov.dvsa.model.cvs.VTP20.class,
             new String[]{CertificateTemplates.VTP20.getCertificateTemplateName()}),
+    VTP20W(CertificateTypes.CVS_PASS_WELSH.getCertificateType(), uk.gov.dvsa.model.cvs.VTP20W.class,
+            new String[]{CertificateTemplates.VTP20W.getCertificateTemplateName()}),
     VTP30(CertificateTypes.CVS_FAIL.getCertificateType(), uk.gov.dvsa.model.cvs.VTP30.class,
             new String[]{CertificateTemplates.VTP30.getCertificateTemplateName()}),
 
@@ -72,6 +74,8 @@ public enum DocumentsConfig {
             new String[]{CertificateTemplates.RWT_DATA.getCertificateTemplateName()}),
     CVS_HGV_PRS(CertificateTypes.CVS_HGV_PRS.getCertificateType(), uk.gov.dvsa.model.cvs.CvsHgvPRS.class,
             new String[]{CertificateTemplates.VTG5.getCertificateTemplateName(), CertificateTemplates.VTG30.getCertificateTemplateName()}),
+    CVS_PASS_BILINGUAL(CertificateTypes.CVS_PASS_BILINGUAL.getCertificateType(), uk.gov.dvsa.model.cvs.CvsPsvPassBilingual.class,
+            new String[]{CertificateTemplates.VTP20.getCertificateTemplateName(), CertificateTemplates.VTP20W.getCertificateTemplateName()}),
     CVS_HGV_PASS_BILINGUAL(CertificateTypes.CVS_HGV_PASS_BILINGUAL.getCertificateType(), uk.gov.dvsa.model.cvs.CvsHgvPassBilingual.class,
             new String[]{CertificateTemplates.VTG5.getCertificateTemplateName(), CertificateTemplates.VTG5W.getCertificateTemplateName()}),
     CVS_TRL_PASS_BILINGUAL(CertificateTypes.CVS_TRL_PASS_BILINGUAL.getCertificateType(), uk.gov.dvsa.model.cvs.CvsTrlPassBilingual.class,
diff --git a/src/main/java/uk/gov/dvsa/model/cvs/CvsPsvPassBilingual.java b/src/main/java/uk/gov/dvsa/model/cvs/CvsPsvPassBilingual.java
new file mode 100644
index 00000000..58aea532
--- /dev/null
+++ b/src/main/java/uk/gov/dvsa/model/cvs/CvsPsvPassBilingual.java
@@ -0,0 +1,28 @@
+package uk.gov.dvsa.model.cvs;
+
+public class CvsPsvPassBilingual extends VTP20W {
+
+    public String getTestType() {
+        return "PSV";
+    }
+
+    public String getPresentedDocumentNamePass() {
+        return "VTP20";
+    }
+
+    public String getPresentedDocumentNamePassWelsh() {
+        return "VTP20W";
+    }
+
+    public String getVersionNumberPass() {
+        return "1.0";
+    }
+
+    public String getVersionNumberPassWelsh() {
+        return "1.0";
+    }
+
+    public String getRegOrIdHeading() {
+        return "Registration number";
+    }
+}
diff --git a/src/main/java/uk/gov/dvsa/model/cvs/VTP20W.java b/src/main/java/uk/gov/dvsa/model/cvs/VTP20W.java
new file mode 100644
index 00000000..801e07d0
--- /dev/null
+++ b/src/main/java/uk/gov/dvsa/model/cvs/VTP20W.java
@@ -0,0 +1,28 @@
+package uk.gov.dvsa.model.cvs;
+
+import uk.gov.dvsa.model.Document;
+import uk.gov.dvsa.model.cvs.certificateData.CvsMotCertificateDataWelsh;
+
+public class VTP20W extends CvsMotCertificate {
+
+    public Document setData(CvsMotCertificateDataWelsh data) {
+        this.data = data;
+        return this;
+    }
+
+    public String getTestType() {
+        return "PSV";
+    }
+
+    public String getPresentedDocumentNamePass() {
+        return "VTP20W";
+    }
+
+    public String getVersionNumberPass() {
+        return "1.0";
+    }
+
+    public String getRegOrIdHeadingWelsh() {
+        return "Rhif cofrestru";
+    }
+}
diff --git a/src/main/resources/views/CommercialVehicles/passWelsh.hbs b/src/main/resources/views/CommercialVehicles/passWelsh.hbs
index bdebc373..dd6edd56 100644
--- a/src/main/resources/views/CommercialVehicles/passWelsh.hbs
+++ b/src/main/resources/views/CommercialVehicles/passWelsh.hbs
@@ -33,7 +33,7 @@
         </div>
         <div class="footer__certificate-tag">
                <span class="footer__certificate-tag-text">
-                {{presentedDocumentNamePass}}/{{versionNumberPass}}
+                {{presentedDocumentNamePassWelsh}}/{{versionNumberPassWelsh}}
                </span>
         </div>
     </div>
@@ -70,7 +70,7 @@
         </div>
         <div class="footer__certificate-tag">
                <span class="footer__certificate-tag-text">
-                {{presentedDocumentNamePass}}/{{versionNumberPass}}
+                {{presentedDocumentNamePassWelsh}}/{{versionNumberPassWelsh}}
                </span>
         </div>
     </div>
@@ -120,7 +120,7 @@
                               </span>
                               <span class="heading-info__title-right">
                               <span class="heading-info__title-message">
-                                  {{regOrIdHeading}}
+                                  {{regOrIdHeadingWelsh}}
                               </span>
                               </span>
                             </h2>
@@ -167,7 +167,7 @@
                 <!-- /heading-info -->
             </div>
             <div class="header__right">
-                <img src="{{root}}/assets/images/dvsa_crest.png" alt="DVSA Crown" class="header__logo" id="logo"/>
+                <img src="{{root}}/assets/images/dvsa-crest-welsh-v2.png" alt="DVSA Crown" class="header__logo" id="logo"/>
             </div>
             <div class="clearfix"></div>
             <!-- header__three-columns -->
@@ -193,7 +193,7 @@
                     </div>
                     <!-- /heading-info -->
                 </div>
-                {{#if data.formattedCurrentOdometer}}
+                {{#if data.formattedCurrentOdometerWelsh}}
                 <div class="header__three-columns-two">
                     <!-- heading-info -->
                     <div class="heading-info">
@@ -210,7 +210,7 @@
                            </span>
                         </h2>
                         <span class="heading-info__content" id="mileage">
-                            {{data.formattedCurrentOdometer}}
+                            {{data.formattedCurrentOdometerWelsh}}
                         </span>
                     </div>
                     <!-- /heading-info -->
@@ -228,7 +228,7 @@
                                 <!-- header__histories -->
                                 {{#if data.odometerHistoryList}}
                                 <ul class="header__histories">
-                                    {{#each data.mileageHistory}}
+                                    {{#each data.mileageHistoryWelsh}}
                                         <li class="header__history">
                                             <div class="header__history-left-wide">
                                     <span class="header__history-mileage">
@@ -260,12 +260,12 @@
         <!-- results -->
         <div class="results">
             <div class="results__wrapper">
-                {{~> views/CommercialVehicles/reasonsForRejection data.summary}}
+                {{~> views/CommercialVehicles/reasonsForRejection data.summaryWelsh}}
                 {{#if data.minor.present}}
-                    {{~> views/CommercialVehicles/reasonsForRejection data.minor}}
+                    {{~> views/CommercialVehicles/reasonsForRejection data.minorWelsh}}
                 {{/if}}
                 {{#if data.advisory.present}}
-                    {{~> views/CommercialVehicles/reasonsForRejection data.advisory}}
+                    {{~> views/CommercialVehicles/reasonsForRejection data.advisoryWelsh}}
                 {{/if}}
             </div>
         </div>
@@ -357,7 +357,7 @@
                     </h2>
                      <span class="heading-info__content"
                            id="organisation-and-inspection-name">
-                     {{data.testingOrganisation}}
+                     {{data.testingOrganisationWelsh}}
                          <br/>
                          {{data.issuersName}}
                      </span>
diff --git a/src/test/java/htmlverification/service/CvsCertificateTestDataProvider.java b/src/test/java/htmlverification/service/CvsCertificateTestDataProvider.java
index 4a9f9c29..85f15767 100644
--- a/src/test/java/htmlverification/service/CvsCertificateTestDataProvider.java
+++ b/src/test/java/htmlverification/service/CvsCertificateTestDataProvider.java
@@ -46,6 +46,15 @@ public static VTP20 getReplacementVtp20() {
         return document;
     }
 
+    public static VTP20W getVtp20wWithNoOdometerHistory() {
+        VTP20W document = getVtp20W();
+
+        CvsMotCertificateData data = document.getData();
+        data.setOdometerHistoryList(null);
+
+        return document;
+    }
+
     public static VTP20 getVtp20() {
         VTP20 vtp20 = new VTP20();
         vtp20.setDocumentName(CertificateTypes.CVS_PASS.getCertificateType());
@@ -95,6 +104,56 @@ public static VTP20 getVtp20() {
         return vtp20;
     }
 
+    public static VTP20W getVtp20W() {
+        VTP20W vtp20W = new VTP20W();
+        vtp20W.setDocumentName(CertificateTypes.CVS_PASS_WELSH.getCertificateType());
+        CvsMotCertificateDataWelsh vtp20WData = new CvsMotCertificateDataWelsh();
+        vtp20WData
+                .setMinorDefectsWelsh(generateRFRs(MINOR_RFR_TEXT, 1))
+                .setAdvisoryDefectsWelsh(generateRFRs(ADVISORY_RFR_TEXT, 1))
+                .setMinorDefectsHeader(DefectSummaryComponent.MINOR_DEFECTS_HEADER_TEST_WELSH_CVS)
+                .setAdvisoryDefectsHeader(DefectSummaryComponent.ADVISORIES_HEADER_TEXT_WELSH_CVS)
+                .setMinorDefects(generateRFRs(MINOR_RFR_TEXT, 1))
+                .setAdvisoryDefects(generateRFRs(ADVISORY_RFR_TEXT, 1))
+
+                .setSeatBeltNumber("10")
+                .setSeatBeltPreviousCheckDate("12.11.2018")
+                .setSeatBeltTested("Yes")
+
+                .setCountryOfRegistrationCode("GB")
+                .setRawVin(VIN)
+                .setDateOfTheTest("12.11.2018")
+                .setExpiryDate("12.10.2018")
+                .setTestStationPNumber("P12345")
+                .setTestStationName("TEST STATION NAME")
+                .setMake("Aston Martin")
+                .setModel("DB11")
+                .setVehicleEuClassification("M1")
+                .setRawVrm("KA1SAPH")
+                .setCurrentOdometer(
+                        new CvsOdometerReading("22341", "mi", "01.02.2019")
+                )
+                .setOdometerHistoryList(Arrays.asList(
+                        new CvsOdometerReading("120", "mi", "01.02.2016"),
+                        new CvsOdometerReading("330", "mi", "30.01.2017")
+                ))
+                .setIssuersName("R.DREWNO")
+                .setTestStationName("POPULAR GARAGES")
+                .setTestNumber("1806 8140 0628")
+                .setEarliestDateOfTheNextTest("13.10.2018");
+
+        vtp20W.setData(vtp20WData);
+
+        Signature signature = new Signature();
+        signature
+                .setImageData("iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAADUlEQVR42mNkYPhfDwAChwGA60e6kgAAAABJRU5ErkJggg==")
+                .setImageType("png");
+
+        vtp20W.setSignature(signature);
+
+        return vtp20W;
+    }
+
     private static Reissue generateReissuer() {
         Reissue reissue = new Reissue();
         reissue.setIssuer("Joe");
@@ -239,7 +298,6 @@ public static VTG5A getVtg5a() {
                 .setMake("Aston Martin")
                 .setModel("DB11")
                 .setIssuersName("R.DREWNO")
-                .setTestStationName("POPULAR GARAGES")
                 .setTestNumber("1806 8140 0628")
                 .setEarliestDateOfTheNextTest("13.10.2018")
                 .setTrn("ABC1234")
@@ -306,6 +364,46 @@ public static VTG5W getVTG5W() {
         return vtg5W;
     }
 
+    public static VTG5AW getVTG5AW() {
+        VTG5AW vtg5AW = new VTG5AW();
+        vtg5AW.setDocumentName(CertificateTypes.CVS_TRL_PASS_WELSH.getCertificateType());
+        CvsMotCertificateDataWelsh vtg5AWData = new CvsMotCertificateDataWelsh();
+        vtg5AWData
+                .setMinorDefectsWelsh(generateRFRs(MINOR_RFR_TEXT, 1))
+                .setAdvisoryDefectsWelsh(generateRFRs(ADVISORY_RFR_TEXT, 1))
+                .setMinorDefectsHeader(DefectSummaryComponent.MINOR_DEFECTS_HEADER_TEST_WELSH_CVS)
+                .setAdvisoryDefectsHeader(DefectSummaryComponent.ADVISORIES_HEADER_TEXT_WELSH_CVS)
+                .setMinorDefects(generateRFRs(MINOR_RFR_TEXT, 1))
+                .setAdvisoryDefects(generateRFRs(ADVISORY_RFR_TEXT, 1))
+
+                .setCountryOfRegistrationCode("GB")
+                .setRawVin(VIN)
+                .setDateOfTheTest("12.11.2018")
+                .setExpiryDate("12.10.2018")
+                .setTestStationPNumber("P12345")
+                .setTestStationName("TEST STATION NAME")
+                .setMake("Aston Martin")
+                .setModel("DB11")
+                .setIssuersName("R.DREWNO")
+                .setTestStationName("POPULAR GARAGES")
+                .setTestNumber("1806 8140 0628")
+                .setEarliestDateOfTheNextTest("13.10.2018")
+                .setTrn("ABC1234")
+                .setIsTrailer(true);
+
+        vtg5AW.setData(vtg5AWData);
+
+        Signature signature = new Signature();
+        signature
+                .setImageData("iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAADUlEQVR42mNkYPhfDwAChwGA60e6kgAAAABJRU5ErkJggg==")
+                .setImageType("png");
+
+        vtg5AW.setSignature(signature);
+        vtg5AW.setReissue(generateReissuer());
+
+        return vtg5AW;
+    }
+
     public static CvsHgvPassBilingual getCvsHgvPassBilingual() {
         CvsHgvPassBilingual hgvPassBilingual = new CvsHgvPassBilingual();
         hgvPassBilingual.setDocumentName(CertificateTypes.CVS_HGV_PASS_BILINGUAL.getCertificateType());
@@ -319,7 +417,6 @@ public static CvsHgvPassBilingual getCvsHgvPassBilingual() {
                 .setMinorDefects(generateRFRs(MINOR_RFR_TEXT, 1))
                 .setAdvisoryDefects(generateRFRs(ADVISORY_RFR_TEXT, 1))
 
-
                 .setCountryOfRegistrationCode("GB")
                 .setRawVin(VIN)
                 .setDateOfTheTest("22.08.2023")
@@ -347,6 +444,81 @@ public static CvsHgvPassBilingual getCvsHgvPassBilingual() {
         return hgvPassBilingual;
     }
 
+    public static CvsPsvPassBilingual getCvsPsvPassBilingual() {
+        CvsPsvPassBilingual psvPassBilingual = new CvsPsvPassBilingual();
+        psvPassBilingual.setDocumentName(CertificateTypes.CVS_PASS_BILINGUAL.getCertificateType());
+
+        CvsMotCertificateDataWelsh bilingualData = new CvsMotCertificateDataWelsh();
+        bilingualData
+                .setMinorDefectsWelsh(generateRFRs(MINOR_RFR_TEXT, 1))
+                .setAdvisoryDefectsWelsh(generateRFRs(ADVISORY_RFR_TEXT, 1))
+                .setMinorDefectsHeader(DefectSummaryComponent.MINOR_DEFECTS_HEADER_TEST_WELSH_CVS)
+                .setAdvisoryDefectsHeader(DefectSummaryComponent.ADVISORIES_HEADER_TEXT_WELSH_CVS)
+                .setMinorDefects(generateRFRs(MINOR_RFR_TEXT, 1))
+                .setAdvisoryDefects(generateRFRs(ADVISORY_RFR_TEXT, 1))
+
+                .setSeatBeltNumber("10")
+                .setSeatBeltPreviousCheckDate("12.11.2018")
+                .setSeatBeltTested("Yes")
+
+                .setCountryOfRegistrationCode("GB")
+                .setRawVin(VIN)
+                .setDateOfTheTest("12.11.2018")
+                .setExpiryDate("12.10.2018")
+                .setTestStationPNumber("P12345")
+                .setTestStationName("TEST STATION NAME")
+                .setMake("Aston Martin")
+                .setModel("DB11")
+                .setVehicleEuClassification("M1")
+                .setRawVrm("KA1SAPH")
+                .setCurrentOdometer(
+                        new CvsOdometerReading("22341", "mi", "01.02.2019")
+                )
+                .setOdometerHistoryList(Arrays.asList(
+                        new CvsOdometerReading("120", "km", "01.02.2016"),
+                        new CvsOdometerReading("330", "km", "30.01.2017")
+                ))
+                .setIssuersName("R.DREWNO")
+                .setTestStationName("POPULAR GARAGES")
+                .setTestNumber("1806 8140 0628")
+                .setEarliestDateOfTheNextTest("13.10.2018");
+
+        psvPassBilingual.setData(bilingualData);
+        return psvPassBilingual;
+    }
+
+    public static CvsTrlPassBilingual getCvsTrlPassBilingual() {
+        CvsTrlPassBilingual trlPassBilingual = new CvsTrlPassBilingual();
+        trlPassBilingual.setDocumentName(CertificateTypes.CVS_TRL_PASS_BILINGUAL.getCertificateType());
+
+        CvsMotCertificateDataWelsh bilingualData = new CvsMotCertificateDataWelsh();
+        bilingualData
+                .setMinorDefectsWelsh(generateRFRs(MINOR_RFR_TEXT, 1))
+                .setAdvisoryDefectsWelsh(generateRFRs(ADVISORY_RFR_TEXT, 1))
+                .setMinorDefectsHeader(DefectSummaryComponent.MINOR_DEFECTS_HEADER_TEST_WELSH_CVS)
+                .setAdvisoryDefectsHeader(DefectSummaryComponent.ADVISORIES_HEADER_TEXT_WELSH_CVS)
+                .setMinorDefects(generateRFRs(MINOR_RFR_TEXT, 1))
+                .setAdvisoryDefects(generateRFRs(ADVISORY_RFR_TEXT, 1))
+
+                .setCountryOfRegistrationCode("GB")
+                .setRawVin(VIN)
+                .setDateOfTheTest("12.11.2018")
+                .setExpiryDate("12.10.2018")
+                .setTestStationPNumber("P12345")
+                .setTestStationName("TEST STATION NAME")
+                .setMake("Aston Martin")
+                .setModel("DB11")
+                .setIssuersName("R.DREWNO")
+                .setTestStationName("POPULAR GARAGES")
+                .setTestNumber("1806 8140 0628")
+                .setEarliestDateOfTheNextTest("13.10.2018")
+                .setTrn("ABC1234")
+                .setIsTrailer(true);
+
+        trlPassBilingual.setData(bilingualData);
+        return trlPassBilingual;
+    }
+
     public static VTG5 getVtg5HavingInvalidXMLCharacter() {
         VTG5 document = getVtg5();
 
diff --git a/src/test/java/htmlverification/tests/CvsPsvPassBilingualTest.java b/src/test/java/htmlverification/tests/CvsPsvPassBilingualTest.java
new file mode 100644
index 00000000..743a4a95
--- /dev/null
+++ b/src/test/java/htmlverification/tests/CvsPsvPassBilingualTest.java
@@ -0,0 +1,166 @@
+package htmlverification.tests;
+
+import com.github.jknack.handlebars.Handlebars;
+import htmlverification.framework.page_object.CertificatePageObject;
+import htmlverification.service.CvsCertificateTestDataProvider;
+import org.junit.Before;
+import org.junit.Test;
+import uk.gov.dvsa.model.cvs.CvsPsvPassBilingual;
+import uk.gov.dvsa.service.HtmlGenerator;
+
+import static org.junit.Assert.assertEquals;
+import static uk.gov.dvsa.model.cvs.certificateData.CvsMotCertificateData.PASS_WITH_DEFECTS_HEADER;
+import static uk.gov.dvsa.model.cvs.certificateData.CvsMotCertificateDataWelsh.PASS_WITH_DEFECTS_HEADER_WELSH;
+import static uk.gov.dvsa.model.mot.results.Summary.EU_NUMBER_SUMMARY_HEADER;
+
+import java.io.IOException;
+import java.util.List;
+
+public class CvsPsvPassBilingualTest {
+
+    protected HtmlGenerator htmlGenerator;
+    protected CvsPsvPassBilingual testCertificate;
+    protected CertificatePageObject certificatePageObjectVTP20;
+    protected CertificatePageObject certificatePageObjectVTP20W;
+
+    public CvsPsvPassBilingualTest() {
+        this.htmlGenerator = new HtmlGenerator(new Handlebars());
+    }
+
+    @Before
+    public void setup() throws IOException {
+        testCertificate = CvsCertificateTestDataProvider.getCvsPsvPassBilingual();
+
+        String certHtmlVTP20 = htmlGenerator.generate(testCertificate).get(0);
+        String certHtmlVTP20W = htmlGenerator.generate(testCertificate).get(1);
+
+        certificatePageObjectVTP20 = new CertificatePageObject(certHtmlVTP20);
+        certificatePageObjectVTP20W = new CertificatePageObject(certHtmlVTP20W);
+    }
+
+    @Test
+    public void verifyResultSummaries() {
+        String resultName = certificatePageObjectVTP20.getDefectSummaryComponent().getResultNameItem().text();
+        String resultNameWelsh = certificatePageObjectVTP20W.getDefectSummaryComponent().getResultNameItem().text();
+
+        assertEquals(
+                String.format("%s%s%s %s", "(", EU_NUMBER_SUMMARY_HEADER, ")", PASS_WITH_DEFECTS_HEADER),
+                resultName
+        );
+        assertEquals(
+                String.format("%s%s%s %s", "(", EU_NUMBER_SUMMARY_HEADER, ")", PASS_WITH_DEFECTS_HEADER_WELSH),
+                resultNameWelsh
+        );
+    }
+
+    @Test
+    public void verifyCountryOfRegistration() {
+        String country = certificatePageObjectVTP20.getCountryOfRegistration();
+        String country2 = certificatePageObjectVTP20W.getCountryOfRegistration();
+
+        assertEquals(testCertificate.getData().getCountryOfRegistrationCode(), country);
+        assertEquals(testCertificate.getData().getCountryOfRegistrationCode(), country2);
+    }
+
+    @Test
+    public void verifyMakeAndModel() {
+        String makeAndModel = certificatePageObjectVTP20.getMakeAndModel();
+        String makeAndModel2 = certificatePageObjectVTP20W.getMakeAndModel();
+
+        assertEquals(
+                String.format("%s%s %s", testCertificate.getData().getMake(), ",", testCertificate.getData().getModel()),
+                makeAndModel
+        );
+        assertEquals(
+                String.format("%s%s %s", testCertificate.getData().getMake(), ",",  testCertificate.getData().getModel()),
+                makeAndModel2
+        );
+    }
+
+    @Test
+    public void verifyVehicleCategory() {
+        String vehicleCategory = certificatePageObjectVTP20.getVehicleCategory();
+        String vehicleCategory2 = certificatePageObjectVTP20W.getVehicleCategory();
+
+        assertEquals(testCertificate.getData().getVehicleEuClassification(), vehicleCategory);
+        assertEquals(testCertificate.getData().getVehicleEuClassification(), vehicleCategory2);
+    }
+
+    @Test
+    public void verifyMileage() {
+        String mileage = certificatePageObjectVTP20.getMileage();
+        String mileage2 = certificatePageObjectVTP20W.getMileage();
+
+        assertEquals(testCertificate.getData().getFormattedCurrentOdometer(), mileage);
+//        assertEquals(testCertificate.getData().getFormattedCurrentOdometer(), mileage2);
+    }
+
+    @Test
+    public void verifyAdvisoryDefects() {
+        List<String> advisoryDefects = certificatePageObjectVTP20.getDefectSummaryComponent().getAdvisories().eachText();
+        assertEquals(1, advisoryDefects.size());
+    }
+
+    @Test
+    public void verifyMinorDefects() {
+        List<String> minorDefects = certificatePageObjectVTP20.getDefectSummaryComponent().getMinorDefects().eachText();
+        assertEquals(1, minorDefects.size());
+    }
+
+    @Test
+    public void verifyAdvisoryDefectsWelsh() {
+        List<String> advisoryDefects = certificatePageObjectVTP20W.getDefectSummaryComponent().getAdvisoriesWelshCVS().eachText();
+        assertEquals(1, advisoryDefects.size());
+    }
+
+    @Test
+    public void verifyMinorDefectsWelsh() {
+        List<String> minorDefects = certificatePageObjectVTP20W.getDefectSummaryComponent().getMinorDefectsWelshCVS().eachText();
+        assertEquals(1, minorDefects.size());
+    }
+
+    @Test
+    public void verifyDateOfTheTest() {
+        String dateOfTheTest = certificatePageObjectVTP20.getDateOfTheTest();
+        String dateOfTheTest2 = certificatePageObjectVTP20W.getDateOfTheTest();
+
+        assertEquals("12.11.2018", dateOfTheTest);
+        assertEquals("12.11.2018", dateOfTheTest2);
+    }
+
+    @Test
+    public void verifyLocationOfTheTest() {
+        String location = certificatePageObjectVTP20.getLocationOfTheTest();
+        String location2 = certificatePageObjectVTP20W.getLocationOfTheTest();
+
+        assertEquals("P12345, POPULAR GARAGES", location);
+        assertEquals("P12345, POPULAR GARAGES", location2);
+    }
+
+    @Test
+    public void verifyTestingOrganisationAndInspectorsName() {
+        String text = certificatePageObjectVTP20.getTestingOrganisationAndInspectorsName();
+        String text2 = certificatePageObjectVTP20W.getTestingOrganisationAndInspectorsName();
+
+        assertEquals("DRIVER AND VEHICLE STANDARDS AGENCY R.DREWNO", text);
+        assertEquals("ASIANTAETH SAFONAU GYRWYR A CHERBYDAU R.DREWNO", text2);
+    }
+
+    @Test
+    public void verifyMotTestNumber() {
+        String testNumber = certificatePageObjectVTP20.getTestNumber();
+        String testNumber2 = certificatePageObjectVTP20W.getTestNumber();
+
+        assertEquals("1806 8140 0628", testNumber);
+        assertEquals("1806 8140 0628", testNumber2);
+    }
+
+    @Test
+    public void verifyExpiryDateOnPassIsPresent() {
+        String expiryDate = certificatePageObjectVTP20.getExpiryDate();
+        String expiryDate2 = certificatePageObjectVTP20W.getExpiryDate();
+
+        assertEquals("12.10.2018", expiryDate);
+        assertEquals("12.10.2018", expiryDate2);
+    }
+}
diff --git a/src/test/java/htmlverification/tests/CvsTrlPassBilingualTest.java b/src/test/java/htmlverification/tests/CvsTrlPassBilingualTest.java
new file mode 100644
index 00000000..56a4f2ea
--- /dev/null
+++ b/src/test/java/htmlverification/tests/CvsTrlPassBilingualTest.java
@@ -0,0 +1,155 @@
+package htmlverification.tests;
+
+import com.github.jknack.handlebars.Handlebars;
+import htmlverification.framework.page_object.CertificatePageObject;
+import htmlverification.service.CvsCertificateTestDataProvider;
+import org.junit.Before;
+import org.junit.Test;
+import uk.gov.dvsa.model.cvs.CvsTrlPassBilingual;
+import uk.gov.dvsa.service.HtmlGenerator;
+
+import static org.junit.Assert.assertEquals;
+import static uk.gov.dvsa.model.cvs.certificateData.CvsMotCertificateData.PASS_WITH_DEFECTS_HEADER;
+import static uk.gov.dvsa.model.cvs.certificateData.CvsMotCertificateDataWelsh.PASS_WITH_DEFECTS_HEADER_WELSH;
+import static uk.gov.dvsa.model.mot.results.Summary.EU_NUMBER_SUMMARY_HEADER;
+
+import java.io.IOException;
+import java.util.List;
+
+public class CvsTrlPassBilingualTest {
+
+    protected HtmlGenerator htmlGenerator;
+    protected CvsTrlPassBilingual testCertificate;
+    protected CertificatePageObject certificatePageObjectVTG5A;
+    protected CertificatePageObject certificatePageObjectVTG5AW;
+
+    public CvsTrlPassBilingualTest() {
+        this.htmlGenerator = new HtmlGenerator(new Handlebars());
+    }
+
+    @Before
+    public void setup() throws IOException {
+        testCertificate = CvsCertificateTestDataProvider.getCvsTrlPassBilingual();
+
+        String certHtmlVTG5A = htmlGenerator.generate(testCertificate).get(0);
+        String certHtmlVTG5AW = htmlGenerator.generate(testCertificate).get(1);
+
+        certificatePageObjectVTG5A = new CertificatePageObject(certHtmlVTG5A);
+        certificatePageObjectVTG5AW = new CertificatePageObject(certHtmlVTG5AW);
+    }
+
+    @Test
+    public void verifyResultSummaries() {
+        String resultName = certificatePageObjectVTG5A.getDefectSummaryComponent().getResultNameItem().text();
+        String resultNameWelsh = certificatePageObjectVTG5AW.getDefectSummaryComponent().getResultNameItem().text();
+
+        assertEquals(
+                String.format("%s%s%s %s", "(", EU_NUMBER_SUMMARY_HEADER, ")", PASS_WITH_DEFECTS_HEADER),
+                resultName);
+        assertEquals(
+                String.format("%s%s%s %s", "(", EU_NUMBER_SUMMARY_HEADER, ")", PASS_WITH_DEFECTS_HEADER_WELSH),
+                resultNameWelsh);
+    }
+
+    @Test
+    public void verifyCountryOfRegistration() {
+        String country = certificatePageObjectVTG5A.getCountryOfRegistration();
+        String country2 = certificatePageObjectVTG5AW.getCountryOfRegistration();
+
+        assertEquals(testCertificate.getData().getCountryOfRegistrationCode(), country);
+        assertEquals(testCertificate.getData().getCountryOfRegistrationCode(), country2);
+    }
+
+    @Test
+    public void verifyMakeAndModel() {
+        String makeAndModel = certificatePageObjectVTG5A.getMakeAndModel();
+        String makeAndModel2 = certificatePageObjectVTG5AW.getMakeAndModel();
+
+        assertEquals(
+                String.format("%s%s %s", testCertificate.getData().getMake(), ",", testCertificate.getData().getModel()),
+                makeAndModel
+        );
+        assertEquals(
+                String.format("%s%s %s", testCertificate.getData().getMake(), ",", testCertificate.getData().getModel()),
+                makeAndModel2
+        );
+    }
+
+//    @Test
+//    public void verifyVehicleCategory() {
+//        String vehicleCategory = certificatePageObjectVTG5A.getVehicleCategory();
+//        String vehicleCategory2 = certificatePageObjectVTG5AW.getVehicleCategory();
+//
+//        assertEquals(testCertificate.getData().getVehicleEuClassification(), vehicleCategory);
+//        assertEquals(testCertificate.getData().getVehicleEuClassification(), vehicleCategory2);
+//    }
+
+    @Test
+    public void verifyAdvisoryDefects() {
+        List<String> advisoryDefects = certificatePageObjectVTG5A.getDefectSummaryComponent().getAdvisories().eachText();
+        assertEquals(1, advisoryDefects.size());
+    }
+
+    @Test
+    public void verifyMinorDefects() {
+        List<String> minorDefects = certificatePageObjectVTG5A.getDefectSummaryComponent().getMinorDefects().eachText();
+        assertEquals(1, minorDefects.size());
+    }
+
+    @Test
+    public void verifyAdvisoryDefectsWelsh() {
+        List<String> advisoryDefects = certificatePageObjectVTG5AW.getDefectSummaryComponent().getAdvisoriesWelshCVS().eachText();
+        assertEquals(1, advisoryDefects.size());
+    }
+
+    @Test
+    public void verifyMinorDefectsWelsh() {
+        List<String> minorDefects = certificatePageObjectVTG5AW.getDefectSummaryComponent().getMinorDefectsWelshCVS().eachText();
+        assertEquals(1, minorDefects.size());
+    }
+
+    @Test
+    public void verifyDateOfTheTest() {
+        String dateOfTheTest = certificatePageObjectVTG5A.getDateOfTheTest();
+        String dateOfTheTest2 = certificatePageObjectVTG5AW.getDateOfTheTest();
+
+        assertEquals("12.11.2018", dateOfTheTest);
+        assertEquals("12.11.2018", dateOfTheTest2);
+    }
+
+    @Test
+    public void verifyLocationOfTheTest() {
+        String location = certificatePageObjectVTG5A.getLocationOfTheTest();
+        String location2 = certificatePageObjectVTG5AW.getLocationOfTheTest();
+
+        assertEquals("P12345, POPULAR GARAGES", location);
+        assertEquals("P12345, POPULAR GARAGES", location2);
+    }
+
+    @Test
+    public void verifyTestingOrganisationAndInspectorsName() {
+        String text = certificatePageObjectVTG5A.getTestingOrganisationAndInspectorsName();
+        String text2 = certificatePageObjectVTG5AW.getTestingOrganisationAndInspectorsName();
+
+        assertEquals("DRIVER AND VEHICLE STANDARDS AGENCY R.DREWNO", text);
+        assertEquals("ASIANTAETH SAFONAU GYRWYR A CHERBYDAU R.DREWNO", text2);
+    }
+
+    @Test
+    public void verifyMotTestNumber() {
+        String testNumber = certificatePageObjectVTG5A.getTestNumber();
+        String testNumber2 = certificatePageObjectVTG5AW.getTestNumber();
+
+        assertEquals("1806 8140 0628", testNumber);
+        assertEquals("1806 8140 0628", testNumber2);
+    }
+
+    @Test
+    public void verifyExpiryDateOnPassIsPresent() {
+        String expiryDate = certificatePageObjectVTG5A.getExpiryDate();
+        String expiryDate2 = certificatePageObjectVTG5AW.getExpiryDate();
+
+        assertEquals("12.10.2018", expiryDate);
+        assertEquals("12.10.2018", expiryDate2);
+    }
+}
diff --git a/src/test/java/htmlverification/tests/VTG5AWTest.java b/src/test/java/htmlverification/tests/VTG5AWTest.java
new file mode 100644
index 00000000..95172f5b
--- /dev/null
+++ b/src/test/java/htmlverification/tests/VTG5AWTest.java
@@ -0,0 +1,113 @@
+package htmlverification.tests;
+
+import com.github.jknack.handlebars.Handlebars;
+import htmlverification.framework.page_object.CertificatePageObject;
+import htmlverification.service.CvsCertificateTestDataProvider;
+import org.junit.Before;
+import org.junit.Test;
+import uk.gov.dvsa.model.cvs.VTG5AW;
+import uk.gov.dvsa.model.cvs.certificateData.CvsMotCertificateDataWelsh;
+import uk.gov.dvsa.service.HtmlGenerator;
+
+import java.io.IOException;
+import java.util.List;
+
+import static org.junit.Assert.assertEquals;
+import static uk.gov.dvsa.model.cvs.certificateData.CvsMotCertificateDataWelsh.TESTING_ORGANISATION_WELSH;
+import static uk.gov.dvsa.model.mot.results.Summary.EU_NUMBER_SUMMARY_HEADER;
+
+public class VTG5AWTest {
+
+    protected HtmlGenerator htmlGenerator;
+    protected VTG5AW vtg5AW;
+    protected CertificatePageObject certificatePageObject;
+
+    public VTG5AWTest() {
+        this.htmlGenerator = new HtmlGenerator(new Handlebars());
+    }
+
+    @Before
+    public void setup() throws IOException {
+        vtg5AW = CvsCertificateTestDataProvider.getVTG5AW();
+        String certHtml = htmlGenerator.generate(vtg5AW).get(0);
+        certificatePageObject = new CertificatePageObject(certHtml);
+    }
+
+    @Test
+    public void verifyResultsSummary() {
+        String resultName = certificatePageObject.getDefectSummaryComponent().getResultNameItem().text();
+        assertEquals(
+                String.format("%s%s%s %s", "(", EU_NUMBER_SUMMARY_HEADER, ")", CvsMotCertificateDataWelsh.PASS_WITH_DEFECTS_HEADER_WELSH),
+                resultName
+        );
+    }
+
+    @Test
+    public void verifyVin() {
+        String vin = certificatePageObject.getVin();
+        assertEquals(vtg5AW.getData().getRawVin(), vin);
+    }
+
+    @Test
+    public void verifyCountryOfRegistration() {
+        String countryOfRegistration = certificatePageObject.getCountryOfRegistration();
+        assertEquals(vtg5AW.getData().getCountryOfRegistrationCode(), countryOfRegistration);
+    }
+
+    @Test
+    public void verifyAdvisoryDefects() {
+        List<String> advisoryDefects = certificatePageObject.getDefectSummaryComponent().getAdvisoriesWelshCVS().eachText();
+        assertEquals(1, advisoryDefects.size());
+    }
+
+    @Test
+    public void verifyMinorDefects() {
+        List<String> minorDefects = certificatePageObject.getDefectSummaryComponent().getMinorDefectsWelshCVS().eachText();
+        assertEquals(1, minorDefects.size());
+    }
+
+    @Test
+    public void verifyDateOfTheTest() {
+        String dateOfTheTest = certificatePageObject.getDateOfTheTest();
+        assertEquals(vtg5AW.getData().getDateOfTheTest(), dateOfTheTest);
+    }
+
+    @Test
+    public void verifyExpiryDate() {
+        String expiryDate = certificatePageObject.getExpiryDate();
+        assertEquals(vtg5AW.getData().getExpiryDate(), expiryDate);
+    }
+
+    @Test
+    public void verifyLocationOfTheTest() {
+        String locationOfTheTest = certificatePageObject.getLocationOfTheTest();
+        assertEquals(vtg5AW.getData().getLocationOfTheTest(), locationOfTheTest);
+    }
+
+    @Test
+    public void verifyTestingOrganisationAndInspectorsName() {
+        String orgAndName = certificatePageObject.getTestingOrganisationAndInspectorsName();
+        assertEquals(
+                String.format("%s %s",
+                        TESTING_ORGANISATION_WELSH,
+                        vtg5AW.getData().getIssuersName()),
+                orgAndName
+        );
+    }
+    @Test
+    public void verifyTestNumber() {
+        String testNumber = certificatePageObject.getTestNumber();
+        assertEquals(vtg5AW.getData().getTestNumber(), testNumber);
+    }
+    @Test
+    public void verifyEarliestDateOfTheNextTest() {
+        String earliestDateOfNextTest = certificatePageObject.getEarliestDateOfTheNextTest();
+        assertEquals(vtg5AW.getData().getEarliestDateOfTheNextTest(), earliestDateOfNextTest);
+    }
+
+    @Test
+    public void verifyTrailerNumber() {
+        String trlNo = certificatePageObject.getTrn();
+        assertEquals(vtg5AW.getData().getTrn(), trlNo);
+    }
+}
diff --git a/src/test/java/htmlverification/tests/Vtg5Test.java b/src/test/java/htmlverification/tests/VTG5Test.java
similarity index 98%
rename from src/test/java/htmlverification/tests/Vtg5Test.java
rename to src/test/java/htmlverification/tests/VTG5Test.java
index f270443b..f759518d 100644
--- a/src/test/java/htmlverification/tests/Vtg5Test.java
+++ b/src/test/java/htmlverification/tests/VTG5Test.java
@@ -15,13 +15,13 @@
 import static org.junit.Assert.assertEquals;
 import static uk.gov.dvsa.model.mot.results.Summary.EU_NUMBER_SUMMARY_HEADER;
 
-public class Vtg5Test {
+public class VTG5Test {
 
     protected HtmlGenerator htmlGenerator;
     protected VTG5 vtg5;
     protected CertificatePageObject certificatePageObject;
 
-    public Vtg5Test() {
+    public VTG5Test() {
         this.htmlGenerator = new HtmlGenerator(new Handlebars());
     }
 
diff --git a/src/test/java/htmlverification/tests/Vtg5WTest.java b/src/test/java/htmlverification/tests/VTG5WTest.java
similarity index 92%
rename from src/test/java/htmlverification/tests/Vtg5WTest.java
rename to src/test/java/htmlverification/tests/VTG5WTest.java
index 6c2efff6..abc4dbb0 100644
--- a/src/test/java/htmlverification/tests/Vtg5WTest.java
+++ b/src/test/java/htmlverification/tests/VTG5WTest.java
@@ -17,13 +17,13 @@
 import static uk.gov.dvsa.model.mot.results.Summary.EU_NUMBER_SUMMARY_HEADER;
 import static uk.gov.dvsa.view.cvs.CvsOdometerReadingFormatter.MILES_WELSH;
 
-public class Vtg5WTest {
+public class VTG5WTest {
 
     protected HtmlGenerator htmlGenerator;
     protected VTG5W vtg5W;
     protected CertificatePageObject certificatePageObject;
 
-    public Vtg5WTest() {
+    public VTG5WTest() {
         this.htmlGenerator = new HtmlGenerator(new Handlebars());
     }
 
@@ -73,6 +73,13 @@ public void verifyMileage() {
         assertEquals("20,000 " + MILES_WELSH, value);
     }
 
+    @Test
+    public void verifyOdomoterHistory() {
+        String actual = certificatePageObject.getElement("#mileage-history").text();
+        String expected = "12,000 milltiroedd 13.08.2022 7,000 milltiroedd 02.08.2021";
+        assertEquals(expected, actual);
+    }
+
     @Test
     public void verifyOdometerHistoryCount() {
         List<Object> list = List.of(certificatePageObject.getMileageHistoryComponent().getEntries().toArray());
@@ -86,7 +93,7 @@ public void verifyAdvisories() {
     }
 
     @Test
-    public void verifyMinorDefect() {
+    public void verifyMinorDefects() {
         List<String> minorDefects = certificatePageObject.getDefectSummaryComponent().getMinorDefectsWelshCVS().eachText();
         assertEquals(1, minorDefects.size());
     }
diff --git a/src/test/java/htmlverification/tests/VTP20WTest.java b/src/test/java/htmlverification/tests/VTP20WTest.java
new file mode 100644
index 00000000..4f62191f
--- /dev/null
+++ b/src/test/java/htmlverification/tests/VTP20WTest.java
@@ -0,0 +1,158 @@
+package htmlverification.tests;
+
+import com.github.jknack.handlebars.Handlebars;
+import htmlverification.framework.page_object.CertificatePageObject;
+import htmlverification.service.CvsCertificateTestDataProvider;
+import org.junit.Before;
+import org.junit.Test;
+import uk.gov.dvsa.model.cvs.VTP20W;
+import uk.gov.dvsa.model.cvs.certificateData.CvsMotCertificateDataWelsh;
+import uk.gov.dvsa.service.HtmlGenerator;
+
+import static org.junit.Assert.assertEquals;
+import static uk.gov.dvsa.model.mot.results.Summary.EU_NUMBER_SUMMARY_HEADER;
+
+import java.io.IOException;
+import java.util.List;
+
+public class VTP20WTest {
+
+    protected HtmlGenerator htmlGenerator;
+    protected VTP20W vtp20W;
+    protected CertificatePageObject certificatePageObject;
+
+    public VTP20WTest() {
+        this.htmlGenerator = new HtmlGenerator(new Handlebars());
+    }
+
+    @Before
+    public void setup() throws IOException {
+        vtp20W = CvsCertificateTestDataProvider.getVtp20W();
+        String certHtml = htmlGenerator.generate(vtp20W).get(0);
+        certificatePageObject = new CertificatePageObject(certHtml);
+    }
+
+    @Test
+    public void verifyResultSummary() {
+        String resultName = certificatePageObject.getDefectSummaryComponent().getResultNameItem().text();
+        assertEquals(
+                String.format("(%s) %s", EU_NUMBER_SUMMARY_HEADER, CvsMotCertificateDataWelsh.PASS_WITH_DEFECTS_HEADER_WELSH),
+                resultName
+        );
+    }
+
+    @Test
+    public void verifyVin() {
+        String vin = certificatePageObject.getVin();
+        assertEquals(vtp20W.getData().getRawVin(), vin);
+    }
+
+    @Test
+    public void verifyCountryOfRegistration() {
+        String country = certificatePageObject.getCountryOfRegistration();
+        assertEquals(vtp20W.getData().getCountryOfRegistrationCode(), country);
+    }
+
+    @Test
+    public void verifyMakeAndModel() {
+        String makeAndModel = certificatePageObject.getMakeAndModel();
+        assertEquals(
+                String.format("%s, %s", vtp20W.getData().getMake(), vtp20W.getData().getModel()),
+                makeAndModel
+        );
+    }
+
+    @Test
+    public void verifyVehicleCategory() {
+        String vehicleCategory = certificatePageObject.getVehicleCategory();
+        assertEquals(vtp20W.getData().getVehicleEuClassification(), vehicleCategory);
+    }
+
+    @Test
+    public void verifyAdvisories() {
+        List<String> advisoryDefects = certificatePageObject.getDefectSummaryComponent().getAdvisoriesWelshCVS().eachText();
+        assertEquals(1, advisoryDefects.size());
+    }
+
+    @Test
+    public void verifyMinorDefects() {
+        List<String> minorDefects = certificatePageObject.getDefectSummaryComponent().getMinorDefectsWelshCVS().eachText();
+        assertEquals(1, minorDefects.size());
+    }
+
+    @Test
+    public void verifyDateOfTheTest() {
+        String dateOfTheTest = certificatePageObject.getDateOfTheTest();
+        assertEquals("12.11.2018", dateOfTheTest);
+    }
+
+    @Test
+    public void verifyExpiryDate() {
+        String expiryDate = certificatePageObject.getExpiryDate();
+        assertEquals("12.10.2018", expiryDate);
+    }
+
+    @Test
+    public void verifyLocationOfTheTest() {
+        String location = certificatePageObject.getLocationOfTheTest();
+        assertEquals("P12345, POPULAR GARAGES", location);
+    }
+
+    @Test
+    public void verifyTestingOrganisationAndInspectorsName() {
+        String text = certificatePageObject.getTestingOrganisationAndInspectorsName();
+        assertEquals("ASIANTAETH SAFONAU GYRWYR A CHERBYDAU R.DREWNO", text);
+    }
+
+    @Test
+    public void verifyMotTestNumber() {
+        String testNumber = certificatePageObject.getTestNumber();
+        assertEquals("1806 8140 0628", testNumber);
+    }
+
+    @Test
+    public void verifySignature() {
+        String signatureElement = certificatePageObject.getSignatureImageSrc();
+        String expected = vtp20W.getSignature().getFormattedImageData();
+
+        assertEquals(expected, signatureElement);
+    }
+
+    @Test
+    public void verifyTitle() {
+        String titleText = certificatePageObject.getElement(".header__title").text();
+        String expected = "Tystysgrif prawf MOT (" + vtp20W.getTestType() + ")";
+        assertEquals(expected, titleText);
+    }
+
+    @Test
+    public void verifyCurrentOdomoter() {
+        String actual = certificatePageObject.getElement("#mileage").text();
+        String expected = "22,341 milltiroedd";
+        assertEquals(expected, actual);
+    }
+
+    @Test
+    public void verifyOdomoterHistory() {
+        String actual = certificatePageObject.getElement("#mileage-history").text();
+        String expected = "120 milltiroedd 01.02.2016 330 milltiroedd 30.01.2017";
+        assertEquals(expected, actual);
+    }
+
+    @Test
+    public void verifyOdometerHistoryCount() {
+        List<Object> list = List.of(certificatePageObject.getMileageHistoryComponent().getEntries().toArray());
+        assertEquals(2, list.size());
+    }
+
+    @Test
+    public void verifyOdometerHistoryMessageWhenNoHistoryExists() {
+        vtp20W = CvsCertificateTestDataProvider.getVtp20wWithNoOdometerHistory();
+        String certHtml = htmlGenerator.generate(vtp20W).get(0);
+        certificatePageObject = new CertificatePageObject(certHtml);
+
+        String actual = certificatePageObject.getElement("#no_data_message").text();
+        String expected = "No data available";
+        assertEquals(expected, actual);
+    }
+}