diff --git a/src/account-settings/delete-account/__snapshots__/ConfirmationModal.test.jsx.snap b/src/account-settings/delete-account/__snapshots__/ConfirmationModal.test.jsx.snap
index 8f6f85d39..90a9750db 100644
--- a/src/account-settings/delete-account/__snapshots__/ConfirmationModal.test.jsx.snap
+++ b/src/account-settings/delete-account/__snapshots__/ConfirmationModal.test.jsx.snap
@@ -35,6 +35,7 @@ Array [
     >
       <div
         className="pgn__modal-backdrop"
+        data-testid="modal-backdrop"
         onClick={[MockFunction]}
         onKeyDown={[MockFunction]}
       />
@@ -131,6 +132,7 @@ Array [
               </div>
               <div
                 className="form-group"
+                data-testid="validation-form-group"
               >
                 <label
                   className="d-block"
@@ -234,6 +236,7 @@ Array [
     >
       <div
         className="pgn__modal-backdrop"
+        data-testid="modal-backdrop"
         onClick={[MockFunction]}
         onKeyDown={[MockFunction]}
       />
@@ -297,6 +300,7 @@ Array [
               </div>
               <div
                 className="form-group"
+                data-testid="validation-form-group"
               >
                 <label
                   className="d-block"
diff --git a/src/account-settings/delete-account/__snapshots__/SuccessModal.test.jsx.snap b/src/account-settings/delete-account/__snapshots__/SuccessModal.test.jsx.snap
index 03046dd9d..94ea33fa7 100644
--- a/src/account-settings/delete-account/__snapshots__/SuccessModal.test.jsx.snap
+++ b/src/account-settings/delete-account/__snapshots__/SuccessModal.test.jsx.snap
@@ -39,6 +39,7 @@ Array [
     >
       <div
         className="pgn__modal-backdrop"
+        data-testid="modal-backdrop"
         onClick={[MockFunction]}
         onKeyDown={[MockFunction]}
       />
diff --git a/src/account-settings/demographics/test/__snapshots__/DemographicsSection.test.jsx.snap b/src/account-settings/demographics/test/__snapshots__/DemographicsSection.test.jsx.snap
index c2a2b699c..a343517bf 100644
--- a/src/account-settings/demographics/test/__snapshots__/DemographicsSection.test.jsx.snap
+++ b/src/account-settings/demographics/test/__snapshots__/DemographicsSection.test.jsx.snap
@@ -25,6 +25,7 @@ exports[`DemographicsSection should render 1`] = `
       >
         <span
           className="pgn__icon"
+          data-testid="hyperlink-icon"
           style={
             Object {
               "height": "1em",
@@ -671,6 +672,7 @@ exports[`DemographicsSection should render an Alert if an error occurs 1`] = `
       >
         <span
           className="pgn__icon"
+          data-testid="hyperlink-icon"
           style={
             Object {
               "height": "1em",
@@ -1329,6 +1331,7 @@ exports[`DemographicsSection should render an Alert when demographicsOptions pro
       >
         <span
           className="pgn__icon"
+          data-testid="hyperlink-icon"
           style={
             Object {
               "height": "1em",
@@ -1400,6 +1403,7 @@ exports[`DemographicsSection should render ethnicity correctly when multiple opt
       >
         <span
           className="pgn__icon"
+          data-testid="hyperlink-icon"
           style={
             Object {
               "height": "1em",
@@ -2039,6 +2043,7 @@ exports[`DemographicsSection should render ethnicity text correctly 1`] = `
       >
         <span
           className="pgn__icon"
+          data-testid="hyperlink-icon"
           style={
             Object {
               "height": "1em",
@@ -2678,6 +2683,7 @@ exports[`DemographicsSection should set user input correctly when user provides
       >
         <span
           className="pgn__icon"
+          data-testid="hyperlink-icon"
           style={
             Object {
               "height": "1em",
@@ -3324,6 +3330,7 @@ exports[`DemographicsSection should set user input correctly when user provides
       >
         <span
           className="pgn__icon"
+          data-testid="hyperlink-icon"
           style={
             Object {
               "height": "1em",