diff --git a/tests/testthat/helper-TealAppDriver.R b/tests/testthat/helper-TealAppDriver.R
index 35cb195b95..c0c29a7e43 100644
--- a/tests/testthat/helper-TealAppDriver.R
+++ b/tests/testthat/helper-TealAppDriver.R
@@ -27,11 +27,3 @@ init_teal_app_driver <- function(...) {
 ns_des_input <- function(id, dataname, type) {
   sprintf("%s-dataset_%s_singleextract-%s", id, dataname, type)
 }
-
-# returns base 64 encoded image
-active_module_pws_output <- function(app_driver) {
-  app_driver$get_attr(
-    app_driver$active_module_element("myplot-plot_main > img"),
-    "src"
-  )
-}
diff --git a/tests/testthat/test-shinytest2-tm_a_gee.R b/tests/testthat/test-shinytest2-tm_a_gee.R
index 04cd396559..fc7c9ef347 100644
--- a/tests/testthat/test-shinytest2-tm_a_gee.R
+++ b/tests/testthat/test-shinytest2-tm_a_gee.R
@@ -61,26 +61,26 @@ testthat::test_that(
     )
 
     testthat::expect_equal(
-      app_driver$get_active_module_input("aval_var-dataset_ADQS_singleextract-select"),
+      app_driver$get_active_module_input(ns_des_input("aval_var", "ADQS", "select")),
       "AVALBIN"
     )
 
     testthat::expect_equal(
-      app_driver$get_active_module_input("id_var-dataset_ADQS_singleextract-select"),
+      app_driver$get_active_module_input(ns_des_input("id_var", "ADQS", "select")),
       "USUBJID"
     )
 
     testthat::expect_equal(
-      app_driver$get_active_module_input("arm_var-dataset_ADSL_singleextract-select"),
+      app_driver$get_active_module_input(ns_des_input("arm_var", "ADSL", "select")),
       "ARM"
     )
 
     testthat::expect_equal(
-      app_driver$get_active_module_input("visit_var-dataset_ADQS_singleextract-select"),
+      app_driver$get_active_module_input(ns_des_input("visit_var", "ADQS", "select")),
       "AVISIT"
     )
     testthat::expect_equal(
-      app_driver$get_active_module_input("paramcd-dataset_ADQS_singleextract-filter1-vals"),
+      app_driver$get_active_module_input(ns_des_input("paramcd", "ADQS", "filter1-vals")),
       "FKSI-FWB"
     )
 
@@ -103,20 +103,23 @@ testthat::test_that(
   }
 )
 
