tests fixed

NHSDigital · Nov 1, 2024 · 0aa69fa · 0aa69fa
1 parent 38943cf
commit 0aa69fa
Show file tree

Hide file tree

Showing 14 changed files with 77 additions and 66 deletions.
diff --git a/libs/testdata_ops.py b/libs/testdata_ops.py
@@ -13,10 +13,13 @@ class testdata_operations:
     def create_file_from_template(self, template_path: str) -> str:
         _template_text = self.fo.get_file_text(file_path=template_path)
         _file_text = []
+        _ctr = 0
         for _ln in _template_text.split(escape_characters.NEW_LINE):
-            _ln = _ln.replace("<<NHS_NO>>", self.get_new_nhs_no())
-            _ln = _ln.replace("<<FNAME>>", f"F{get_new_datetime()}")
-            _ln = _ln.replace("<<LNAME>>", f"L{get_new_datetime()}")
+            _ctr += 1
+            _ln = _ln.replace("<<NHS_NO>>", self.get_new_nhs_no(valid=True))
+            _ln = _ln.replace("<<INVALID_NHS_NO>>", self.get_new_nhs_no(valid=False))
+            _ln = _ln.replace("<<FNAME>>", f"F{get_new_datetime()}{_ctr}")
+            _ln = _ln.replace("<<LNAME>>", f"L{get_new_datetime()}{_ctr}")
             _file_text.append(_ln)
         return self.fo.create_file(content=escape_characters.NEW_LINE.join(_file_text))
 

diff --git a/pages/pg_parental_consent.py b/pages/pg_parental_consent.py
@@ -1,5 +1,5 @@
 from libs import playwright_ops
-from libs.constants import object_properties, actions, data_values
+from libs.constants import actions, data_values, object_properties
 
 
 class pg_parental_consent:
@@ -10,7 +10,8 @@ class pg_parental_consent:
     TXT_CHILD_LAST_NAME = "Last name"
     RDO_KNOWN_BY_ANOTHER_NAME_YES = "Yes"
     RDO_KNOWN_BY_ANOTHER_NAME_NO = "No"
-    TXT_KNOWN_AS = "Known as"
+    TXT_KNOWN_AS_FIRST = "Preferred first name (optional)"
+    TXT_KNOWN_AS_LAST = "Preferred last name (optional)"
     BTN_CONTINUE = "Continue"
     TXT_DOB_DAY = "Day"
     TXT_DOB_MONTH = "Month"
@@ -53,15 +54,20 @@ def click_start_now(self):
         self.po.perform_action(locator=self.BTN_START_NOW, action=actions.CLICK_BUTTON)
 
     def fill_child_name_details(
-        self, child_first_name: str, child_last_name: str, known_as: str = data_values.EMPTY
+        self,
+        child_first_name: str,
+        child_last_name: str,
+        known_as_first: str = data_values.EMPTY,
+        known_as_last: str = data_values.EMPTY,
     ) -> None:
         self.po.perform_action(locator=self.TXT_CHILD_FIRST_NAME, action=actions.FILL, value=child_first_name)
         self.po.perform_action(locator=self.TXT_CHILD_LAST_NAME, action=actions.FILL, value=child_last_name)
-        if known_as == data_values.EMPTY:
+        if known_as_first == data_values.EMPTY and known_as_last == data_values.EMPTY:
             self.po.perform_action(locator=self.RDO_KNOWN_BY_ANOTHER_NAME_NO, action=actions.RADIO_BUTTON_SELECT)
         else:
             self.po.perform_action(locator=self.RDO_KNOWN_BY_ANOTHER_NAME_YES, action=actions.RADIO_BUTTON_SELECT)
