Index: suite_leahi/tst_general_aesthetics/test.py
===================================================================
diff -u -rada517030c3f6f20ce2df4a60c3adbf60fa144ee -r43156dcfcf73cb8d8c46738e0e3e4ca7a44934a3
--- suite_leahi/tst_general_aesthetics/test.py	(.../test.py)	(revision ada517030c3f6f20ce2df4a60c3adbf60fa144ee)
+++ suite_leahi/tst_general_aesthetics/test.py	(.../test.py)	(revision 43156dcfcf73cb8d8c46738e0e3e4ca7a44934a3)
@@ -87,6 +87,7 @@
             content,
             f"Comparison of Information Pop-up SD Card Section Contents: {content}",
         )
+        
     test.endSection()
 
 
@@ -95,7 +96,6 @@
     Method to verify Diagnostics  Pop-up TD Op Mode
     """
     test.startSection("Verifying Diagnostics pop-up TD Op Mode")
-    # Click the Settings button
     headerbar_diagnostics = waitForObjectExists(names.o_headerBar_HeaderBar, 3000)
     doubleClick(headerbar_diagnostics)
 
@@ -129,6 +129,10 @@
 
     for mode in TDOpModes:
         td_simulator.td_operation_mode(mode.value, 0)
+        
+        headerbar_diagnostics = waitForObjectExists(names.o_headerBar_HeaderBar, 3000)
+        doubleClick(headerbar_diagnostics)
+        mouseClick(utility.get_object_from_names(names.o_HeaderBar_Diagnostics_Popup_TDOpModeColumn))
         td_opmode_value = waitForObject(
             utility.setObjectText(
                 names.o_HeaderBar_Diagnostics_Popup_TDOpmodeData_Value, mode.value
@@ -150,9 +154,10 @@
         config.SUBMODE,
         f"Comparison of Diagnostics Pop-up TD Op Sub Mode Text",
     )
-
+    
+    mouseClick(utility.get_object_from_names(names.o_HeaderBar_Diagnostics_Popup_TDOpModeColumn))
     for submode in TDStandbyStates:
-        td_simulator.td_operation_mode(TDOpModes.MODE_STAN.value, submode.value)
+        td_simulator.td_operation_mode(TDOpModes.NUM_OF_TD_MODES.value, submode.value)
         td_submode_value = waitForObject(
             utility.setObjectText(
                 names.o_HeaderBar_Diagnostics_Popup_TDOpmode_Submode_Value,
@@ -166,6 +171,7 @@
             str(submode.value),
             f"Comparing TD Op Submode Value: {submode.name}",
         )
+        
     test.endSection()