diff --git a/tests/testthat/test-app_server.R b/tests/testthat/test-app_server.R
index 5b42037..93f7ca4 100644
--- a/tests/testthat/test-app_server.R
+++ b/tests/testthat/test-app_server.R
@@ -16,7 +16,8 @@ test_that(
       data = datasets,
       filter_data = "a",
       module_info = resolve_module_list(list()),
-      filter_key = "mpg"
+      filter_key = "mpg",
+      use_dataset_filter = FALSE
     )
 
 
@@ -45,7 +46,8 @@ test_that(
       data = datasets,
       filter_data = "a",
       module_info = resolve_module_list(list()),
-      filter_key = "mpg"
+      filter_key = "mpg",
+      use_dataset_filter = FALSE
     )
 
     shiny::testServer(app_server_test(testing_options), {
@@ -63,7 +65,8 @@ test_that(
   {
     testing_options <- list(
       data = list(),
-      module_info = resolve_module_list(list("mod_1" = mod_identity(1, "mod_1"), "mod_2" = mod_identity(2, "mod_2")))
+      module_info = resolve_module_list(list("mod_1" = mod_identity(1, "mod_1"), "mod_2" = mod_identity(2, "mod_2"))),      
+      use_dataset_filter = FALSE
     )
 
     shiny::testServer(app_server_test(testing_options), {
@@ -84,7 +87,8 @@ test_that(
       data = datasets,
       filter_data = "a",
       module_info = resolve_module_list(list()),
-      filter_key = "mpg"
+      filter_key = "mpg",
+      use_dataset_filter = FALSE
     )
 
     shiny::testServer(app_server_test(testing_options), {
@@ -104,7 +108,8 @@ test_that(
       data = list(),
       filter_data = NULL,
       module_info = resolve_module_list(list("mod_1" = mod_identity(1, mod_id = "mod_1"))),
-      filter_key = NULL
+      filter_key = NULL,
+      use_dataset_filter = FALSE
     )
 
     testServer(app_server_test(testing_options), {
@@ -119,7 +124,8 @@ test_that(
     testing_options <- list(
       data = list(),
       module_info = resolve_module_list(list()),
-      filter_key = NULL
+      filter_key = NULL,
+      use_dataset_filter = FALSE
     )
     shiny::testServer(app_server_test(testing_options), {
     }) %>%
@@ -157,7 +163,8 @@ test_that(
       data = datasets,
       filter_data = "a",
       module_info = resolve_module_list(list()),
-      filter_key = "mpg"
+      filter_key = "mpg",
+      use_dataset_filter = FALSE
     )
 
     withr::local_locale(.new = list("LC_TIME" = "en_US.UTF-8"))
@@ -195,7 +202,8 @@ test_that(
       data = datasets,
       filter_data = "a",
       module_info = resolve_module_list(list()),
-      filter_key = "mpg"
+      filter_key = "mpg",
+      use_dataset_filter = FALSE
     )
 
     withr::local_locale(.new = list("LC_TIME" = "en_US.UTF-8"))
@@ -236,7 +244,8 @@ test_that(
       data = datasets,
       filter_data = "a",
       module_info = resolve_module_list(list()),
-      filter_key = "mpg"
+      filter_key = "mpg",
+      use_dataset_filter = FALSE
     )
 
     withr::local_locale(.new = list("LC_TIME" = "en_US.UTF-8"))
@@ -269,7 +278,8 @@ test_that(
       filter_data = "a",
       module_info = resolve_module_list(list()),
       filter_key = "mpg",
-      reload_period = lubridate::duration(1, "seconds")
+      reload_period = lubridate::duration(1, "seconds"),
+      use_dataset_filter = FALSE
     )
     withr::with_dir(tempdir(), {
       system2(command = "touch", args = c("restart.txt"), stdout = TRUE)
diff --git a/tests/testthat/test-bugs.R b/tests/testthat/test-bugs.R
index 7d6d834..b301775 100644
--- a/tests/testthat/test-bugs.R
+++ b/tests/testthat/test-bugs.R
@@ -9,6 +9,7 @@ test_that("values are returned when datafilter returns are false", {
     data = datasets,
     filter_data = "a",
     module_list = list(),
+    use_dataset_filter = FALSE,
     filter_key = "mpg" # This filter key is not really good as it is not unique!
   )
 
diff --git a/tests/testthat/test-dv.loader_integration.R b/tests/testthat/test-dv.loader_integration.R
index 0a9f380..fcab04f 100644
--- a/tests/testthat/test-dv.loader_integration.R
+++ b/tests/testthat/test-dv.loader_integration.R
@@ -38,7 +38,8 @@ test_that(
           "id_1"
         )
       ),
-      filter_key = "car"
+      filter_key = "car",
+      use_dataset_filter = FALSE
     )
 
 
diff --git a/tests/testthat/test-functional_testing.R b/tests/testthat/test-functional_testing.R
index df8a5ea..6a4d354 100644
--- a/tests/testthat/test-functional_testing.R
+++ b/tests/testthat/test-functional_testing.R
@@ -53,7 +53,8 @@ local({
         "id_1"
       )
     )),
-    filter_key = "car"
+    filter_key = "car",
+      use_dataset_filter = FALSE
   )
 
 
@@ -178,7 +179,8 @@ local({
             "id_1"
           )
         ),
-        filter_key = "car"
+        filter_key = "car",
+      use_dataset_filter = FALSE
       )
 
 
diff --git a/tests/testthat/test-module_communication.R b/tests/testthat/test-module_communication.R
index 5f8c207..59d5608 100644
--- a/tests/testthat/test-module_communication.R
+++ b/tests/testthat/test-module_communication.R
@@ -25,7 +25,8 @@ test_that(
           value = mm_dispatch("module_output", "mod_1"),
           mod_id = "mod_2"
         )
-      ))
+      )),
+      use_dataset_filter = FALSE
     )
 
 
@@ -57,7 +58,8 @@ test_that(
           value = mm_dispatch("module_output", "mod_1"),
           mod_id = "mod_2"
         )
-      ))
+      )),
+      use_dataset_filter = FALSE
     )
 
 
@@ -93,7 +95,8 @@ test_that(
           value = mm_dispatch("module_output", c("mod_1", "mod_3")),
           mod_id = "mod_2"
         )
-      ))
+      )),
+      use_dataset_filter = FALSE
     )