-            self.po.perform_action(locator=self.TXT_KNOWN_AS, action=actions.FILL, value=known_as)
+            self.po.perform_action(locator=self.TXT_KNOWN_AS_FIRST, action=actions.FILL, value=known_as_first)
+            self.po.perform_action(locator=self.TXT_KNOWN_AS_LAST, action=actions.FILL, value=known_as_last)
         self.po.perform_action(locator=self.BTN_CONTINUE, action=actions.CLICK_BUTTON)
 
     def fill_child_dob(self, dob_day: str, dob_month: str, dob_year: str) -> None:

diff --git a/test_data/ParentalConsent.xlsx b/test_data/ParentalConsent.xlsx
diff --git a/test_data/child/i_negative.csv b/test_data/child/i_negative.csv
@@ -1,10 +1,10 @@
 CHILD_FIRST_NAME,CHILD_LAST_NAME,CHILD_SCHOOL_URN,CHILD_DATE_OF_BIRTH,CHILD_NHS_NUMBER,CHILD_GENDER,CHILD_ADDRESS_LINE_1,CHILD_ADDRESS_LINE_2,CHILD_TOWN,CHILD_POSTCODE,CHILD_REGISTRATION,PARENT_1_NAME,PARENT_1_RELATIONSHIP,PARENT_1_EMAIL,PARENT_1_PHONE,PARENT_2_NAME,PARENT_2_RELATIONSHIP,PARENT_2_EMAIL,PARENT_2_PHONE
-,ChildLast1,110158,20100101,9729852545,Male,Addr1,Addr2,Town,AA1 1AA,8T5,Parent1,Dad,[email protected],,Parent2,Mum,[email protected]
-ChildFirst2,,110158,20100101,9650974318,Male,Addr1,Addr2,Town,AA1 1AA,8T5,Parent1,Dad,[email protected],,Parent2,Mum,[email protected]
-ChildFirst3,ChildLast3,,20100101,5990960948,Male,Addr1,Addr2,Town,AA1 1AA,8T5,Parent1,Dad,[email protected],,Parent2,Mum,[email protected]
-ChildFirst4,ChildLast4,110158,,9729852545,Male,Addr1,Addr2,Town,AA1 1AA,8T5,Parent1,Dad,[email protected],,Parent2,Mum,[email protected]
-ChildFirst4,ChildLast4,110158,20100101,19729852545,Male,Addr1,Addr2,Town,AA1 1AA,8T5,Parent1,Dad,[email protected],,Parent2,Mum,[email protected]
-ChildFirst4,ChildLast4,110158,20100101,729852545,Male,Addr1,Addr2,Town,AA1 1AA,8T5,Parent1,Dad,[email protected],,Parent2,Mum,[email protected]
-ChildFirst4,ChildLast4,110158,20100101,9729852545,Male,Addr1,Addr2,Town,ABC DEF,8T5,Parent1,Dad,[email protected],,Parent2,Mum,[email protected]
-ChildFirst4,ChildLast4,110158,20100101,9729852545,Male,Addr1,Addr2,Town,AA1 1AA,8T5,Parent1,Dad,example.com,,Parent2,Mum,[email protected]
-ChildFirst4,ChildLast4,110158,20100101,9729852545,Male,Addr1,Addr2,Town,AA1 1AA,8T5,Parent1,Dad,[email protected],,Parent2,Mum,example.com
+,C<<LNAME>>,110158,20100101,<<NHS_NO>>,Male,Addr1,Addr2,Town,AA1 1AA,8T5,Parent1,Dad,[email protected],,Parent2,Mum,[email protected]
+C<<FNAME>>,,110158,20100101,<<NHS_NO>>,Male,Addr1,Addr2,Town,AA1 1AA,8T5,Parent1,Dad,[email protected],,Parent2,Mum,[email protected]
+C<<FNAME>>,C<<LNAME>>,,20100101,<<NHS_NO>>,Male,Addr1,Addr2,Town,AA1 1AA,8T5,Parent1,Dad,[email protected],,Parent2,Mum,[email protected]
+C<<FNAME>>,C<<LNAME>>,110158,,<<NHS_NO>>,Male,Addr1,Addr2,Town,AA1 1AA,8T5,Parent1,Dad,[email protected],,Parent2,Mum,[email protected]
+C<<FNAME>>,C<<LNAME>>,110158,20100101,19729852545,Male,Addr1,Addr2,Town,AA1 1AA,8T5,Parent1,Dad,[email protected],,Parent2,Mum,[email protected]
+C<<FNAME>>,C<<LNAME>>,110158,20100101,729852545,Male,Addr1,Addr2,Town,AA1 1AA,8T5,Parent1,Dad,[email protected],,Parent2,Mum,[email protected]
+C<<FNAME>>,C<<LNAME>>,110158,20100101,<<NHS_NO>>,Male,Addr1,Addr2,Town,ABC DEF,8T5,Parent1,Dad,[email protected],,Parent2,Mum,[email protected]
+C<<FNAME>>,C<<LNAME>>,110158,20100101,<<NHS_NO>>,Male,Addr1,Addr2,Town,AA1 1AA,8T5,Parent1,Dad,example.com,,Parent2,Mum,[email protected]
+C<<FNAME>>,C<<LNAME>>,110158,20100101,<<NHS_NO>>,Male,Addr1,Addr2,Town,AA1 1AA,8T5,Parent1,Dad,[email protected],,Parent2,Mum,example.com
diff --git a/test_data/child/i_positive.csv b/test_data/child/i_positive.csv
@@ -1,4 +1,4 @@
 CHILD_FIRST_NAME,CHILD_LAST_NAME,CHILD_SCHOOL_URN,CHILD_DATE_OF_BIRTH,CHILD_NHS_NUMBER,CHILD_GENDER,CHILD_ADDRESS_LINE_1,CHILD_ADDRESS_LINE_2,CHILD_TOWN,CHILD_POSTCODE,CHILD_REGISTRATION,PARENT_1_NAME,PARENT_1_RELATIONSHIP,PARENT_1_EMAIL,PARENT_1_PHONE,PARENT_2_NAME,PARENT_2_RELATIONSHIP,PARENT_2_EMAIL,PARENT_2_PHONE