-testthat::test_that("e2e - tm_a_gee: Selection of id_var changes the table and does not throw validation errors.", {
-  skip_if_too_deep(5)
-  app_driver <- app_driver_tm_a_gee()
-  table_before <- app_driver$get_active_module_tws_output("table")
-  app_driver$set_active_module_input("id_var-dataset_ADQS_singleextract-select", "SUBJID")
-  testthat::expect_false(identical(table_before, app_driver$get_active_module_tws_output("table")))
-  app_driver$expect_no_validation_error()
-  app_driver$stop()
-})
+testthat::test_that(
+  "e2e - tm_a_gee: Selection of id_var does not change the table and does not throw validation errors.",
+  {
+    skip_if_too_deep(5)
+    app_driver <- app_driver_tm_a_gee()
+    table_before <- app_driver$get_active_module_tws_output("table")
+    app_driver$set_active_module_input(ns_des_input("id_var", "ADQS", "select"), "SUBJID")
+    testthat::expect_true(identical(table_before, app_driver$get_active_module_tws_output("table")))
+    app_driver$expect_no_validation_error()
+    app_driver$stop()
+  }
+)
 
 testthat::test_that("e2e - tm_a_gee: Deselection of id_var throws validation error.", {
   skip_if_too_deep(5)
   app_driver <- app_driver_tm_a_gee()
-  app_driver$set_active_module_input("id_var-dataset_ADQS_singleextract-select", character(0))
+  app_driver$set_active_module_input(ns_des_input("id_var", "ADQS", "select"), character(0))
   testthat::expect_identical(app_driver$get_active_module_tws_output("table"), data.frame())
   app_driver$expect_validation_error()
   testthat::expect_equal(
@@ -131,7 +134,7 @@ testthat::test_that("e2e - tm_a_gee: Change in arm_var changes the table and doe
   app_driver <- app_driver_tm_a_gee()
 
   table_before <- app_driver$get_active_module_tws_output("table")
-  app_driver$set_active_module_input("arm_var-dataset_ADSL_singleextract-select", "ARMCD")
+  app_driver$set_active_module_input(ns_des_input("arm_var", "ADSL", "select"), "ARMCD")
   testthat::expect_false(identical(table_before, app_driver$get_active_module_tws_output("table")))
   app_driver$expect_no_validation_error()
   app_driver$stop()
@@ -140,7 +143,7 @@ testthat::test_that("e2e - tm_a_gee: Change in arm_var changes the table and doe
 testthat::test_that("e2e - tm_a_gee: Deselection of arm_var throws validation error.", {
   skip_if_too_deep(5)
   app_driver <- app_driver_tm_a_gee()
-  app_driver$set_active_module_input("arm_var-dataset_ADSL_singleextract-select", character(0))
+  app_driver$set_active_module_input(ns_des_input("arm_var", "ADSL", "select"), character(0))
   testthat::expect_identical(app_driver$get_active_module_tws_output("table"), data.frame())
   app_driver$expect_validation_error()
   testthat::expect_equal(
@@ -150,21 +153,24 @@ testthat::test_that("e2e - tm_a_gee: Deselection of arm_var throws validation er
   app_driver$stop()
 })
 
-
-testthat::test_that("e2e - tm_a_gee: Selection of visit_var changes the table and does not throw validation errors.", {
-  skip_if_too_deep(5)
-  app_driver <- app_driver_tm_a_gee()
-  table_before <- app_driver$get_active_module_tws_output("table")
-  app_driver$set_active_module_input("visit_var-dataset_ADQS_singleextract-select", "AVISITN")
-  testthat::expect_false(identical(table_before, app_driver$get_active_module_tws_output("table")))
-  app_driver$expect_no_validation_error()
-  app_driver$stop()
-})
+testthat::test_that(
+  "e2e - tm_a_gee: Selection of visit_var does not change the table and does not throw validation errors.",
+  {
+    skip_if_too_deep(5)
+    app_driver <- app_driver_tm_a_gee()
+    table_before <- app_driver$get_active_module_tws_output("table")
+    app_driver$set_active_module_input(ns_des_input("visit_var", "ADQS", "select"), "AVISITN")
+    testthat::expect_true(identical(table_before, app_driver$get_active_module_tws_output("table")))
+    app_driver$expect_no_validation_error()
+    app_driver$stop()
+  }
+)
 
 testthat::test_that("e2e - tm_a_gee: Deselection of visit_var throws validation error.", {
   skip_if_too_deep(5)
   app_driver <- app_driver_tm_a_gee()
-  app_driver$set_active_module_input("visit_var-dataset_ADQS_singleextract-select", character(0))
+  app_driver$set_active_module_input(ns_des_input("visit_var", "ADQS", "select"), character(0))
+  app_driver$wait_for_idle()
   testthat::expect_identical(app_driver$get_active_module_tws_output("table"), data.frame())
   app_driver$expect_validation_error()
   testthat::expect_equal(
@@ -178,7 +184,7 @@ testthat::test_that("e2e - tm_a_gee: Selection of paramcd changes the table and
   skip_if_too_deep(5)
   app_driver <- app_driver_tm_a_gee()
   table_before <- app_driver$get_active_module_tws_output("table")
-  app_driver$set_active_module_input("paramcd-dataset_ADQS_singleextract-filter1-vals", "BFIALL")
+  app_driver$set_active_module_input(ns_des_input("paramcd", "ADQS", "filter1-vals"), "BFIALL")
   testthat::expect_false(identical(table_before, app_driver$get_active_module_tws_output("table")))
   app_driver$expect_no_validation_error()
   app_driver$stop()
@@ -187,7 +193,7 @@ testthat::test_that("e2e - tm_a_gee: Selection of paramcd changes the table and
 testthat::test_that("e2e - tm_a_gee: Deselection of paramcd throws validation error.", {
   skip_if_too_deep(5)
   app_driver <- app_driver_tm_a_gee()
-  app_driver$set_active_module_input("paramcd-dataset_ADQS_singleextract-filter1-vals", character(0))
+  app_driver$set_active_module_input(ns_des_input("paramcd", "ADQS", "filter1-vals"), character(0))
   testthat::expect_identical(app_driver$get_active_module_tws_output("table"), data.frame())
   app_driver$expect_validation_error()
   testthat::expect_equal(
@@ -207,19 +213,6 @@ testthat::test_that("e2e - tm_a_gee: Selection of cov_var changes the table and
   app_driver$stop()
 })
 
-testthat::test_that("e2e - tm_a_gee: Deselection of cov_var throws validation error.", {
-  skip_if_too_deep(5)
-  app_driver <- app_driver_tm_a_gee()
-  app_driver$set_active_module_input("cov_var-dataset_ADQS_singleextract-select", character(0))
-  testthat::expect_identical(app_driver$get_active_module_tws_output("table"), data.frame())
-  app_driver$expect_validation_error()
-  testthat::expect_equal(
-    app_driver$active_module_element_text("cov_var-dataset_ADQS_singleextract-select_input > div > span"),
-    "An endpoint is required"
-  )
-  app_driver$stop()
-})
-
 testthat::test_that("e2e - tm_a_gee: Selection of conf_level changes the table and does not throw validation errors.", {
   skip_if_too_deep(5)
   app_driver <- app_driver_tm_a_gee()
@@ -257,7 +250,6 @@ testthat::test_that("e2e - tm_a_gee: Deselection of conf_level throws validation
   app_driver$stop()
 })
 
-
 testthat::test_that("e2e - tm_a_gee: Selection of cor_struct changes the table and does not throw validation errors.", {
   skip_if_too_deep(5)
   app_driver <- app_driver_tm_a_gee()
@@ -268,21 +260,14 @@ testthat::test_that("e2e - tm_a_gee: Selection of cor_struct changes the table a
   app_driver$stop()
 })
 
-testthat::test_that("e2e - tm_a_gee: Deselection of cor_struct throws validation error.", {
+testthat::test_that("e2e - tm_a_gee: Deselection of cor_struct does not throw validation error.", {
   skip_if_too_deep(5)
   app_driver <- app_driver_tm_a_gee()
-  app_driver$set_active_module_input("cor_struct", character(0))
-  testthat::expect_identical(app_driver$get_active_module_tws_output("table"), data.frame())
-  # TO BE FIXED - there is no error displayed
-  app_driver$expect_validation_error()
-  testthat::expect_equal(
-    app_driver$active_module_element_text("cov_struct_input > div > span"),
-    "Please choose a correlation structure"
-  )
+  app_driver$set_active_module_input("cor_struct", character(0)) # shows enourmous warning message
+  app_driver$expect_no_validation_error()
   app_driver$stop()
 })
 
-
 testthat::test_that("e2e - tm_a_gee: Selection of output_table changes the table and doesn't throw validation error.", {
   skip_if_too_deep(5)
   app_driver <- app_driver_tm_a_gee()