diff --git a/config/forms/test_form.json b/config/forms/test_form.json
index 8bed823cf..2ee9340ea 100644
--- a/config/forms/test_form.json
+++ b/config/forms/test_form.json
@@ -1,7 +1,5 @@
 {
   "form_type": "lettings",
-  "start_year": 2021,
-  "end_year": 2022,
   "sections": {
     "household": {
       "label": "About the household",
@@ -10,25 +8,19 @@
           "label": "Household characteristics",
           "pages": {
             "tenant_code": {
-              "header": "",
-              "description": "",
               "questions": {
                 "tenant_code": {
                   "check_answer_label": "Tenant code",
                   "header": "What is the tenant code?",
-                  "hint_text": "",
                   "type": "text"
                 }
               }
             },
             "tenant_age": {
-              "header": "",
-              "description": "",
               "questions": {
                 "tenant_age": {
                   "check_answer_label": "Tenant's age",
                   "header": "What is the tenant's age?",
-                  "hint_text": "",
                   "type": "numeric",
                   "min": 0,
                   "max": 150,
@@ -37,13 +29,10 @@
               }
             },
             "tenant_gender": {
-              "header": "",
-              "description": "",
               "questions": {
                 "tenant_gender": {
                   "check_answer_label": "Tenant's gender",
                   "header": "Which of these best describes the tenant's gender identity?",
-                  "hint_text": "",
                   "type": "radio",
                   "answer_options": {
                     "0": "Female",
@@ -55,152 +44,73 @@
               }
             },
             "tenant_ethnic_group": {
-              "header": "",
-              "description": "",
               "questions": {
                 "tenant_ethnic_group": {
                   "check_answer_label": "Ethnicity",
                   "header": "What is the tenant's ethnic group?",
-                  "hint_text": "",
                   "type": "radio",
                   "answer_options": {
-                    "0": "White: English/Scottish/Welsh/Northern Irish/British",
-                    "1": "White: Irish",
-                    "2": "White: Gypsy/Irish Traveller",
-                    "3": "White: Other",
-                    "4": "Mixed: White & Black Caribbean",
-                    "5": "Mixed: White & Black African",
-                    "6": "Mixed: White & Asian",
-                    "7": "Mixed: Other",
-                    "8": "Asian or Asian British: Indian",
-                    "9": "Asian or Asian British: Pakistani",
-                    "10": "Asian or Asian British: Bangladeshi",
-                    "11": "Asian or Asian British: Chinese",
-                    "12": "Asian or Asian British: Other",
-                    "13": "Black: Caribbean",
-                    "14": "Black: African",
-                    "15": "Black: Other",
-                    "16": "Other Ethnic Group: Arab",
-                    "17": "Other Ethnic Group: Other",
-                    "18": "Prefer not to say"
+                    "0": "Other",
+                    "1": "Prefer not to say"
                   }
                 }
               }
             },
             "tenant_nationality": {
-              "header": "",
-              "description": "",
               "questions": {
                 "tenant_nationality": {
                   "check_answer_label": "Nationality",
                   "header": "What is the tenant's nationality?",
-                  "hint_text": "",
                   "type": "radio",
                   "answer_options": {
-                    "0": "UK national resident in UK",
-                    "1": "A current or former reserve in the UK Armed Forces (exc. National Service)",
-                    "2": "UK national returning from residence overseas",
-                    "3": "Czech Republic",
-                    "4": "Estonia",
-                    "5": "Hungary",
-                    "6": "Latvia",
-                    "7": "Lithuania",
-                    "8": "Poland",
-                    "9": "Slovakia",
-                    "10": "Bulgaria",
-                    "11": "Romania",
-                    "12": "Ireland",
-                    "13": "Other EU Economic Area (EEA country)",
-                    "14": "Any other country",
-                    "15": "Prefer not to say"
+                    "0": "UK",
+                    "1": "Prefer not to say"
                   }
                 }
               }
             },
             "tenant_economic_status": {
-              "header": "",
-              "description": "",
               "questions": {
                 "tenant_economic_status": {
                   "check_answer_label": "Work",
                   "header": "Which of these best describes the tenant's working situation?",
-                  "hint_text": "",
                   "type": "radio",
                   "answer_options": {
-                    "0": "Part-time - Less than 30 hours",
-                    "1": "Full-time - 30 hours or more",
-                    "2": "In government training into work, such as New Deal",
-                    "3": "Jobseeker",
-                    "4": "Retired",
-                    "5": "Not seeking work",
-                    "6": "Full-time student",
-                    "7": "Unable to work because of long term sick or disability",
-                    "8": "Child under 16",
-                    "9": "Other",
-                    "10": "Prefer not to say"
+                    "0": "Other",
+                    "1": "Prefer not to say"
                   }
                 }
               }
             },
             "household_number_of_other_members": {
-              "header": "",
-              "description": "",
               "questions": {
                 "household_number_of_other_members": {
                   "check_answer_label": "Number of Other Household Members",
                   "header": "How many other people are there in the household?",
-                  "hint_text": "The maximum number of others is 7",
+                  "hint_text": "The maximum number of others is 1",
                   "type": "numeric",
                   "min": 0,
-                  "max": 7,
+                  "max": 1,
                   "step": 1,
                   "conditional_for": {
                     "person_2_relationship": ">0",
                     "person_2_age": ">0",
                     "person_2_gender": ">0",
-                    "person_2_economic_status": ">0",
-                    "person_3_relationship": ">1",
-                    "person_3_age": ">1",
-                    "person_3_gender": ">1",
-                    "person_3_economic_status": ">1",
-                    "person_4_relationship": ">2",
-                    "person_4_age": ">2",
-                    "person_4_gender": ">2",
-                    "person_4_economic_status": ">2",
-                    "person_5_relationship": ">3",
-                    "person_5_age": ">3",
-                    "person_5_gender": ">3",
-                    "person_5_economic_status": ">3",
-                    "person_6_relationship": ">4",
-                    "person_6_age": ">4",
-                    "person_6_gender": ">4",
-                    "person_6_economic_status": ">4",
-                    "person_7_relationship": ">5",
-                    "person_7_age": ">5",
-                    "person_7_gender": ">5",
-                    "person_7_economic_status": ">5",
-                    "person_8_relationship": ">6",
-                    "person_8_age": ">6",
-                    "person_8_gender": ">6",
-                    "person_8_economic_status": ">6"
+                    "person_2_economic_status": ">0"
                   }
                 },
                 "person_2_relationship": {
                   "check_answer_label": "Person 2's relationship to lead tenant",
                   "header": "What's person 2's relationship to lead tenant",
-                  "hint_text": "",
                   "type": "radio",
                   "answer_options": {
-                    "0": "Partner",
-                    "1": "Child - includes young adult and grown-up",
-                    "2": "Other",
-                    "3": "Prefer not to say"
+                    "0": "Other",
+                    "1": "Prefer not to say"
                   }
                 },
                 "person_2_age": {
                   "check_answer_label": "Person 2's age",
                   "header": "What's person 2's age",
-                  "hint_text": "",
                   "type": "numeric",
                   "min": 0,
                   "max": 150,
@@ -209,7 +119,6 @@
                 "person_2_gender": {
                   "check_answer_label": "Person 2's gender",
                   "header": "Which of these best describes person 2's gender identity?",
-                  "hint_text": "",
                   "type": "radio",
                   "answer_options": {
                     "0": "Female",
@@ -221,457 +130,10 @@
                 "person_2_economic_status": {
                   "check_answer_label": "Person 2's Work",
                   "header": "Which of these best describes person 2's working situation?",
-                  "hint_text": "",
-                  "type": "radio",
-                  "answer_options": {
-                    "0": "Part-time - Less than 30 hours",
-                    "1": "Full-time - 30 hours or more",
-                    "2": "In government training into work, such as New Deal",
-                    "3": "Jobseeker",
-                    "4": "Retired",
-                    "5": "Not seeking work",
-                    "6": "Full-time student",
-                    "7": "Unable to work because of long term sick or disability",
-                    "8": "Child under 16",
-                    "9": "Other",
-                    "10": "Prefer not to say"
-                  }
-                },
-                "person_3_relationship": {
-                  "check_answer_label": "Person 3's relationship to lead tenant",
-                  "header": "What's person 3's relationship to lead tenant",
-                  "hint_text": "",
-                  "type": "radio",
-                  "answer_options": {
-                    "0": "Partner",
-                    "1": "Child - includes young adult and grown-up",
-                    "2": "Other",
-                    "3": "Prefer not to say"
-                  }
-                },
-                "person_3_age": {
-                  "check_answer_label": "Person 3's age",
-                  "header": "What's person 3's age",
-                  "hint_text": "",
-                  "type": "numeric",
-                  "min": 0,
-                  "max": 150,
-                  "step": 1
-                },
-                "person_3_gender": {
-                  "check_answer_label": "Person 3's gender",
-                  "header": "Which of these best describes person 3's gender identity?",
-                  "hint_text": "",
-                  "type": "radio",
-                  "answer_options": {
-                    "0": "Female",
-                    "1": "Male",
-                    "2": "Non-binary",
-                    "3": "Prefer not to say"
-                  }
-                },
-                "person_3_economic_status": {
-                  "check_answer_label": "Person 3's Work",
-                  "header": "Which of these best describes person 3's working situation?",
-                  "hint_text": "",
-                  "type": "radio",
-                  "answer_options": {
-                    "0": "Part-time - Less than 30 hours",
-                    "1": "Full-time - 30 hours or more",
-                    "2": "In government training into work, such as New Deal",
-                    "3": "Jobseeker",
-                    "4": "Retired",
-                    "5": "Not seeking work",
-                    "6": "Full-time student",
-                    "7": "Unable to work because of long term sick or disability",
-                    "8": "Child under 16",
-                    "9": "Other",
-                    "10": "Prefer not to say"
-                  }
-                },
-                "person_4_relationship": {
-                  "check_answer_label": "Person 4's relationship to lead tenant",
-                  "header": "What's person 4's relationship to lead tenant",
-                  "hint_text": "",
-                  "type": "radio",
-                  "answer_options": {
-                    "0": "Partner",
-                    "1": "Child - includes young adult and grown-up",
-                    "2": "Other",
-                    "3": "Prefer not to say"
-                  }
-                },
-                "person_4_age": {
-                  "check_answer_label": "Person 4's age",
-                  "header": "What's person 4's age",
-                  "hint_text": "",
-                  "type": "numeric",
-                  "min": 0,
-                  "max": 150,
-                  "step": 1
-                },
-                "person_4_gender": {
-                  "check_answer_label": "Person 4's gender",
-                  "header": "Which of these best describes person 4's gender identity?",
-                  "hint_text": "",
-                  "type": "radio",
-                  "answer_options": {
-                    "0": "Female",
-                    "1": "Male",
-                    "2": "Non-binary",
-                    "3": "Prefer not to say"
-                  }
-                },
-                "person_4_economic_status": {
-                  "check_answer_label": "Person 4's Work",
-                  "header": "Which of these best describes person 4's working situation?",
-                  "hint_text": "",
-                  "type": "radio",
-                  "answer_options": {
-                    "0": "Part-time - Less than 30 hours",
-                    "1": "Full-time - 30 hours or more",
-                    "2": "In government training into work, such as New Deal",
-                    "3": "Jobseeker",
-                    "4": "Retired",
-                    "5": "Not seeking work",
-                    "6": "Full-time student",
-                    "7": "Unable to work because of long term sick or disability",
-                    "8": "Child under 16",
-                    "9": "Other",
-                    "10": "Prefer not to say"
-                  }
-                },
-                "person_5_relationship": {
-                  "check_answer_label": "Person 5's relationship to lead tenant",
-                  "header": "What's person 5's relationship to lead tenant",
-                  "hint_text": "",
-                  "type": "radio",
-                  "answer_options": {
-                    "0": "Partner",
-                    "1": "Child - includes young adult and grown-up",
-                    "2": "Other",
-                    "3": "Prefer not to say"
-                  }
-                },
-                "person_5_age": {
-                  "check_answer_label": "Person 5's age",
-                  "header": "What's person 5's age",
-                  "hint_text": "",
-                  "type": "numeric",
-                  "min": 0,
-                  "max": 150,
-                  "step": 1
-                },
-                "person_5_gender": {
-                  "check_answer_label": "Person 5's gender",
-                  "header": "Which of these best describes person 5's gender identity?",
-                  "hint_text": "",
-                  "type": "radio",
-                  "answer_options": {
-                    "0": "Female",
-                    "1": "Male",
-                    "2": "Non-binary",
-                    "3": "Prefer not to say"
-                  }
-                },
-                "person_5_economic_status": {
-                  "check_answer_label": "Person 5's Work",
-                  "header": "Which of these best describes person 5's working situation?",
-                  "hint_text": "",
-                  "type": "radio",
-                  "answer_options": {
-                    "0": "Part-time - Less than 30 hours",
-                    "1": "Full-time - 30 hours or more",
-                    "2": "In government training into work, such as New Deal",
-                    "3": "Jobseeker",
-                    "4": "Retired",
-                    "5": "Not seeking work",
-                    "6": "Full-time student",
-                    "7": "Unable to work because of long term sick or disability",
-                    "8": "Child under 16",
-                    "9": "Other",
-                    "10": "Prefer not to say"
-                  }
-                },
-                "person_6_relationship": {
-                  "check_answer_label": "Person 6's relationship to lead tenant",
-                  "header": "What's person 6's relationship to lead tenant",
-                  "hint_text": "",
-                  "type": "radio",
-                  "answer_options": {
-                    "0": "Partner",
-                    "1": "Child - includes young adult and grown-up",
-                    "2": "Other",
-                    "3": "Prefer not to say"
-                  }
-                },
-                "person_6_age": {
-                  "check_answer_label": "Person 6's age",
-                  "header": "What's person 6's age",
-                  "hint_text": "",
-                  "type": "numeric",
-                  "min": 0,
-                  "max": 150,
-                  "step": 1
-                },
-                "person_6_gender": {
-                  "check_answer_label": "Person 6's gender",
-                  "header": "Which of these best describes person 6's gender identity?",
-                  "hint_text": "",
-                  "type": "radio",
-                  "answer_options": {
-                    "0": "Female",
-                    "1": "Male",
-                    "2": "Non-binary",
-                    "3": "Prefer not to say"
-                  }
-                },
-                "person_6_economic_status": {
-                  "check_answer_label": "Person 6's Work",
-                  "header": "Which of these best describes person 6's working situation?",
-                  "hint_text": "",
-                  "type": "radio",
-                  "answer_options": {
-                    "0": "Part-time - Less than 30 hours",
-                    "1": "Full-time - 30 hours or more",
-                    "2": "In government training into work, such as New Deal",
-                    "3": "Jobseeker",
-                    "4": "Retired",
-                    "5": "Not seeking work",
-                    "6": "Full-time student",
-                    "7": "Unable to work because of long term sick or disability",
-                    "8": "Child under 16",
-                    "9": "Other",
-                    "10": "Prefer not to say"
-                  }
-                },
-                "person_7_relationship": {
-                  "check_answer_label": "Person 7's relationship to lead tenant",
-                  "header": "What's person 7's relationship to lead tenant",
-                  "hint_text": "",
-                  "type": "radio",
-                  "answer_options": {
-                    "0": "Partner",
-                    "1": "Child - includes young adult and grown-up",
-                    "2": "Other",
-                    "3": "Prefer not to say"
-                  }
-                },
-                "person_7_age": {
-                  "check_answer_label": "Person 7's age",
-                  "header": "What's person 7's age",
-                  "hint_text": "",
-                  "type": "numeric",
-                  "min": 0,
-                  "max": 150,
-                  "step": 1
-                },
-                "person_7_gender": {
-                  "check_answer_label": "Person 7's gender",
-                  "header": "Which of these best describes person 7's gender identity?",
-                  "hint_text": "",
-                  "type": "radio",
-                  "answer_options": {
-                    "0": "Female",
-                    "1": "Male",
-                    "2": "Non-binary",
-                    "3": "Prefer not to say"
-                  }
-                },
-                "person_7_economic_status": {
-                  "check_answer_label": "Person 7's Work",
-                  "header": "Which of these best describes person 7's working situation?",
-                  "hint_text": "",
-                  "type": "radio",
-                  "answer_options": {
-                    "0": "Part-time - Less than 30 hours",
-                    "1": "Full-time - 30 hours or more",
-                    "2": "In government training into work, such as New Deal",
-                    "3": "Jobseeker",
-                    "4": "Retired",
-                    "5": "Not seeking work",
-                    "6": "Full-time student",
-                    "7": "Unable to work because of long term sick or disability",
-                    "8": "Child under 16",
-                    "9": "Other",
-                    "10": "Prefer not to say"
-                  }
-                },
-                "person_8_relationship": {
-                  "check_answer_label": "Person 8's relationship to lead tenant",
-                  "header": "What's person 8's relationship to lead tenant",
-                  "hint_text": "",
-                  "type": "radio",
-                  "answer_options": {
-                    "0": "Partner",
-                    "1": "Child - includes young adult and grown-up",
-                    "2": "Other",
-                    "3": "Prefer not to say"
-                  }
-                },
-                "person_8_age": {
-                  "check_answer_label": "Person 8's age",
-                  "header": "What's person 8's age",
-                  "hint_text": "",
-                  "type": "numeric",
-                  "min": 0,
-                  "max": 150,
-                  "step": 1
-                },
-                "person_8_gender": {
-                  "check_answer_label": "Person 8's gender",
-                  "header": "Which of these best describes person 8's gender identity?",
-                  "hint_text": "",
-                  "type": "radio",
-                  "answer_options": {
-                    "0": "Female",
-                    "1": "Male",
-                    "2": "Non-binary",
-                    "3": "Prefer not to say"
-                  }
-                },
-                "person_8_economic_status": {
-                  "check_answer_label": "Person 8's Work",
-                  "header": "Which of these best describes person 8's working situation?",
-                  "hint_text": "",
-                  "type": "radio",
-                  "answer_options": {
-                    "0": "Part-time - Less than 30 hours",
-                    "1": "Full-time - 30 hours or more",
-                    "2": "In government training into work, such as New Deal",
-                    "3": "Jobseeker",
-                    "4": "Retired",
-                    "5": "Not seeking work",
-                    "6": "Full-time student",
-                    "7": "Unable to work because of long term sick or disability",
-                    "8": "Child under 16",
-                    "9": "Other",
-                    "10": "Prefer not to say"
-                  }
-                }
-              }
-            }
-          }
-        },
-        "household_situation": {
-          "label": "Household situation",
-          "pages": {
-            "previous_housing_situation": {
-              "header": "",
-              "description": "",
-              "questions": {
-                "previous_housing_situation": {
-                  "header": "What was the tenant’s housing situation immediately before this letting?",
-                  "hint_text": "",
-                  "type": "radio",
-                  "answer_options": {
-                    "0": "Owner occupation (private) ",
-                    "1": "Owner occupation (low cost home ownership)",
-                    "2": "Private sector tenancy",
-                    "3": "Tied housing or rented with job",
-                    "4": "Supported housing",
-                    "5": "Sheltered accomodation",
-                    "6": "Residential care home",
-                    "7": "Living with friends or family",
-                    "8": "Refuge",
-                    "9": "Hospital",
-                    "10": "Prison / approved probation hostel",
-                    "11": "Direct access hostel",
-                    "12": "Bed & Breakfast",
-                    "13": "Mobile home / caravan",
-                    "14": "Any other temporary accommodation",
-                    "15": "Home Office Asylum Support",
-                    "16": "Children’s home / foster care",
-                    "17": "Rough sleeping",
-                    "18": "Other",
-                    "19": "Fixed term Local Authority General Needs tenancy",
-                    "20": "Lifetime Local Authority General Needs tenancy",
-                    "21": "Fixed term PRP General Needs tenancy",
-                    "22": "Lifetime PRP General Needs tenancy"
-                  }
-                }
-              }
-            },
-            "homelessness": {
-              "header": "",
-              "description": "",
-              "questions": {
-                "homelessness": {
-                  "header": "Did the tenant experience homelessness immediately before this letting?",
-                  "hint_text": "",
                   "type": "radio",
                   "answer_options": {
-                    "0": "Yes - assessed as homeless by a local authority and owed a homelessness duty. Including if threatened with homelessness within 56 days",
-                    "1": "Yes - other homelessness ",
-                    "2": "No"
-                  }
-                }
-              }
-            },
-            "reason_for_leaving_last_settled_home": {
-              "header": "Leaving their last settled home",
-              "description": "",
-              "questions": {
-                "last_settled_home": {
-                  "header": "What is the tenant’s main reason for leaving?",
-                  "hint_text": "",
-                  "type": "radio",
-                  "answer_options": {
-                    "0": "Permanently decanted from another property owned by this landlord",
-                    "1": "Left home country as a refugee",
-                    "2": "Loss of tied accommodation",
-                    "3": "Domestic abuse",
-                    "4": "(Non violent) relationship breakdown with partner",
-                    "5": "Asked to leave by family or friends",
-                    "6": "Racial harassment",
-                    "7": "Other problems with neighbours",
-                    "8": "Property unsuitable because of overcrowding",
-                    "9": "End of assured shorthold tenancy - no fault",
-                    "10": "End of assured shorthold tenancy - tenant's fault",
-                    "11": "End of fixed term tenancy - no fault",
-                    "12": "End of fixed term tenancy - tenant's fault",
-                    "13": "Repossession",
-                    "14": "Under occupation - offered incentive to downsize",
-                    "15": "Under occupation - no incentive",
-                    "16": "Property unsuitable because of ill health / disability",
-                    "17": "Property unsuitable because of poor condition",
-                    "18": "Couldn't afford fees attached to renewing the tenancy",
-                    "19": "Couldn't afford increase in rent",
-                    "20": "Couldn't afford rent or mortgage - welfare reforms",
-                    "21": "Couldn't afford rent or mortgage - employment",
-                    "22": "Couldn't afford rent or mortgage - other",
-                    "23": "To move nearer to family / friends / school",
-                    "24": "To move nearer to work",
-                    "25": "To move to accomodation with support",
-                    "26": "To move to independent accomodation",
-                    "27": "Hate crime",
-                    "28": "Death of household member in last settled accomodation",
-                    "29": "Discharged from prison",
-                    "30": "Discharged from long stay hospital or similar institution",
-                    "31": "Other",
-                    "32": "Do not know",
-                    "33": "Prefer not to say"
-                  },
-                  "conditional_for": {
-                    "other_reason_for_leaving_last_settled_home": ["Other"]
-                  }
-                },
-                "other_reason_for_leaving_last_settled_home": {
-                  "header": "Please state the reason for leaving last settled home",
-                  "hint_text": "",
-                  "type": "text"
-                },
-                "benefit_cap_spare_room_subsidy": {
-                  "header": "Was the reason for leaving because of the benefit cap or removal of the spare room subsidy?",
-                  "hint_text": "",
-                  "type": "radio",
-                  "answer_options": {
-                    "0": "Yes - benefit cap",
-                    "1": "Yes - removal of the spare room subsidy",
-                    "2": "Yes - both the benefit cap and the removal of the spare room subsidy",
-                    "3": "No",
-                    "4": "Do not know",
-                    "5": "Prefer not to say"
+                    "0": "Other",
+                    "1": "Prefer not to say"
                   }
                 }
               }
@@ -739,12 +201,9 @@
               }
             },
             "medical_conditions": {
-              "header": "",
-              "description": "",
               "questions": {
                 "medical_conditions": {
                   "header": "Does anyone in the household have any of the following that they expect to last for 12 months or more:<ul><li>Physical Condition</li><li>Mental Health Condition</li><li>Other Illness</li></ul>",
-                  "hint_text": "",
                   "type": "radio",
                   "check_answer_label": "Physical, mental health or illness in the household",
                   "answer_options": {
@@ -757,12 +216,9 @@
               }
             },
             "pregnancy": {
-              "header": "",
-              "description": "",
               "questions": {
                 "pregnancy": {
                   "header": "Is anyone in the household pregnant?",
-                  "hint_text": "",
                   "type": "radio",
                   "check_answer_label": "Pregnancy in the household",
                   "answer_options": {
@@ -774,8 +230,6 @@
               }
             },
             "accessibility_requirements": {
-              "header": "",
-              "description": "",
               "questions": {
                 "accessibility_requirements": {
                   "header": "Are any of these affected by their condition or illness?",
@@ -786,12 +240,8 @@
                     "accessibility_requirements_fully_wheelchair_accessible_housing": "Fully wheelchair accessible housing",
                     "accessibility_requirements_wheelchair_access_to_essential_rooms": "Wheelchair access to essential rooms",
                     "accessibility_requirements_level_access_housing": "Level access housing",
-                    "accessibility_requirements_other_disability_requirements": "Other disability requirements",
-                    "accessibility_requirements_no_disability_requirements": "No disability requirements",
                     "divider_a": true,
-                    "accessibility_requirements_do_not_know": "Do not know",
-                    "divider_b": true,
-                    "accessibility_requirements_prefer_not_to_say": "Prefer not to say"
+                    "accessibility_requirements_do_not_know": "Do not know"
                   }
                 }
               }
@@ -807,17 +257,7 @@
                   "check_answer_label": "Conditions or illnesses",
                   "answer_options": {
                     "condition_effects_vision": "Vision - such as blindness or partial sight",
-                    "condition_effects_hearing": "Hearing - such as deafness or partial hearing",
-                    "condition_effects_mobility": "Mobility - such as walking short distances or climbing stairs",
-                    "condition_effects_dexterity": "Dexterity - such as lifting and carrying objects or using a keyboard",
-                    "condition_effects_stamina": "Stamina or breathing or fatigue",
-                    "condition_effects_learning": "Learning or understanding or concentrating",
-                    "condition_effects_memory": "Memory",
-                    "condition_effects_mental_health": "Mental health - such as depression, anxiety, schizophrenia or bipolar",
-                    "condition_effects_social_or_behavioral": "Socially or behaviourally - such as those associated with autism spectral disorder (ASD) including Aspergers’ or attention deficit hyperactivity disorder (ADHD))",
-                    "condition_effects_other": "Other",
-                    "divider": true,
-                    "condition_effects_prefer_not_to_say": "Prefer not to say"
+                    "condition_effects_hearing": "Hearing - such as deafness or partial hearing"
                   }
                 }
               }
diff --git a/spec/features/case_log_spec.rb b/spec/features/case_log_spec.rb
index 012607651..8281852f7 100644
--- a/spec/features/case_log_spec.rb
+++ b/spec/features/case_log_spec.rb
@@ -10,8 +10,8 @@ RSpec.describe "Test Features" do
     tenant_age: { type: "numeric", answer: 25 },
     tenant_gender: { type: "radio", answer: "Female" },
     tenant_ethnic_group: { type: "radio", answer: "Prefer not to say" },
-    tenant_nationality: { type: "radio", answer: "Lithuania" },
-    tenant_economic_status: { type: "radio", answer: "Jobseeker" },
+    tenant_nationality: { type: "radio", answer: "UK" },
+    tenant_economic_status: { type: "radio", answer: "Other" },
     household_number_of_other_members: { type: "numeric", answer: 2 },
   }
 
@@ -52,7 +52,7 @@ RSpec.describe "Test Features" do
       it "displays a section status" do
         visit("/case_logs/#{empty_case_log.id}")
 
-        assert_selector ".govuk-tag", text: /Not started/, count: 8
+        assert_selector ".govuk-tag", text: /Not started/, count: 7
         assert_selector ".govuk-tag", text: /Completed/, count: 0
         assert_selector ".govuk-tag", text: /Cannot start yet/, count: 1
       end
@@ -61,7 +61,7 @@ RSpec.describe "Test Features" do
         answer_all_questions_in_income_subsection
         visit("/case_logs/#{empty_case_log.id}")
 
-        assert_selector ".govuk-tag", text: /Not started/, count: 7
+        assert_selector ".govuk-tag", text: /Not started/, count: 6
         assert_selector ".govuk-tag", text: /Completed/, count: 1
         assert_selector ".govuk-tag", text: /Cannot start yet/, count: 1
       end
@@ -73,13 +73,13 @@ RSpec.describe "Test Features" do
 
       it "shows the number of completed sections if no sections are completed" do
         visit("/case_logs/#{empty_case_log.id}")
-        expect(page).to have_content("You've completed 0 of 9 sections.")
+        expect(page).to have_content("You've completed 0 of 8 sections.")
       end
 
       it "shows the number of completed sections if one section is completed" do
         answer_all_questions_in_income_subsection
         visit("/case_logs/#{empty_case_log.id}")
-        expect(page).to have_content("You've completed 1 of 9 sections.")
+        expect(page).to have_content("You've completed 1 of 8 sections.")
       end
     end
 
diff --git a/spec/helpers/check_answers_helper_spec.rb b/spec/helpers/check_answers_helper_spec.rb
index 8660e81aa..06d6e92bb 100644
--- a/spec/helpers/check_answers_helper_spec.rb
+++ b/spec/helpers/check_answers_helper_spec.rb
@@ -6,7 +6,7 @@ RSpec.describe CheckAnswersHelper do
     FactoryBot.create(
       :case_log,
       :in_progress,
-      household_number_of_other_members: 2,
+      household_number_of_other_members: 1,
       person_2_relationship: "Partner",
     )
   end
@@ -71,7 +71,7 @@ RSpec.describe CheckAnswersHelper do
                subsection_with_numeric_conditionals,
                case_log_with_met_numeric_condition,
                form,
-             )).to eq(15)
+             )).to eq(11)
     end
 
     it "ignores questions with unmet radio conditions" do
diff --git a/spec/helpers/tasklist_helper_spec.rb b/spec/helpers/tasklist_helper_spec.rb
index 13c15e87f..d3c223989 100644
--- a/spec/helpers/tasklist_helper_spec.rb
+++ b/spec/helpers/tasklist_helper_spec.rb
@@ -53,7 +53,7 @@ RSpec.describe TasklistHelper do
 
   describe "get sections count" do
     it "returns the total of sections if no status is given" do
-      expect(get_sections_count(form, empty_case_log)).to eq(9)
+      expect(get_sections_count(form, empty_case_log)).to eq(8)
     end
 
     it "returns 0 sections for completed sections if no sections are completed" do
@@ -61,7 +61,7 @@ RSpec.describe TasklistHelper do
     end
 
     it "returns the number of not started sections" do
-      expect(get_sections_count(form, empty_case_log, :not_started)).to eq(8)
+      expect(get_sections_count(form, empty_case_log, :not_started)).to eq(7)
     end
 
     it "returns the number of sections in progress" do