-ChildFirst1,ChildLast1,110158,20100101,9729852545,Male,Addr1,Addr2,Town,AA1 1AA,8T5,Parent1,Dad,[email protected],,Parent2,Mum,[email protected]
-ChildFirst2,ChildLast2,888888,20100101,9650974318,Male,Addr1,Addr2,Town,AA1 1AA,8T5,Parent1,Dad,[email protected],,Parent2,Mum,[email protected]
-ChildFirst3,ChildLast3,999999,20100101,5990960948,Male,Addr1,Addr2,Town,AA1 1AA,8T5,Parent1,Dad,[email protected],,Parent2,Mum,[email protected]
+C<<FNAME>>,C<<LNAME>>,110158,20100101,<<NHS_NO>>,Male,Addr1,Addr2,Town,AA1 1AA,8T5,Parent1,Dad,[email protected],,Parent2,Mum,[email protected]
+C<<FNAME>>,C<<LNAME>>,888888,20100101,<<NHS_NO>>,Male,Addr1,Addr2,Town,AA1 1AA,8T5,Parent1,Dad,[email protected],,Parent2,Mum,[email protected]
+C<<FNAME>>,C<<LNAME>>,999999,20100101,<<NHS_NO>>,Male,Addr1,Addr2,Town,AA1 1AA,8T5,Parent1,Dad,[email protected],,Parent2,Mum,[email protected]
diff --git a/test_data/child/o_invalid_structure.csv b/test_data/child/o_invalid_structure.csv
@@ -1 +1 @@
-The file is missing the following headers: ["CHILD_POSTCODE", "CHILD_DATE_OF_BIRTH", "CHILD_FIRST_NAME", "CHILD_LAST_NAME", "CHILD_SCHOOL_URN"]
+The file is missing the following headers: ["CHILD_DATE_OF_BIRTH", "CHILD_FIRST_NAME", "CHILD_LAST_NAME", "CHILD_POSTCODE", "CHILD_SCHOOL_URN"]
diff --git a/test_data/child/o_positive.csv b/test_data/child/o_positive.csv
@@ -1,5 +1,4 @@
 Programme	HPV
 Type	Cohort list
