diff --git a/tests/testthat/test-decadal_monthly_1.R b/tests/testthat/test-decadal_monthly_1.R
index b76a216c18d605436a730c92504be69379e991d8..1068429836658edc264c14869eb82c80ff712a73 100644
--- a/tests/testthat/test-decadal_monthly_1.R
+++ b/tests/testthat/test-decadal_monthly_1.R
@@ -258,25 +258,35 @@ tolerance = 0.0001
 test_that("4. Saving", {
 
 expect_equal(
-list.files(outdir),
+all(list.files(outdir) %in% 
 c("plots", "tas_19911101.nc", "tas_19921101.nc", "tas_19931101.nc", "tas_19941101.nc", "tas_20211101.nc", 
   "tas-obs_19911101.nc", "tas-obs_19921101.nc", "tas-obs_19931101.nc", "tas-obs_19941101.nc",
   "tas-percentiles_month11.nc", "tas-probs_19911101.nc", "tas-probs_19921101.nc",
-  "tas-probs_19931101.nc", "tas-probs_19941101.nc", "tas-probs_20211101.nc", "tas-skill_month11.nc")
+  "tas-probs_19931101.nc", "tas-probs_19941101.nc", "tas-probs_20211101.nc", "tas-skill_month11.nc")),
+TRUE
 )
 # open the files and check values/attributes?
 #expect_equal(
 #)
 
+expect_equal(
+length(list.files(outdir)),
+17
+)
 
 })
 
 
 test_that("5. Visualization", {
 expect_equal(
-list.files(paste0(outdir, "/plots/")),
+all(list.files(paste0(outdir, "/plots/")) %in%
 c("forecast_ensemble_mean.png", "forecast_most_likely_tercile.png",
-  "rpss.png")
+  "rpss.png")),
+TRUE
+)
+expect_equal(
+length(list.files(paste0(outdir, "/plots/"))),
+3
 )
 
 })
diff --git a/tests/testthat/test-decadal_monthly_2.R b/tests/testthat/test-decadal_monthly_2.R
index cdab57f3174d710e31ad68eb17eab14304b81d84..d981a6de4ec31eba2b9678797a98f80a09d6d7ed 100644
--- a/tests/testthat/test-decadal_monthly_2.R
+++ b/tests/testthat/test-decadal_monthly_2.R
@@ -252,20 +252,32 @@ tolerance = 0.0001
 test_that("4. Saving", {
 
 expect_equal(
-list.files(outdir),
+all(list.files(outdir) %in%
 c("plots", "tas_19901101.nc", "tas_19911101.nc", "tas_19921101.nc", "tas_20201101.nc", "tas_20211101.nc",
   "tas-obs_19901101.nc", "tas-obs_19911101.nc", "tas-obs_19921101.nc",
   "tas-percentiles_month11.nc", "tas-probs_19901101.nc", "tas-probs_19911101.nc",
-  "tas-probs_19921101.nc", "tas-probs_20201101.nc", "tas-probs_20211101.nc", "tas-skill_month11.nc")
+  "tas-probs_19921101.nc", "tas-probs_20201101.nc", "tas-probs_20211101.nc", "tas-skill_month11.nc")),
+TRUE
+)
+expect_equal(
+length(list.files(outdir)),
+16
 )
+
 })
 
 #======================================
 
 test_that("5. Visualization", {
 expect_equal(
-list.files(paste0(outdir, "/plots/")),
+all(list.files(paste0(outdir, "/plots/")) %in%
 c("bss10_specs.png", "enscorr_specs.png", "forecast_ensemble_mean_2020.png", "forecast_ensemble_mean_2021.png", "forecast_most_likely_tercile_2020.png", "forecast_most_likely_tercile_2021.png", "frps_specs.png", "frps.png", "rpss_specs.png")
+),
+TRUE
+)
+expect_equal(
+length(list.files(paste0(outdir, "/plots/"))),
+9
 )
 
 })
diff --git a/tests/testthat/test-seasonal_monthly.R b/tests/testthat/test-seasonal_monthly.R
index de03bf7340906650004fbdf5bcdf445992144c09..06ec3730816555d7281521a6f08b4b995aadd919 100644
--- a/tests/testthat/test-seasonal_monthly.R
+++ b/tests/testthat/test-seasonal_monthly.R
@@ -214,22 +214,32 @@ rep(FALSE, 3)
 test_that("4. Saving", {
 
 expect_equal(
-list.files(outdir),
+all(list.files(outdir) %in% 
 c("plots", "tas_19931101.nc", "tas_19941101.nc", "tas_19951101.nc", 
   "tas_19961101.nc", "tas_20201101.nc", "tas-corr_month11.nc", 
   "tas-obs_19931101.nc", "tas-obs_19941101.nc", "tas-obs_19951101.nc",
   "tas-obs_19961101.nc", "tas-percentiles_month11.nc", "tas-probs_19931101.nc",
   "tas-probs_19941101.nc", "tas-probs_19951101.nc", "tas-probs_19961101.nc", 
-  "tas-probs_20201101.nc", "tas-skill_month11.nc")
+  "tas-probs_20201101.nc", "tas-skill_month11.nc")),
+TRUE
+)
+expect_equal(
+length(list.files(outdir)),
+18
 )
 
 })
 
 test_that("5. Visualization", {
 expect_equal(
-list.files(paste0(outdir, "/plots/")),
+all(list.files(paste0(outdir, "/plots/")) %in%
 c("crpss.png", "enscorr_specs.png", "enscorr.png", "forecast_ensemble_mean.png",
-  "forecast_most_likely_tercile.png", "rpss.png")
+  "forecast_most_likely_tercile.png", "rpss.png")),
+TRUE
+)
+expect_equal(
+length(list.files(paste0(outdir, "/plots/"))),
+6
 )
 
 })