diff --git a/tests/testthat/test-shinytest2-tm_g_pp_adverse_events.R b/tests/testthat/test-shinytest2-tm_g_pp_adverse_events.R
index 1560f0aad..018bcf883 100644
--- a/tests/testthat/test-shinytest2-tm_g_pp_adverse_events.R
+++ b/tests/testthat/test-shinytest2-tm_g_pp_adverse_events.R
@@ -74,7 +74,7 @@ testthat::test_that(
     skip_if_too_deep(5)
     app_driver <- app_driver_tm_g_pp_adverse_events()
     testthat::expect_equal(
-      app_driver$get_text("#teal-teal_modules-active_tab .active > a"),
+      app_driver$get_text("a.nav-link.active"),
       "Adverse Events"
     )
 
@@ -152,10 +152,10 @@ testthat::test_that(
     skip_if_too_deep(5)
     app_driver <- app_driver_tm_g_pp_adverse_events()
     input_id <- "patient_id"
-    app_driver$set_active_module_input(input_id, "")
+    app_driver$set_active_module_input(input_id, NULL)
     app_driver$expect_validation_error()
     testthat::expect_identical(
-      app_driver$namespaces(TRUE)$module(sprintf("%s_input .shiny-validation-message", input_id)),
+      app_driver$get_text(app_driver$namespaces(TRUE)$module(sprintf("%s_input .shiny-validation-message", input_id))),
       "Please select a patient"
     )
     app_driver$stop()
@@ -197,7 +197,7 @@ testthat::test_that(
     app_driver$set_active_module_input(input_id, "")
     app_driver$expect_validation_error()
     testthat::expect_identical(
-      app_driver$namespaces(TRUE)$module(sprintf("%s_input .shiny-validation-message", input_id)),
+      app_driver$get_text(app_driver$namespaces(TRUE)$module(sprintf("%s_input .shiny-validation-message", input_id))),
       "Please select AETERM variable."
     )
     app_driver$stop()
@@ -239,7 +239,7 @@ testthat::test_that(
     app_driver$set_active_module_input(input_id, "")
     app_driver$expect_validation_error()
     testthat::expect_identical(
-      app_driver$namespaces(TRUE)$module(sprintf("%s_input .shiny-validation-message", input_id)),
+      app_driver$get_text(app_driver$namespaces(TRUE)$module(sprintf("%s_input .shiny-validation-message", input_id))),
       "Please select AETOXGR variable."
     )
     app_driver$stop()
@@ -281,7 +281,7 @@ testthat::test_that(
     app_driver$set_active_module_input(input_id, "")
     app_driver$expect_validation_error()
     testthat::expect_identical(
-      app_driver$namespaces(TRUE)$module(sprintf("%s_input .shiny-validation-message", input_id)),
+      app_driver$get_text(app_driver$namespaces(TRUE)$module(sprintf("%s_input .shiny-validation-message", input_id))),
       "Please select AEREL variable."
     )
     app_driver$stop()
@@ -323,7 +323,7 @@ testthat::test_that(
     app_driver$set_active_module_input(input_id, "")
     app_driver$expect_validation_error()
     testthat::expect_identical(
-      app_driver$namespaces(TRUE)$module(sprintf("%s_input .shiny-validation-message", input_id)),
+      app_driver$get_text(app_driver$namespaces(TRUE)$module(sprintf("%s_input .shiny-validation-message", input_id))),
       "Please select AEOUT variable."
     )
     app_driver$stop()
@@ -365,7 +365,7 @@ testthat::test_that(
     app_driver$set_active_module_input(input_id, "")
     app_driver$expect_validation_error()
     testthat::expect_identical(
-      app_driver$namespaces(TRUE)$module(sprintf("%s_input .shiny-validation-message", input_id)),
+      app_driver$get_text(app_driver$namespaces(TRUE)$module(sprintf("%s_input .shiny-validation-message", input_id))),
       "Please select AEACN variable."
     )
     app_driver$stop()
@@ -407,7 +407,7 @@ testthat::test_that(
     app_driver$set_active_module_input(input_id, "")
     app_driver$expect_validation_error()
     testthat::expect_identical(
-      app_driver$namespaces(TRUE)$module(sprintf("%s_input .shiny-validation-message", input_id)),
+      app_driver$get_text(app_driver$namespaces(TRUE)$module(sprintf("%s_input .shiny-validation-message", input_id))),
       "Please select ASTDY variable."
     )
     app_driver$stop()
diff --git a/tests/testthat/test-shinytest2-tm_g_pp_patient_timeline.R b/tests/testthat/test-shinytest2-tm_g_pp_patient_timeline.R
index 1049f7e99..7c2c38245 100644
--- a/tests/testthat/test-shinytest2-tm_g_pp_patient_timeline.R
+++ b/tests/testthat/test-shinytest2-tm_g_pp_patient_timeline.R
@@ -111,7 +111,7 @@ testthat::test_that(
     app_driver <- app_driver_tm_g_pp_patient_timeline()
 
     testthat::expect_equal(
-      app_driver$get_text("#teal-teal_modules-active_tab .active > a"),
+      app_driver$get_text("a.nav-link.active"),
       "Patient Timeline"
     )
     testthat::expect_equal(
diff --git a/tests/testthat/test-shinytest2-tm_g_pp_therapy.R b/tests/testthat/test-shinytest2-tm_g_pp_therapy.R
index 7e66e1d45..4669b7210 100644
--- a/tests/testthat/test-shinytest2-tm_g_pp_therapy.R
+++ b/tests/testthat/test-shinytest2-tm_g_pp_therapy.R
@@ -96,7 +96,7 @@ testthat::test_that("e2e - tm_g_pp_therapy: Module initializes in teal without e
   app_driver$expect_no_validation_error()
 
   testthat::expect_true(
-    app_driver$is_visible(app_driver$namespaces(TRUE)$module("therapy_plot-plot_out_main"))
+    app_driver$is_visible(app_driver$namespaces(TRUE)$module("therapy_plot-plot_main"))
   )
   testthat::expect_true(
     app_driver$is_visible(app_driver$namespaces(TRUE)$module("therapy_table"))
@@ -113,7 +113,7 @@ testthat::test_that(
     app_driver <- app_driver_tm_g_pp_therapy()
 
     testthat::expect_equal(
-      trimws(app_driver$get_text("#teal-teal_modules-active_tab .active")),
+      trimws(app_driver$get_text("a.nav-link.active")),
       "Therapy (e2e)"
     )
 
@@ -155,7 +155,7 @@ test_different_selection <- function(input_name, input_id, new_value) {
       app_driver <- app_driver_tm_g_pp_therapy()
       plot_before <- list(
         app_driver$get_active_module_plot_output("therapy_plot"),
-        app_driver$namespaces(TRUE)$module("therapy_table")
+        app_driver$get_active_module_table_output("therapy_table")
       )
       app_driver$set_active_module_input(input_id, new_value)
       testthat::expect_false(
@@ -163,7 +163,7 @@ test_different_selection <- function(input_name, input_id, new_value) {
           plot_before,
           list(
             app_driver$get_active_module_plot_output("therapy_plot"),
-            app_driver$namespaces(TRUE)$module("therapy_table")
+            app_driver$get_active_module_table_output("therapy_table")
           )
         )
       )
@@ -211,12 +211,12 @@ test_delection_validation <- function(input_name, input_id, deselect_message) {
     app_driver$set_active_module_input(input_id, NULL)
     app_driver$expect_validation_error()
     testthat::expect_equal(
-      app_driver$namespaces(TRUE)$module(
+      app_driver$get_text(app_driver$namespaces(TRUE)$module(
         sprintf(
           "%s_input .shiny-validation-message",
           input_id
         )
-      ),
+      )),
       deselect_message
     )
     app_driver$stop()
diff --git a/tests/testthat/test-shinytest2-tm_g_pp_vitals.R b/tests/testthat/test-shinytest2-tm_g_pp_vitals.R
index 95a24f2e7..5be1d0357 100644
--- a/tests/testthat/test-shinytest2-tm_g_pp_vitals.R
+++ b/tests/testthat/test-shinytest2-tm_g_pp_vitals.R
@@ -59,7 +59,7 @@ testthat::test_that(
     app_driver <- app_driver_tm_g_pp_vitals()
 
     testthat::expect_equal(
-      app_driver$get_text("#teal-teal_modules-active_tab .active > a"),
+      app_driver$get_text("a.nav-link.active"),
       "Vitals"
     )
     testthat::expect_equal(