-Eton College
-Unknown school
-Home educated
+Unknown
+Home-schooled
diff --git a/test_data/cohorts/i_negative.csv b/test_data/cohorts/i_negative.csv
@@ -1,12 +1,12 @@
 CHILD_FIRST_NAME,CHILD_LAST_NAME,CHILD_COMMON_NAME,CHILD_DATE_OF_BIRTH,CHILD_SCHOOL_URN,CHILD_NHS_NUMBER,CHILD_ADDRESS_LINE_1,CHILD_ADDRESS_LINE_2,CHILD_TOWN,CHILD_POSTCODE,PARENT_1_NAME,PARENT_1_RELATIONSHIP,PARENT_1_EMAIL,PARENT_1_PHONE,PARENT_2_NAME,PARENT_2_RELATIONSHIP,PARENT_2_EMAIL,PARENT_2_PHONE
-ChildFirst,ChildLast,ChildCommon,1-1-2010,110158,,Addr1,Add2,City,AA1 1AA,Parent1Name,Dad,[email protected],,Parent2Name,Mum,[email protected],
-,ChildLast,ChildCommon,1-1-2010,110158,,Addr1,Add2,City,AA1 1AA,Parent1Name,Dad,[email protected],,Parent2Name,Mum,[email protected],
-ChildFirst,,ChildCommon,1-1-2010,110158,,Addr1,Add2,City,AA1 1AA,Parent1Name,Dad,[email protected],,Parent2Name,Mum,[email protected],
-ChildFirst,ChildLast,,1-1-2010,110158,,Addr1,Add2,City,AA1 1AA,Parent1Name,Dad,[email protected],,Parent2Name,Mum,[email protected],
-ChildFirst,ChildLast,ChildCommon,,110158,,Addr1,Add2,City,AA1 1AA,Parent1Name,Dad,[email protected],,Parent2Name,Mum,[email protected],
-ChildFirst,ChildLast,ChildCommon,1-1-2010,888888,,Addr1,Add2,City,AA1 1AA,Parent1Name,Dad,[email protected],,Parent2Name,Mum,[email protected],
-ChildFirst,ChildLast,ChildCommon,1-1-2010,,,Addr1,Add2,City,AA1 1AA,Parent1Name,Dad,[email protected],,Parent2Name,Mum,[email protected],
-ChildFirst,ChildLast,ChildCommon,1-1-2010,ABCDEF,,Addr1,Add2,City,AA1 1AA,Parent1Name,Dad,[email protected],,Parent2Name,Mum,[email protected],
-ChildFirst,ChildLast,ChildCommon,1-1-2010,110158,,Addr1,Add2,City,,Parent1Name,Dad,[email protected],,Parent2Name,Mum,[email protected],
-ChildFirst,ChildLast,ChildCommon,1-1-2010,110158,,Addr1,Add2,City,AA1 1AA,Parent1Name,Dad,example.com,,Parent2Name,Mum,[email protected],
-ChildFirst,ChildLast,ChildCommon,1-1-2010,110158,,Addr1,Add2,City,AA1 1AA,Parent1Name,Dad,[email protected],,Parent2Name,Mum,example.com,
+C<<FNAME>>,C<<LNAME>>,ChildCommon,1-1-2010,110158,<<NHS_NO>>,Addr1,Add2,City,AA1 1AA,Parent1Name,Dad,[email protected],,Parent2Name,Mum,[email protected],
+,C<<LNAME>>,ChildCommon,1-1-2010,110158,<<NHS_NO>>,Addr1,Add2,City,AA1 1AA,Parent1Name,Dad,[email protected],,Parent2Name,Mum,[email protected],
+C<<FNAME>>,,ChildCommon,1-1-2010,110158,<<NHS_NO>>,Addr1,Add2,City,AA1 1AA,Parent1Name,Dad,[email protected],,Parent2Name,Mum,[email protected],
+C<<FNAME>>,C<<LNAME>>,,1-1-2010,110158,<<NHS_NO>>,Addr1,Add2,City,AA1 1AA,Parent1Name,Dad,[email protected],,Parent2Name,Mum,[email protected],
+C<<FNAME>>,C<<LNAME>>,ChildCommon,,110158,<<NHS_NO>>,Addr1,Add2,City,AA1 1AA,Parent1Name,Dad,[email protected],,Parent2Name,Mum,[email protected],
+C<<FNAME>>,C<<LNAME>>,ChildCommon,1-1-2010,888888,,Addr1,Add2,City,AA1 1AA,Parent1Name,Dad,[email protected],,Parent2Name,Mum,[email protected],
+C<<FNAME>>,C<<LNAME>>,ChildCommon,1-1-2010,,,Addr1,Add2,City,AA1 1AA,Parent1Name,Dad,[email protected],,Parent2Name,Mum,[email protected],
+C<<FNAME>>,C<<LNAME>>,ChildCommon,1-1-2010,ABCDEF,,Addr1,Add2,City,AA1 1AA,Parent1Name,Dad,[email protected],,Parent2Name,Mum,[email protected],
+C<<FNAME>>,C<<LNAME>>,ChildCommon,1-1-2010,110158,<<NHS_NO>>,Addr1,Add2,City,,Parent1Name,Dad,[email protected],,Parent2Name,Mum,[email protected],
+C<<FNAME>>,C<<LNAME>>,ChildCommon,1-1-2010,110158,<<NHS_NO>>,Addr1,Add2,City,AA1 1AA,Parent1Name,Dad,example.com,,Parent2Name,Mum,[email protected],
+C<<FNAME>>,C<<LNAME>>,ChildCommon,1-1-2010,110158,<<NHS_NO>>,Addr1,Add2,City,AA1 1AA,Parent1Name,Dad,[email protected],,Parent2Name,Mum,example.com,
diff --git a/test_data/cohorts/i_positive.csv b/test_data/cohorts/i_positive.csv
@@ -1,2 +1,2 @@
 CHILD_FIRST_NAME,CHILD_LAST_NAME,CHILD_COMMON_NAME,CHILD_DATE_OF_BIRTH,CHILD_SCHOOL_URN,CHILD_NHS_NUMBER,CHILD_ADDRESS_LINE_1,CHILD_ADDRESS_LINE_2,CHILD_TOWN,CHILD_POSTCODE,PARENT_1_NAME,PARENT_1_RELATIONSHIP,PARENT_1_EMAIL,PARENT_1_PHONE,PARENT_2_NAME,PARENT_2_RELATIONSHIP,PARENT_2_EMAIL,PARENT_2_PHONE
-ChildFirst28,ChildLast28,ChildCommon,1-1-2009,134522,,Addr1,Add2,City,AA1 1AA,Parent1Name1,Dad,[email protected],,Parent2Name1,Mum,[email protected],
+C<<FNAME>>,C<<LNAME>>,ChildCommon,1-1-2009,134522,<<NHS_NO>>,Addr1,Add2,City,AA1 1AA,Parent1Name1,Dad,[email protected],,Parent2Name1,Mum,[email protected],
diff --git a/test_data/cohorts/o_invalid_structure.csv b/test_data/cohorts/o_invalid_structure.csv
@@ -1 +1 @@
-The file is missing the following headers: ["CHILD_POSTCODE", "CHILD_DATE_OF_BIRTH", "CHILD_FIRST_NAME", "CHILD_LAST_NAME", "CHILD_SCHOOL_URN"]
+The file is missing the following headers: ["CHILD_DATE_OF_BIRTH", "CHILD_FIRST_NAME", "CHILD_LAST_NAME", "CHILD_POSTCODE", "CHILD_SCHOOL_URN"]
diff --git a/test_data/hpv/i_positive.csv b/test_data/hpv/i_positive.csv
@@ -1,17 +1,17 @@
 TEST_DESC_IGNORED,ORGANISATION_CODE,SCHOOL_URN,SCHOOL_NAME,NHS_NUMBER,PERSON_FORENAME,PERSON_SURNAME,PERSON_DOB,PERSON_GENDER_CODE,PERSON_POSTCODE,DATE_OF_VACCINATION,VACCINE_GIVEN,BATCH_NUMBER,BATCH_EXPIRY_DATE,ANATOMICAL_SITE,DOSE_SEQUENCE,LOCAL_PATIENT_ID,LOCAL_PATIENT_ID_URI,CARE_SETTING,VACCINATED
-P_Gardasil9,R1L,110158,Eton College,9729852545,BERT,BOYES,20100811,Male,DN9 1PB,20240514,Gardasil9,123013325,20220730,Left Thigh,1,LocalPatient3,www.LocalPatient3,1,Y
-P_Gardasil,R1L,110158,Eton College,9650974318,BOB,JERMEY,20100819,Male,DN38 6JP,20240514,Gardasil,123013325,20220730,Left Thigh,2,LocalPatient3,www.LocalPatient3,1,Y
-P_Cervarix,R1L,110158,Eton College,5990960948,MURRAY,MARQUARDT,20100808,Male,N8 7RE,20240514,Cervarix,123013325,20220730,Left Thigh,3,LocalPatient3,www.LocalPatient3,1,Y
-P_Gardasil9,R1L,888888,Test-Auto School,9461217986,SHEENA,HART-DAVIS,20100818,Female,HD9 2DD,20240514,Gardasil9,123013325,20220730,Left Thigh,1,LocalPatient3,www.LocalPatient3,1,Y
-P_Gardasil,R1L,999999,Homeschooled,9448251165,ANDRIANA,MACLULICH,20100813,Female,DN17 1UE,20240514,Gardasil,123013325,20220730,Left Thigh,1,LocalPatient3,www.LocalPatient3,1,Y
-P_Cervarix,R1L,110158,Eton College,9490189804,VISHALA,MOKATE,20100817,Female,LA22 9SJ,20240514,Cervarix,123013325,20220730,Left Thigh,1,LocalPatient3,www.LocalPatient3,1,Y
-P_NFA,R1L,110158,Eton College,9694580307,LERON,KUFAKI,20100811,Male,ZZ99 3VZ,20240514,Gardasil9,123013325,20220730,Left Thigh,1,LocalPatient3,www.LocalPatient3,1,Y
-P_Add_Not_Known,R1L,110158,Eton College,9694580307,LERON,KUFAKI,20100811,Male,ZZ99 3WZ,20240514,Gardasil9,123013325,20220730,Left Thigh,1,LocalPatient3,www.LocalPatient3,1,Y
-P_Site_LB,R1L,110158,Eton College,9694580307,LERON,KUFAKI,20100811,Male,DN34 4SE,20240514,Gardasil9,123013325,20220730,Left Buttock,1,LocalPatient3,www.LocalPatient3,1,Y
-P_Site_RB,R1L,110158,Eton College,9460860354,MATTIE,MERRIGAN,20100831,Male,TS8 9EF,20240514,Gardasil9,123013325,20220730,Right Buttock,1,LocalPatient3,www.LocalPatient3,1,Y
-P_Site_LT,R1L,110158,Eton College,9651751703,SARA,NOYES,20100829,Not Known,HU5 3SG,20240514,Gardasil9,123013325,20220730,Left Thigh,1,LocalPatient3,www.LocalPatient3,1,Y
-P_Site_LUA,R1L,110158,Eton College,5991336512,HARLEY,PHILLIPS,20100821,Female,ZZ99 3AZ,20240514,Gardasil9,123013325,20220730,Left Upper Arm,1,LocalPatient3,www.LocalPatient3,1,Y
-P_Site_RUA,R1L,110158,Eton College,9454468014,GIDEON,CREAN,20100830,Male,NE39 1AD,20240514,Gardasil9,123013325,20220730,Right Upper Arm,1,LocalPatient3,www.LocalPatient3,1,Y
-P_Site_RT,R1L,110158,Eton College,9686147837,JEFF,GREENE,20100808,Male,SK16 4HT,20240514,Gardasil9,123013325,20220730,Right Thigh,1,LocalPatient3,www.LocalPatient3,1,Y
-P_AllowPastExpiryDate,R1L,110158,Eton College,9448205147,DARIEN,MARGETSON,20100827,Female,BH23 8BY,20240514,Gardasil9,123013325,20120730,Left Thigh,1,www.LocalPatient3,www.LocalPatient3,1,Y
-P_NotVaccinated,R1L,110158,Eton College,9448205148,NOT1,VACCINATED1,20100827,Female,BH23 8BY,20240514,Gardasil9,123013325,20120730,Left Thigh,1,www.LocalPatient3,www.LocalPatient3,1,N
+P_Gardasil9,R1L,110158,Eton College,<<NHS_NO>>,<<FNAME>>,<<LNAME>>,20100811,Male,DN9 1PB,20240514,Gardasil9,123013325,20220730,Left Thigh,1,LocalPatient3,www.LocalPatient3,1,Y
+P_Gardasil,R1L,110158,Eton College,<<NHS_NO>>,<<FNAME>>,<<LNAME>>,20100819,Male,DN38 6JP,20240514,Gardasil,123013325,20220730,Left Thigh,2,LocalPatient3,www.LocalPatient3,1,Y
+P_Cervarix,R1L,110158,Eton College,<<NHS_NO>>,<<FNAME>>,<<LNAME>>,20100808,Male,N8 7RE,20240514,Cervarix,123013325,20220730,Left Thigh,3,LocalPatient3,www.LocalPatient3,1,Y
+P_Gardasil9,R1L,888888,Test-Auto School,<<NHS_NO>>,<<FNAME>>,<<LNAME>>,20100818,Female,HD9 2DD,20240514,Gardasil9,123013325,20220730,Left Thigh,1,LocalPatient3,www.LocalPatient3,1,Y
+P_Gardasil,R1L,999999,Homeschooled,<<NHS_NO>>,<<FNAME>>,<<LNAME>>,20100813,Female,DN17 1UE,20240514,Gardasil,123013325,20220730,Left Thigh,1,LocalPatient3,www.LocalPatient3,1,Y
+P_Cervarix,R1L,110158,Eton College,<<NHS_NO>>,<<FNAME>>,<<LNAME>>,20100817,Female,LA22 9SJ,20240514,Cervarix,123013325,20220730,Left Thigh,1,LocalPatient3,www.LocalPatient3,1,Y
+P_NFA,R1L,110158,Eton College,<<NHS_NO>>,<<FNAME>>,<<LNAME>>,20100811,Male,ZZ99 3VZ,20240514,Gardasil9,123013325,20220730,Left Thigh,1,LocalPatient3,www.LocalPatient3,1,Y
+P_Add_Not_Known,R1L,110158,Eton College,<<NHS_NO>>,<<FNAME>>,<<LNAME>>,20100811,Male,ZZ99 3WZ,20240514,Gardasil9,123013325,20220730,Left Thigh,1,LocalPatient3,www.LocalPatient3,1,Y
+P_Site_LB,R1L,110158,Eton College,<<NHS_NO>>,<<FNAME>>,<<LNAME>>,20100811,Male,DN34 4SE,20240514,Gardasil9,123013325,20220730,Left Buttock,1,LocalPatient3,www.LocalPatient3,1,Y
+P_Site_RB,R1L,110158,Eton College,<<NHS_NO>>,<<FNAME>>,<<LNAME>>,20100831,Male,TS8 9EF,20240514,Gardasil9,123013325,20220730,Right Buttock,1,LocalPatient3,www.LocalPatient3,1,Y
+P_Site_LT,R1L,110158,Eton College,<<NHS_NO>>,<<FNAME>>,<<LNAME>>,20100829,Not Known,HU5 3SG,20240514,Gardasil9,123013325,20220730,Left Thigh,1,LocalPatient3,www.LocalPatient3,1,Y
+P_Site_LUA,R1L,110158,Eton College,<<NHS_NO>>,<<FNAME>>,<<LNAME>>,20100821,Female,ZZ99 3AZ,20240514,Gardasil9,123013325,20220730,Left Upper Arm,1,LocalPatient3,www.LocalPatient3,1,Y
+P_Site_RUA,R1L,110158,Eton College,<<NHS_NO>>,<<FNAME>>,<<LNAME>>,20100830,Male,NE39 1AD,20240514,Gardasil9,123013325,20220730,Right Upper Arm,1,LocalPatient3,www.LocalPatient3,1,Y
+P_Site_RT,R1L,110158,Eton College,<<NHS_NO>>,<<FNAME>>,<<LNAME>>,20100808,Male,SK16 4HT,20240514,Gardasil9,123013325,20220730,Right Thigh,1,LocalPatient3,www.LocalPatient3,1,Y
+P_AllowPastExpiryDate,R1L,110158,Eton College,<<NHS_NO>>,<<FNAME>>,<<LNAME>>,20100827,Female,BH23 8BY,20240514,Gardasil9,123013325,20120730,Left Thigh,1,www.LocalPatient3,www.LocalPatient3,1,Y
+P_NotVaccinated,R1L,110158,Eton College,<<NHS_NO>>,<<FNAME>>,<<LNAME>>,20100827,Female,BH23 8BY,20240514,Gardasil9,123013325,20120730,Left Thigh,1,www.LocalPatient3,www.LocalPatient3,1,N
diff --git a/test_data/hpv/o_positive.csv b/test_data/hpv/o_positive.csv
@@ -2,6 +2,4 @@ Completed
 Programme	HPV
 Type	Immunisation list
 Imported by	Nurse Joy
-Omitted records	8 previously imported records were omitted
-Duplicate records	5 duplicate records need review
-13 vaccination records
+15 vaccination records
diff --git a/tests/helpers/parental_consent_helper.py b/tests/helpers/parental_consent_helper.py
@@ -15,7 +15,8 @@ def read_data_for_scenario(self, scenario_data) -> None:
         _, _row = scenario_data
         self.child_first_name = str(_row["ChildFirstName"])
         self.child_last_name = str(_row["ChildLastName"])
-        self.child_aka = str(_row["ChildAKA"])
+        self.child_aka_first = str(_row["ChildAKAFirst"])
+        self.child_aka_last = str(_row["ChildAKALast"])
         self.child_dob_day = str(_row["ChildDobDay"])
         self.child_dob_month = str(_row["ChildDobMonth"])
         self.child_dob_month = str(_row["ChildDobMonth"])
@@ -41,7 +42,10 @@ def read_data_for_scenario(self, scenario_data) -> None:
     def enter_details(self) -> None:
         self.pc.click_start_now()
         self.pc.fill_child_name_details(
-            child_first_name=self.child_first_name, child_last_name=self.child_last_name, known_as=self.child_aka
+            child_first_name=self.child_first_name,
+            child_last_name=self.child_last_name,
+            known_as_first=self.child_aka_first,
+            known_as_last=self.child_aka_last,
         )
         self.pc.fill_child_dob(
             dob_day=self.child_dob_day, dob_month=self.child_dob_month, dob_year=self.child_dob_year