diff --git a/.Rprofile b/.Rprofile
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/R/data-apps-deps.R b/R/data-apps-deps.R
index e5e2f191f3..b0c810f039 100644
--- a/R/data-apps-deps.R
+++ b/R/data-apps-deps.R
@@ -59,9 +59,9 @@ apps_deps_map <- list(`001-hello` = "rsconnect", `012-datatables` = "ggplot2",
     "sf", "withr"), `302-bootswatch-themes` = c("ggplot2", "progress", 
     "rversions", "sf", "withr"), `304-bslib-card` = c("rlang", 
     "rversions"), `305-bslib-value-box` = c("rlang", "rversions"
-    ), `306-accordion-add-remove` = "magrittr", `308-sidebar-kitchen-sink` = c("lorem", 
-    "rversions", "testthat"), `309-flexdashboard-tabs-navs` = "rmarkdown", 
-    `310-bslib-sidebar-dynamic` = c("rversions", "testthat"), 
+    ), `306-accordion-add-remove` = "magrittr", `308-sidebar-kitchen-sink` = c("jsonlite", 
+    "lorem", "testthat"), `309-flexdashboard-tabs-navs` = "rmarkdown", 
+    `310-bslib-sidebar-dynamic` = c("jsonlite", "testthat"), 
     `311-bslib-sidebar-toggle-methods` = c("rversions", "testthat"
     ), `313-bslib-card-tab-focus` = c("rversions", "testthat", 
     "withr"), `314-bslib-tooltips` = "withr", `315-bslib-input-switch` = "withr", 
diff --git a/R/data-shinyverse.R b/R/data-shinyverse.R
index eacd4028dc..6df4e1fe1e 100644
--- a/R/data-shinyverse.R
+++ b/R/data-shinyverse.R
@@ -24,6 +24,7 @@ shinyverse_remotes <- c(
   "rstudio/shiny",
   "rstudio/shinymeta",
   "rstudio/shinytest",
+  "rstudio/chromote",
   "rstudio/shinytest2",
   "rstudio/shinythemes",
   "rstudio/shinyvalidate",
diff --git a/README.md b/README.md
index 32b8aeaa37..214b5cf6e7 100644
--- a/README.md
+++ b/README.md
@@ -48,6 +48,7 @@ These GitHub packages will be installed to make sure the latest package developm
 - [rstudio/shiny](http://github.com/rstudio/shiny)
 - [rstudio/shinymeta](http://github.com/rstudio/shinymeta)
 - [rstudio/shinytest](http://github.com/rstudio/shinytest)
+- [rstudio/chromote](http://github.com/rstudio/chromote)
 - [rstudio/shinytest2](http://github.com/rstudio/shinytest2)
 - [rstudio/shinythemes](http://github.com/rstudio/shinythemes)
 - [rstudio/shinyvalidate](http://github.com/rstudio/shinyvalidate)
diff --git a/inst/apps/306-accordion-add-remove/app.R b/inst/apps/306-accordion-add-remove/app.R
index 2d4dfdc1b7..9f2ebad09d 100644
--- a/inst/apps/306-accordion-add-remove/app.R
+++ b/inst/apps/306-accordion-add-remove/app.R
@@ -14,7 +14,9 @@ ui <- page_sidebar(
     "accordion-icon-color" = "white",
     "accordion-icon-active-color" = "white"
   ) %>%
-    bs_add_rules(".bslib-sidebar-layout .main { background-color: lightgray; }"),
+    bs_add_rules(
+      ".bslib-sidebar-layout .main { background-color: lightgray; }"
+    ),
   sidebar = sidebar(
     bg = "#1E1E1E",
     accordion(
diff --git a/inst/apps/306-accordion-add-remove/tests/testthat/_snaps/linux-3.6/306-accordion-add-remove/accordion-select-001.png b/inst/apps/306-accordion-add-remove/tests/testthat/_snaps/linux-3.6/306-accordion-add-remove/accordion-select-001.png
new file mode 100644
index 0000000000..3184e6054b
Binary files /dev/null and b/inst/apps/306-accordion-add-remove/tests/testthat/_snaps/linux-3.6/306-accordion-add-remove/accordion-select-001.png differ
diff --git a/inst/apps/306-accordion-add-remove/tests/testthat/_snaps/linux-3.6/306-accordion-add-remove/accordion-select-002.png b/inst/apps/306-accordion-add-remove/tests/testthat/_snaps/linux-3.6/306-accordion-add-remove/accordion-select-002.png
new file mode 100644
index 0000000000..8ed1a0228d
Binary files /dev/null and b/inst/apps/306-accordion-add-remove/tests/testthat/_snaps/linux-3.6/306-accordion-add-remove/accordion-select-002.png differ
diff --git a/inst/apps/306-accordion-add-remove/tests/testthat/_snaps/linux-3.6/306-accordion-add-remove/accordion-select-003.png b/inst/apps/306-accordion-add-remove/tests/testthat/_snaps/linux-3.6/306-accordion-add-remove/accordion-select-003.png
new file mode 100644
index 0000000000..a50077c4e3
Binary files /dev/null and b/inst/apps/306-accordion-add-remove/tests/testthat/_snaps/linux-3.6/306-accordion-add-remove/accordion-select-003.png differ
diff --git a/inst/apps/306-accordion-add-remove/tests/testthat/_snaps/linux-3.6/306-accordion-add-remove/accordion-select-004.png b/inst/apps/306-accordion-add-remove/tests/testthat/_snaps/linux-3.6/306-accordion-add-remove/accordion-select-004.png
new file mode 100644
index 0000000000..ca6fb04e4f
Binary files /dev/null and b/inst/apps/306-accordion-add-remove/tests/testthat/_snaps/linux-3.6/306-accordion-add-remove/accordion-select-004.png differ
diff --git a/inst/apps/306-accordion-add-remove/tests/testthat/_snaps/linux-3.6/shinytest2/accordion-select-001.png b/inst/apps/306-accordion-add-remove/tests/testthat/_snaps/linux-3.6/shinytest2/accordion-select-001.png
deleted file mode 100644
index 73449c1ad3..0000000000
Binary files a/inst/apps/306-accordion-add-remove/tests/testthat/_snaps/linux-3.6/shinytest2/accordion-select-001.png and /dev/null differ
diff --git a/inst/apps/306-accordion-add-remove/tests/testthat/_snaps/linux-3.6/shinytest2/accordion-select-002.png b/inst/apps/306-accordion-add-remove/tests/testthat/_snaps/linux-3.6/shinytest2/accordion-select-002.png
deleted file mode 100644
index 72b532f1b2..0000000000
Binary files a/inst/apps/306-accordion-add-remove/tests/testthat/_snaps/linux-3.6/shinytest2/accordion-select-002.png and /dev/null differ
diff --git a/inst/apps/306-accordion-add-remove/tests/testthat/_snaps/linux-3.6/shinytest2/accordion-select-003.png b/inst/apps/306-accordion-add-remove/tests/testthat/_snaps/linux-3.6/shinytest2/accordion-select-003.png
deleted file mode 100644
index 245ba9e6fb..0000000000
Binary files a/inst/apps/306-accordion-add-remove/tests/testthat/_snaps/linux-3.6/shinytest2/accordion-select-003.png and /dev/null differ
diff --git a/inst/apps/306-accordion-add-remove/tests/testthat/_snaps/linux-3.6/shinytest2/accordion-select-004.png b/inst/apps/306-accordion-add-remove/tests/testthat/_snaps/linux-3.6/shinytest2/accordion-select-004.png
deleted file mode 100644
index 94afa2ae63..0000000000
Binary files a/inst/apps/306-accordion-add-remove/tests/testthat/_snaps/linux-3.6/shinytest2/accordion-select-004.png and /dev/null differ
diff --git a/inst/apps/306-accordion-add-remove/tests/testthat/_snaps/linux-4.0/306-accordion-add-remove/accordion-select-001.png b/inst/apps/306-accordion-add-remove/tests/testthat/_snaps/linux-4.0/306-accordion-add-remove/accordion-select-001.png
new file mode 100644
index 0000000000..c8eb75df2b
Binary files /dev/null and b/inst/apps/306-accordion-add-remove/tests/testthat/_snaps/linux-4.0/306-accordion-add-remove/accordion-select-001.png differ
diff --git a/inst/apps/306-accordion-add-remove/tests/testthat/_snaps/linux-4.0/306-accordion-add-remove/accordion-select-002.png b/inst/apps/306-accordion-add-remove/tests/testthat/_snaps/linux-4.0/306-accordion-add-remove/accordion-select-002.png
new file mode 100644
index 0000000000..78814a3930
Binary files /dev/null and b/inst/apps/306-accordion-add-remove/tests/testthat/_snaps/linux-4.0/306-accordion-add-remove/accordion-select-002.png differ
diff --git a/inst/apps/306-accordion-add-remove/tests/testthat/_snaps/linux-4.0/306-accordion-add-remove/accordion-select-003.png b/inst/apps/306-accordion-add-remove/tests/testthat/_snaps/linux-4.0/306-accordion-add-remove/accordion-select-003.png
new file mode 100644
index 0000000000..0f79d9cef5
Binary files /dev/null and b/inst/apps/306-accordion-add-remove/tests/testthat/_snaps/linux-4.0/306-accordion-add-remove/accordion-select-003.png differ
diff --git a/inst/apps/306-accordion-add-remove/tests/testthat/_snaps/linux-4.0/306-accordion-add-remove/accordion-select-004.png b/inst/apps/306-accordion-add-remove/tests/testthat/_snaps/linux-4.0/306-accordion-add-remove/accordion-select-004.png
new file mode 100644
index 0000000000..f9fd9ed9a1
Binary files /dev/null and b/inst/apps/306-accordion-add-remove/tests/testthat/_snaps/linux-4.0/306-accordion-add-remove/accordion-select-004.png differ
diff --git a/inst/apps/306-accordion-add-remove/tests/testthat/_snaps/linux-4.0/shinytest2/accordion-select-001.png b/inst/apps/306-accordion-add-remove/tests/testthat/_snaps/linux-4.0/shinytest2/accordion-select-001.png
deleted file mode 100644
index 1179eda1e6..0000000000
Binary files a/inst/apps/306-accordion-add-remove/tests/testthat/_snaps/linux-4.0/shinytest2/accordion-select-001.png and /dev/null differ
diff --git a/inst/apps/306-accordion-add-remove/tests/testthat/_snaps/linux-4.0/shinytest2/accordion-select-002.png b/inst/apps/306-accordion-add-remove/tests/testthat/_snaps/linux-4.0/shinytest2/accordion-select-002.png
deleted file mode 100644
index e70f2622c9..0000000000
Binary files a/inst/apps/306-accordion-add-remove/tests/testthat/_snaps/linux-4.0/shinytest2/accordion-select-002.png and /dev/null differ
diff --git a/inst/apps/306-accordion-add-remove/tests/testthat/_snaps/linux-4.0/shinytest2/accordion-select-003.png b/inst/apps/306-accordion-add-remove/tests/testthat/_snaps/linux-4.0/shinytest2/accordion-select-003.png
deleted file mode 100644
index 1758012d7a..0000000000
Binary files a/inst/apps/306-accordion-add-remove/tests/testthat/_snaps/linux-4.0/shinytest2/accordion-select-003.png and /dev/null differ
diff --git a/inst/apps/306-accordion-add-remove/tests/testthat/_snaps/linux-4.0/shinytest2/accordion-select-004.png b/inst/apps/306-accordion-add-remove/tests/testthat/_snaps/linux-4.0/shinytest2/accordion-select-004.png
deleted file mode 100644
index 682f408633..0000000000
Binary files a/inst/apps/306-accordion-add-remove/tests/testthat/_snaps/linux-4.0/shinytest2/accordion-select-004.png and /dev/null differ
diff --git a/inst/apps/306-accordion-add-remove/tests/testthat/_snaps/linux-4.1/306-accordion-add-remove/accordion-select-001.png b/inst/apps/306-accordion-add-remove/tests/testthat/_snaps/linux-4.1/306-accordion-add-remove/accordion-select-001.png
new file mode 100644
index 0000000000..c8eb75df2b
Binary files /dev/null and b/inst/apps/306-accordion-add-remove/tests/testthat/_snaps/linux-4.1/306-accordion-add-remove/accordion-select-001.png differ
diff --git a/inst/apps/306-accordion-add-remove/tests/testthat/_snaps/linux-4.1/306-accordion-add-remove/accordion-select-002.png b/inst/apps/306-accordion-add-remove/tests/testthat/_snaps/linux-4.1/306-accordion-add-remove/accordion-select-002.png
new file mode 100644
index 0000000000..7ff9a004ca
Binary files /dev/null and b/inst/apps/306-accordion-add-remove/tests/testthat/_snaps/linux-4.1/306-accordion-add-remove/accordion-select-002.png differ
diff --git a/inst/apps/306-accordion-add-remove/tests/testthat/_snaps/linux-4.1/306-accordion-add-remove/accordion-select-003.png b/inst/apps/306-accordion-add-remove/tests/testthat/_snaps/linux-4.1/306-accordion-add-remove/accordion-select-003.png
new file mode 100644
index 0000000000..0f79d9cef5
Binary files /dev/null and b/inst/apps/306-accordion-add-remove/tests/testthat/_snaps/linux-4.1/306-accordion-add-remove/accordion-select-003.png differ
diff --git a/inst/apps/306-accordion-add-remove/tests/testthat/_snaps/linux-4.1/306-accordion-add-remove/accordion-select-004.png b/inst/apps/306-accordion-add-remove/tests/testthat/_snaps/linux-4.1/306-accordion-add-remove/accordion-select-004.png
new file mode 100644
index 0000000000..ef4c3f1cef
Binary files /dev/null and b/inst/apps/306-accordion-add-remove/tests/testthat/_snaps/linux-4.1/306-accordion-add-remove/accordion-select-004.png differ
diff --git a/inst/apps/306-accordion-add-remove/tests/testthat/_snaps/linux-4.1/shinytest2/accordion-select-001.png b/inst/apps/306-accordion-add-remove/tests/testthat/_snaps/linux-4.1/shinytest2/accordion-select-001.png
deleted file mode 100644
index 1179eda1e6..0000000000
Binary files a/inst/apps/306-accordion-add-remove/tests/testthat/_snaps/linux-4.1/shinytest2/accordion-select-001.png and /dev/null differ
diff --git a/inst/apps/306-accordion-add-remove/tests/testthat/_snaps/linux-4.1/shinytest2/accordion-select-002.png b/inst/apps/306-accordion-add-remove/tests/testthat/_snaps/linux-4.1/shinytest2/accordion-select-002.png
deleted file mode 100644
index 4c146557ce..0000000000
Binary files a/inst/apps/306-accordion-add-remove/tests/testthat/_snaps/linux-4.1/shinytest2/accordion-select-002.png and /dev/null differ
diff --git a/inst/apps/306-accordion-add-remove/tests/testthat/_snaps/linux-4.1/shinytest2/accordion-select-003.png b/inst/apps/306-accordion-add-remove/tests/testthat/_snaps/linux-4.1/shinytest2/accordion-select-003.png
deleted file mode 100644
index 1758012d7a..0000000000
Binary files a/inst/apps/306-accordion-add-remove/tests/testthat/_snaps/linux-4.1/shinytest2/accordion-select-003.png and /dev/null differ
diff --git a/inst/apps/306-accordion-add-remove/tests/testthat/_snaps/linux-4.1/shinytest2/accordion-select-004.png b/inst/apps/306-accordion-add-remove/tests/testthat/_snaps/linux-4.1/shinytest2/accordion-select-004.png
deleted file mode 100644
index 682f408633..0000000000
Binary files a/inst/apps/306-accordion-add-remove/tests/testthat/_snaps/linux-4.1/shinytest2/accordion-select-004.png and /dev/null differ
diff --git a/inst/apps/306-accordion-add-remove/tests/testthat/_snaps/linux-4.2/306-accordion-add-remove/accordion-select-001.png b/inst/apps/306-accordion-add-remove/tests/testthat/_snaps/linux-4.2/306-accordion-add-remove/accordion-select-001.png
new file mode 100644
index 0000000000..3184e6054b
Binary files /dev/null and b/inst/apps/306-accordion-add-remove/tests/testthat/_snaps/linux-4.2/306-accordion-add-remove/accordion-select-001.png differ
diff --git a/inst/apps/306-accordion-add-remove/tests/testthat/_snaps/linux-4.2/306-accordion-add-remove/accordion-select-002.png b/inst/apps/306-accordion-add-remove/tests/testthat/_snaps/linux-4.2/306-accordion-add-remove/accordion-select-002.png
new file mode 100644
index 0000000000..8ed1a0228d
Binary files /dev/null and b/inst/apps/306-accordion-add-remove/tests/testthat/_snaps/linux-4.2/306-accordion-add-remove/accordion-select-002.png differ
diff --git a/inst/apps/306-accordion-add-remove/tests/testthat/_snaps/linux-4.2/306-accordion-add-remove/accordion-select-003.png b/inst/apps/306-accordion-add-remove/tests/testthat/_snaps/linux-4.2/306-accordion-add-remove/accordion-select-003.png
new file mode 100644
index 0000000000..a50077c4e3
Binary files /dev/null and b/inst/apps/306-accordion-add-remove/tests/testthat/_snaps/linux-4.2/306-accordion-add-remove/accordion-select-003.png differ
diff --git a/inst/apps/306-accordion-add-remove/tests/testthat/_snaps/linux-4.2/306-accordion-add-remove/accordion-select-004.png b/inst/apps/306-accordion-add-remove/tests/testthat/_snaps/linux-4.2/306-accordion-add-remove/accordion-select-004.png
new file mode 100644
index 0000000000..ca6fb04e4f
Binary files /dev/null and b/inst/apps/306-accordion-add-remove/tests/testthat/_snaps/linux-4.2/306-accordion-add-remove/accordion-select-004.png differ
diff --git a/inst/apps/306-accordion-add-remove/tests/testthat/_snaps/linux-4.2/shinytest2/accordion-select-001.png b/inst/apps/306-accordion-add-remove/tests/testthat/_snaps/linux-4.2/shinytest2/accordion-select-001.png
deleted file mode 100644
index 1179eda1e6..0000000000
Binary files a/inst/apps/306-accordion-add-remove/tests/testthat/_snaps/linux-4.2/shinytest2/accordion-select-001.png and /dev/null differ
diff --git a/inst/apps/306-accordion-add-remove/tests/testthat/_snaps/linux-4.2/shinytest2/accordion-select-002.png b/inst/apps/306-accordion-add-remove/tests/testthat/_snaps/linux-4.2/shinytest2/accordion-select-002.png
deleted file mode 100644
index 4c146557ce..0000000000
Binary files a/inst/apps/306-accordion-add-remove/tests/testthat/_snaps/linux-4.2/shinytest2/accordion-select-002.png and /dev/null differ
diff --git a/inst/apps/306-accordion-add-remove/tests/testthat/_snaps/linux-4.2/shinytest2/accordion-select-003.png b/inst/apps/306-accordion-add-remove/tests/testthat/_snaps/linux-4.2/shinytest2/accordion-select-003.png
deleted file mode 100644
index 1758012d7a..0000000000
Binary files a/inst/apps/306-accordion-add-remove/tests/testthat/_snaps/linux-4.2/shinytest2/accordion-select-003.png and /dev/null differ
diff --git a/inst/apps/306-accordion-add-remove/tests/testthat/_snaps/linux-4.2/shinytest2/accordion-select-004.png b/inst/apps/306-accordion-add-remove/tests/testthat/_snaps/linux-4.2/shinytest2/accordion-select-004.png
deleted file mode 100644
index 682f408633..0000000000
Binary files a/inst/apps/306-accordion-add-remove/tests/testthat/_snaps/linux-4.2/shinytest2/accordion-select-004.png and /dev/null differ
diff --git a/inst/apps/306-accordion-add-remove/tests/testthat/_snaps/linux-4.3/306-accordion-add-remove/accordion-select-001.png b/inst/apps/306-accordion-add-remove/tests/testthat/_snaps/linux-4.3/306-accordion-add-remove/accordion-select-001.png
new file mode 100644
index 0000000000..c8eb75df2b
Binary files /dev/null and b/inst/apps/306-accordion-add-remove/tests/testthat/_snaps/linux-4.3/306-accordion-add-remove/accordion-select-001.png differ
diff --git a/inst/apps/306-accordion-add-remove/tests/testthat/_snaps/linux-4.3/306-accordion-add-remove/accordion-select-002.png b/inst/apps/306-accordion-add-remove/tests/testthat/_snaps/linux-4.3/306-accordion-add-remove/accordion-select-002.png
new file mode 100644
index 0000000000..db8ce5bbed
Binary files /dev/null and b/inst/apps/306-accordion-add-remove/tests/testthat/_snaps/linux-4.3/306-accordion-add-remove/accordion-select-002.png differ
diff --git a/inst/apps/306-accordion-add-remove/tests/testthat/_snaps/linux-4.3/306-accordion-add-remove/accordion-select-003.png b/inst/apps/306-accordion-add-remove/tests/testthat/_snaps/linux-4.3/306-accordion-add-remove/accordion-select-003.png
new file mode 100644
index 0000000000..0f79d9cef5
Binary files /dev/null and b/inst/apps/306-accordion-add-remove/tests/testthat/_snaps/linux-4.3/306-accordion-add-remove/accordion-select-003.png differ
diff --git a/inst/apps/306-accordion-add-remove/tests/testthat/_snaps/linux-4.3/306-accordion-add-remove/accordion-select-004.png b/inst/apps/306-accordion-add-remove/tests/testthat/_snaps/linux-4.3/306-accordion-add-remove/accordion-select-004.png
new file mode 100644
index 0000000000..ef4c3f1cef
Binary files /dev/null and b/inst/apps/306-accordion-add-remove/tests/testthat/_snaps/linux-4.3/306-accordion-add-remove/accordion-select-004.png differ
diff --git a/inst/apps/306-accordion-add-remove/tests/testthat/_snaps/linux-4.3/shinytest2/accordion-select-001.png b/inst/apps/306-accordion-add-remove/tests/testthat/_snaps/linux-4.3/shinytest2/accordion-select-001.png
deleted file mode 100644
index 1179eda1e6..0000000000
Binary files a/inst/apps/306-accordion-add-remove/tests/testthat/_snaps/linux-4.3/shinytest2/accordion-select-001.png and /dev/null differ
diff --git a/inst/apps/306-accordion-add-remove/tests/testthat/_snaps/linux-4.3/shinytest2/accordion-select-002.png b/inst/apps/306-accordion-add-remove/tests/testthat/_snaps/linux-4.3/shinytest2/accordion-select-002.png
deleted file mode 100644
index e70f2622c9..0000000000
Binary files a/inst/apps/306-accordion-add-remove/tests/testthat/_snaps/linux-4.3/shinytest2/accordion-select-002.png and /dev/null differ
diff --git a/inst/apps/306-accordion-add-remove/tests/testthat/_snaps/linux-4.3/shinytest2/accordion-select-003.png b/inst/apps/306-accordion-add-remove/tests/testthat/_snaps/linux-4.3/shinytest2/accordion-select-003.png
deleted file mode 100644
index f00908c6a4..0000000000
Binary files a/inst/apps/306-accordion-add-remove/tests/testthat/_snaps/linux-4.3/shinytest2/accordion-select-003.png and /dev/null differ
diff --git a/inst/apps/306-accordion-add-remove/tests/testthat/_snaps/linux-4.3/shinytest2/accordion-select-004.png b/inst/apps/306-accordion-add-remove/tests/testthat/_snaps/linux-4.3/shinytest2/accordion-select-004.png
deleted file mode 100644
index 682f408633..0000000000
Binary files a/inst/apps/306-accordion-add-remove/tests/testthat/_snaps/linux-4.3/shinytest2/accordion-select-004.png and /dev/null differ
diff --git a/inst/apps/306-accordion-add-remove/tests/testthat/_snaps/mac-3.6/306-accordion-add-remove/accordion-select-001.png b/inst/apps/306-accordion-add-remove/tests/testthat/_snaps/mac-3.6/306-accordion-add-remove/accordion-select-001.png
new file mode 100644
index 0000000000..3184e6054b
Binary files /dev/null and b/inst/apps/306-accordion-add-remove/tests/testthat/_snaps/mac-3.6/306-accordion-add-remove/accordion-select-001.png differ
diff --git a/inst/apps/306-accordion-add-remove/tests/testthat/_snaps/mac-3.6/306-accordion-add-remove/accordion-select-002.png b/inst/apps/306-accordion-add-remove/tests/testthat/_snaps/mac-3.6/306-accordion-add-remove/accordion-select-002.png
new file mode 100644
index 0000000000..8ed1a0228d
Binary files /dev/null and b/inst/apps/306-accordion-add-remove/tests/testthat/_snaps/mac-3.6/306-accordion-add-remove/accordion-select-002.png differ
diff --git a/inst/apps/306-accordion-add-remove/tests/testthat/_snaps/mac-3.6/306-accordion-add-remove/accordion-select-003.png b/inst/apps/306-accordion-add-remove/tests/testthat/_snaps/mac-3.6/306-accordion-add-remove/accordion-select-003.png
new file mode 100644
index 0000000000..a50077c4e3
Binary files /dev/null and b/inst/apps/306-accordion-add-remove/tests/testthat/_snaps/mac-3.6/306-accordion-add-remove/accordion-select-003.png differ
diff --git a/inst/apps/306-accordion-add-remove/tests/testthat/_snaps/mac-3.6/306-accordion-add-remove/accordion-select-004.png b/inst/apps/306-accordion-add-remove/tests/testthat/_snaps/mac-3.6/306-accordion-add-remove/accordion-select-004.png
new file mode 100644
index 0000000000..ca6fb04e4f
Binary files /dev/null and b/inst/apps/306-accordion-add-remove/tests/testthat/_snaps/mac-3.6/306-accordion-add-remove/accordion-select-004.png differ
diff --git a/inst/apps/306-accordion-add-remove/tests/testthat/_snaps/mac-3.6/shinytest2/accordion-select-001.png b/inst/apps/306-accordion-add-remove/tests/testthat/_snaps/mac-3.6/shinytest2/accordion-select-001.png
deleted file mode 100644
index 15c4f3f576..0000000000
Binary files a/inst/apps/306-accordion-add-remove/tests/testthat/_snaps/mac-3.6/shinytest2/accordion-select-001.png and /dev/null differ
diff --git a/inst/apps/306-accordion-add-remove/tests/testthat/_snaps/mac-3.6/shinytest2/accordion-select-002.png b/inst/apps/306-accordion-add-remove/tests/testthat/_snaps/mac-3.6/shinytest2/accordion-select-002.png
deleted file mode 100644
index 030ea38d12..0000000000
Binary files a/inst/apps/306-accordion-add-remove/tests/testthat/_snaps/mac-3.6/shinytest2/accordion-select-002.png and /dev/null differ
diff --git a/inst/apps/306-accordion-add-remove/tests/testthat/_snaps/mac-3.6/shinytest2/accordion-select-003.png b/inst/apps/306-accordion-add-remove/tests/testthat/_snaps/mac-3.6/shinytest2/accordion-select-003.png
deleted file mode 100644
index ee6f64a4c1..0000000000
Binary files a/inst/apps/306-accordion-add-remove/tests/testthat/_snaps/mac-3.6/shinytest2/accordion-select-003.png and /dev/null differ
diff --git a/inst/apps/306-accordion-add-remove/tests/testthat/_snaps/mac-3.6/shinytest2/accordion-select-004.png b/inst/apps/306-accordion-add-remove/tests/testthat/_snaps/mac-3.6/shinytest2/accordion-select-004.png
deleted file mode 100644
index d037d848ba..0000000000
Binary files a/inst/apps/306-accordion-add-remove/tests/testthat/_snaps/mac-3.6/shinytest2/accordion-select-004.png and /dev/null differ
diff --git a/inst/apps/306-accordion-add-remove/tests/testthat/_snaps/mac-4.0/306-accordion-add-remove/accordion-select-001.png b/inst/apps/306-accordion-add-remove/tests/testthat/_snaps/mac-4.0/306-accordion-add-remove/accordion-select-001.png
new file mode 100644
index 0000000000..192dea6d1f
Binary files /dev/null and b/inst/apps/306-accordion-add-remove/tests/testthat/_snaps/mac-4.0/306-accordion-add-remove/accordion-select-001.png differ
diff --git a/inst/apps/306-accordion-add-remove/tests/testthat/_snaps/mac-4.0/306-accordion-add-remove/accordion-select-002.png b/inst/apps/306-accordion-add-remove/tests/testthat/_snaps/mac-4.0/306-accordion-add-remove/accordion-select-002.png
new file mode 100644
index 0000000000..a1d8d99895
Binary files /dev/null and b/inst/apps/306-accordion-add-remove/tests/testthat/_snaps/mac-4.0/306-accordion-add-remove/accordion-select-002.png differ
diff --git a/inst/apps/306-accordion-add-remove/tests/testthat/_snaps/mac-4.0/306-accordion-add-remove/accordion-select-003.png b/inst/apps/306-accordion-add-remove/tests/testthat/_snaps/mac-4.0/306-accordion-add-remove/accordion-select-003.png
new file mode 100644
index 0000000000..ab3de59323
Binary files /dev/null and b/inst/apps/306-accordion-add-remove/tests/testthat/_snaps/mac-4.0/306-accordion-add-remove/accordion-select-003.png differ
diff --git a/inst/apps/306-accordion-add-remove/tests/testthat/_snaps/mac-4.0/306-accordion-add-remove/accordion-select-004.png b/inst/apps/306-accordion-add-remove/tests/testthat/_snaps/mac-4.0/306-accordion-add-remove/accordion-select-004.png
new file mode 100644
index 0000000000..3ed30a20a5
Binary files /dev/null and b/inst/apps/306-accordion-add-remove/tests/testthat/_snaps/mac-4.0/306-accordion-add-remove/accordion-select-004.png differ
diff --git a/inst/apps/306-accordion-add-remove/tests/testthat/_snaps/mac-4.0/shinytest2/accordion-select-001.png b/inst/apps/306-accordion-add-remove/tests/testthat/_snaps/mac-4.0/shinytest2/accordion-select-001.png
deleted file mode 100644
index ab88dfa48e..0000000000
Binary files a/inst/apps/306-accordion-add-remove/tests/testthat/_snaps/mac-4.0/shinytest2/accordion-select-001.png and /dev/null differ
diff --git a/inst/apps/306-accordion-add-remove/tests/testthat/_snaps/mac-4.0/shinytest2/accordion-select-002.png b/inst/apps/306-accordion-add-remove/tests/testthat/_snaps/mac-4.0/shinytest2/accordion-select-002.png
deleted file mode 100644
index 9254104409..0000000000
Binary files a/inst/apps/306-accordion-add-remove/tests/testthat/_snaps/mac-4.0/shinytest2/accordion-select-002.png and /dev/null differ
diff --git a/inst/apps/306-accordion-add-remove/tests/testthat/_snaps/mac-4.0/shinytest2/accordion-select-003.png b/inst/apps/306-accordion-add-remove/tests/testthat/_snaps/mac-4.0/shinytest2/accordion-select-003.png
deleted file mode 100644
index ee6f64a4c1..0000000000
Binary files a/inst/apps/306-accordion-add-remove/tests/testthat/_snaps/mac-4.0/shinytest2/accordion-select-003.png and /dev/null differ
diff --git a/inst/apps/306-accordion-add-remove/tests/testthat/_snaps/mac-4.0/shinytest2/accordion-select-004.png b/inst/apps/306-accordion-add-remove/tests/testthat/_snaps/mac-4.0/shinytest2/accordion-select-004.png
deleted file mode 100644
index 6b469b9282..0000000000
Binary files a/inst/apps/306-accordion-add-remove/tests/testthat/_snaps/mac-4.0/shinytest2/accordion-select-004.png and /dev/null differ
diff --git a/inst/apps/306-accordion-add-remove/tests/testthat/_snaps/mac-4.1/306-accordion-add-remove/accordion-select-001.png b/inst/apps/306-accordion-add-remove/tests/testthat/_snaps/mac-4.1/306-accordion-add-remove/accordion-select-001.png
new file mode 100644
index 0000000000..192dea6d1f
Binary files /dev/null and b/inst/apps/306-accordion-add-remove/tests/testthat/_snaps/mac-4.1/306-accordion-add-remove/accordion-select-001.png differ
diff --git a/inst/apps/306-accordion-add-remove/tests/testthat/_snaps/mac-4.1/306-accordion-add-remove/accordion-select-002.png b/inst/apps/306-accordion-add-remove/tests/testthat/_snaps/mac-4.1/306-accordion-add-remove/accordion-select-002.png
new file mode 100644
index 0000000000..afd79e2f2f
Binary files /dev/null and b/inst/apps/306-accordion-add-remove/tests/testthat/_snaps/mac-4.1/306-accordion-add-remove/accordion-select-002.png differ
diff --git a/inst/apps/306-accordion-add-remove/tests/testthat/_snaps/mac-4.1/306-accordion-add-remove/accordion-select-003.png b/inst/apps/306-accordion-add-remove/tests/testthat/_snaps/mac-4.1/306-accordion-add-remove/accordion-select-003.png
new file mode 100644
index 0000000000..ab3de59323
Binary files /dev/null and b/inst/apps/306-accordion-add-remove/tests/testthat/_snaps/mac-4.1/306-accordion-add-remove/accordion-select-003.png differ
diff --git a/inst/apps/306-accordion-add-remove/tests/testthat/_snaps/mac-4.1/306-accordion-add-remove/accordion-select-004.png b/inst/apps/306-accordion-add-remove/tests/testthat/_snaps/mac-4.1/306-accordion-add-remove/accordion-select-004.png
new file mode 100644
index 0000000000..3ed30a20a5
Binary files /dev/null and b/inst/apps/306-accordion-add-remove/tests/testthat/_snaps/mac-4.1/306-accordion-add-remove/accordion-select-004.png differ
diff --git a/inst/apps/306-accordion-add-remove/tests/testthat/_snaps/mac-4.1/shinytest2/accordion-select-001.png b/inst/apps/306-accordion-add-remove/tests/testthat/_snaps/mac-4.1/shinytest2/accordion-select-001.png
deleted file mode 100644
index da8f73e3e1..0000000000
Binary files a/inst/apps/306-accordion-add-remove/tests/testthat/_snaps/mac-4.1/shinytest2/accordion-select-001.png and /dev/null differ
diff --git a/inst/apps/306-accordion-add-remove/tests/testthat/_snaps/mac-4.1/shinytest2/accordion-select-002.png b/inst/apps/306-accordion-add-remove/tests/testthat/_snaps/mac-4.1/shinytest2/accordion-select-002.png
deleted file mode 100644
index 9e6abeb886..0000000000
Binary files a/inst/apps/306-accordion-add-remove/tests/testthat/_snaps/mac-4.1/shinytest2/accordion-select-002.png and /dev/null differ
diff --git a/inst/apps/306-accordion-add-remove/tests/testthat/_snaps/mac-4.1/shinytest2/accordion-select-003.png b/inst/apps/306-accordion-add-remove/tests/testthat/_snaps/mac-4.1/shinytest2/accordion-select-003.png
deleted file mode 100644
index 0410aade14..0000000000
Binary files a/inst/apps/306-accordion-add-remove/tests/testthat/_snaps/mac-4.1/shinytest2/accordion-select-003.png and /dev/null differ
diff --git a/inst/apps/306-accordion-add-remove/tests/testthat/_snaps/mac-4.1/shinytest2/accordion-select-004.png b/inst/apps/306-accordion-add-remove/tests/testthat/_snaps/mac-4.1/shinytest2/accordion-select-004.png
deleted file mode 100644
index 5e3d6f5158..0000000000
Binary files a/inst/apps/306-accordion-add-remove/tests/testthat/_snaps/mac-4.1/shinytest2/accordion-select-004.png and /dev/null differ
diff --git a/inst/apps/306-accordion-add-remove/tests/testthat/_snaps/mac-4.2/306-accordion-add-remove/accordion-select-001.png b/inst/apps/306-accordion-add-remove/tests/testthat/_snaps/mac-4.2/306-accordion-add-remove/accordion-select-001.png
new file mode 100644
index 0000000000..192dea6d1f
Binary files /dev/null and b/inst/apps/306-accordion-add-remove/tests/testthat/_snaps/mac-4.2/306-accordion-add-remove/accordion-select-001.png differ
diff --git a/inst/apps/306-accordion-add-remove/tests/testthat/_snaps/mac-4.2/306-accordion-add-remove/accordion-select-002.png b/inst/apps/306-accordion-add-remove/tests/testthat/_snaps/mac-4.2/306-accordion-add-remove/accordion-select-002.png
new file mode 100644
index 0000000000..a1d8d99895
Binary files /dev/null and b/inst/apps/306-accordion-add-remove/tests/testthat/_snaps/mac-4.2/306-accordion-add-remove/accordion-select-002.png differ
diff --git a/inst/apps/306-accordion-add-remove/tests/testthat/_snaps/mac-4.2/306-accordion-add-remove/accordion-select-003.png b/inst/apps/306-accordion-add-remove/tests/testthat/_snaps/mac-4.2/306-accordion-add-remove/accordion-select-003.png
new file mode 100644
index 0000000000..ab3de59323
Binary files /dev/null and b/inst/apps/306-accordion-add-remove/tests/testthat/_snaps/mac-4.2/306-accordion-add-remove/accordion-select-003.png differ
diff --git a/inst/apps/306-accordion-add-remove/tests/testthat/_snaps/mac-4.2/306-accordion-add-remove/accordion-select-004.png b/inst/apps/306-accordion-add-remove/tests/testthat/_snaps/mac-4.2/306-accordion-add-remove/accordion-select-004.png
new file mode 100644
index 0000000000..3ed30a20a5
Binary files /dev/null and b/inst/apps/306-accordion-add-remove/tests/testthat/_snaps/mac-4.2/306-accordion-add-remove/accordion-select-004.png differ
diff --git a/inst/apps/306-accordion-add-remove/tests/testthat/_snaps/mac-4.2/shinytest2/accordion-select-001.png b/inst/apps/306-accordion-add-remove/tests/testthat/_snaps/mac-4.2/shinytest2/accordion-select-001.png
deleted file mode 100644
index ab88dfa48e..0000000000
Binary files a/inst/apps/306-accordion-add-remove/tests/testthat/_snaps/mac-4.2/shinytest2/accordion-select-001.png and /dev/null differ
diff --git a/inst/apps/306-accordion-add-remove/tests/testthat/_snaps/mac-4.2/shinytest2/accordion-select-002.png b/inst/apps/306-accordion-add-remove/tests/testthat/_snaps/mac-4.2/shinytest2/accordion-select-002.png
deleted file mode 100644
index 030ea38d12..0000000000
Binary files a/inst/apps/306-accordion-add-remove/tests/testthat/_snaps/mac-4.2/shinytest2/accordion-select-002.png and /dev/null differ
diff --git a/inst/apps/306-accordion-add-remove/tests/testthat/_snaps/mac-4.2/shinytest2/accordion-select-003.png b/inst/apps/306-accordion-add-remove/tests/testthat/_snaps/mac-4.2/shinytest2/accordion-select-003.png
deleted file mode 100644
index ee6f64a4c1..0000000000
Binary files a/inst/apps/306-accordion-add-remove/tests/testthat/_snaps/mac-4.2/shinytest2/accordion-select-003.png and /dev/null differ
diff --git a/inst/apps/306-accordion-add-remove/tests/testthat/_snaps/mac-4.2/shinytest2/accordion-select-004.png b/inst/apps/306-accordion-add-remove/tests/testthat/_snaps/mac-4.2/shinytest2/accordion-select-004.png
deleted file mode 100644
index 6b469b9282..0000000000
Binary files a/inst/apps/306-accordion-add-remove/tests/testthat/_snaps/mac-4.2/shinytest2/accordion-select-004.png and /dev/null differ
diff --git a/inst/apps/306-accordion-add-remove/tests/testthat/_snaps/mac-4.3/306-accordion-add-remove/accordion-select-001.png b/inst/apps/306-accordion-add-remove/tests/testthat/_snaps/mac-4.3/306-accordion-add-remove/accordion-select-001.png
new file mode 100644
index 0000000000..192dea6d1f
Binary files /dev/null and b/inst/apps/306-accordion-add-remove/tests/testthat/_snaps/mac-4.3/306-accordion-add-remove/accordion-select-001.png differ
diff --git a/inst/apps/306-accordion-add-remove/tests/testthat/_snaps/mac-4.3/306-accordion-add-remove/accordion-select-002.png b/inst/apps/306-accordion-add-remove/tests/testthat/_snaps/mac-4.3/306-accordion-add-remove/accordion-select-002.png
new file mode 100644
index 0000000000..a1d8d99895
Binary files /dev/null and b/inst/apps/306-accordion-add-remove/tests/testthat/_snaps/mac-4.3/306-accordion-add-remove/accordion-select-002.png differ
diff --git a/inst/apps/306-accordion-add-remove/tests/testthat/_snaps/mac-4.3/306-accordion-add-remove/accordion-select-003.png b/inst/apps/306-accordion-add-remove/tests/testthat/_snaps/mac-4.3/306-accordion-add-remove/accordion-select-003.png
new file mode 100644
index 0000000000..ab3de59323
Binary files /dev/null and b/inst/apps/306-accordion-add-remove/tests/testthat/_snaps/mac-4.3/306-accordion-add-remove/accordion-select-003.png differ
diff --git a/inst/apps/306-accordion-add-remove/tests/testthat/_snaps/mac-4.3/306-accordion-add-remove/accordion-select-004.png b/inst/apps/306-accordion-add-remove/tests/testthat/_snaps/mac-4.3/306-accordion-add-remove/accordion-select-004.png
new file mode 100644
index 0000000000..3ed30a20a5
Binary files /dev/null and b/inst/apps/306-accordion-add-remove/tests/testthat/_snaps/mac-4.3/306-accordion-add-remove/accordion-select-004.png differ
diff --git a/inst/apps/306-accordion-add-remove/tests/testthat/_snaps/mac-4.3/shinytest2/accordion-select-001.png b/inst/apps/306-accordion-add-remove/tests/testthat/_snaps/mac-4.3/shinytest2/accordion-select-001.png
deleted file mode 100644
index da8f73e3e1..0000000000
Binary files a/inst/apps/306-accordion-add-remove/tests/testthat/_snaps/mac-4.3/shinytest2/accordion-select-001.png and /dev/null differ
diff --git a/inst/apps/306-accordion-add-remove/tests/testthat/_snaps/mac-4.3/shinytest2/accordion-select-002.png b/inst/apps/306-accordion-add-remove/tests/testthat/_snaps/mac-4.3/shinytest2/accordion-select-002.png
deleted file mode 100644
index 9254104409..0000000000
Binary files a/inst/apps/306-accordion-add-remove/tests/testthat/_snaps/mac-4.3/shinytest2/accordion-select-002.png and /dev/null differ
diff --git a/inst/apps/306-accordion-add-remove/tests/testthat/_snaps/mac-4.3/shinytest2/accordion-select-003.png b/inst/apps/306-accordion-add-remove/tests/testthat/_snaps/mac-4.3/shinytest2/accordion-select-003.png
deleted file mode 100644
index 0410aade14..0000000000
Binary files a/inst/apps/306-accordion-add-remove/tests/testthat/_snaps/mac-4.3/shinytest2/accordion-select-003.png and /dev/null differ
diff --git a/inst/apps/306-accordion-add-remove/tests/testthat/_snaps/mac-4.3/shinytest2/accordion-select-004.png b/inst/apps/306-accordion-add-remove/tests/testthat/_snaps/mac-4.3/shinytest2/accordion-select-004.png
deleted file mode 100644
index 5e3d6f5158..0000000000
Binary files a/inst/apps/306-accordion-add-remove/tests/testthat/_snaps/mac-4.3/shinytest2/accordion-select-004.png and /dev/null differ
diff --git a/inst/apps/306-accordion-add-remove/tests/testthat/_snaps/windows-3.6/306-accordion-add-remove/accordion-select-001.png b/inst/apps/306-accordion-add-remove/tests/testthat/_snaps/windows-3.6/306-accordion-add-remove/accordion-select-001.png
new file mode 100644
index 0000000000..3184e6054b
Binary files /dev/null and b/inst/apps/306-accordion-add-remove/tests/testthat/_snaps/windows-3.6/306-accordion-add-remove/accordion-select-001.png differ
diff --git a/inst/apps/306-accordion-add-remove/tests/testthat/_snaps/windows-3.6/306-accordion-add-remove/accordion-select-002.png b/inst/apps/306-accordion-add-remove/tests/testthat/_snaps/windows-3.6/306-accordion-add-remove/accordion-select-002.png
new file mode 100644
index 0000000000..8ed1a0228d
Binary files /dev/null and b/inst/apps/306-accordion-add-remove/tests/testthat/_snaps/windows-3.6/306-accordion-add-remove/accordion-select-002.png differ
diff --git a/inst/apps/306-accordion-add-remove/tests/testthat/_snaps/windows-3.6/306-accordion-add-remove/accordion-select-003.png b/inst/apps/306-accordion-add-remove/tests/testthat/_snaps/windows-3.6/306-accordion-add-remove/accordion-select-003.png
new file mode 100644
index 0000000000..a50077c4e3
Binary files /dev/null and b/inst/apps/306-accordion-add-remove/tests/testthat/_snaps/windows-3.6/306-accordion-add-remove/accordion-select-003.png differ
diff --git a/inst/apps/306-accordion-add-remove/tests/testthat/_snaps/windows-3.6/306-accordion-add-remove/accordion-select-004.png b/inst/apps/306-accordion-add-remove/tests/testthat/_snaps/windows-3.6/306-accordion-add-remove/accordion-select-004.png
new file mode 100644
index 0000000000..ca6fb04e4f
Binary files /dev/null and b/inst/apps/306-accordion-add-remove/tests/testthat/_snaps/windows-3.6/306-accordion-add-remove/accordion-select-004.png differ
diff --git a/inst/apps/306-accordion-add-remove/tests/testthat/_snaps/windows-3.6/shinytest2/accordion-select-001.png b/inst/apps/306-accordion-add-remove/tests/testthat/_snaps/windows-3.6/shinytest2/accordion-select-001.png
deleted file mode 100644
index 2a6b859904..0000000000
Binary files a/inst/apps/306-accordion-add-remove/tests/testthat/_snaps/windows-3.6/shinytest2/accordion-select-001.png and /dev/null differ
diff --git a/inst/apps/306-accordion-add-remove/tests/testthat/_snaps/windows-3.6/shinytest2/accordion-select-002.png b/inst/apps/306-accordion-add-remove/tests/testthat/_snaps/windows-3.6/shinytest2/accordion-select-002.png
deleted file mode 100644
index e4f3a0b214..0000000000
Binary files a/inst/apps/306-accordion-add-remove/tests/testthat/_snaps/windows-3.6/shinytest2/accordion-select-002.png and /dev/null differ
diff --git a/inst/apps/306-accordion-add-remove/tests/testthat/_snaps/windows-3.6/shinytest2/accordion-select-003.png b/inst/apps/306-accordion-add-remove/tests/testthat/_snaps/windows-3.6/shinytest2/accordion-select-003.png
deleted file mode 100644
index 6892b3ffad..0000000000
Binary files a/inst/apps/306-accordion-add-remove/tests/testthat/_snaps/windows-3.6/shinytest2/accordion-select-003.png and /dev/null differ
diff --git a/inst/apps/306-accordion-add-remove/tests/testthat/_snaps/windows-3.6/shinytest2/accordion-select-004.png b/inst/apps/306-accordion-add-remove/tests/testthat/_snaps/windows-3.6/shinytest2/accordion-select-004.png
deleted file mode 100644
index 492babd972..0000000000
Binary files a/inst/apps/306-accordion-add-remove/tests/testthat/_snaps/windows-3.6/shinytest2/accordion-select-004.png and /dev/null differ
diff --git a/inst/apps/306-accordion-add-remove/tests/testthat/_snaps/windows-4.0/306-accordion-add-remove/accordion-select-001.png b/inst/apps/306-accordion-add-remove/tests/testthat/_snaps/windows-4.0/306-accordion-add-remove/accordion-select-001.png
new file mode 100644
index 0000000000..3184e6054b
Binary files /dev/null and b/inst/apps/306-accordion-add-remove/tests/testthat/_snaps/windows-4.0/306-accordion-add-remove/accordion-select-001.png differ
diff --git a/inst/apps/306-accordion-add-remove/tests/testthat/_snaps/windows-4.0/306-accordion-add-remove/accordion-select-002.png b/inst/apps/306-accordion-add-remove/tests/testthat/_snaps/windows-4.0/306-accordion-add-remove/accordion-select-002.png
new file mode 100644
index 0000000000..8ed1a0228d
Binary files /dev/null and b/inst/apps/306-accordion-add-remove/tests/testthat/_snaps/windows-4.0/306-accordion-add-remove/accordion-select-002.png differ
diff --git a/inst/apps/306-accordion-add-remove/tests/testthat/_snaps/windows-4.0/306-accordion-add-remove/accordion-select-003.png b/inst/apps/306-accordion-add-remove/tests/testthat/_snaps/windows-4.0/306-accordion-add-remove/accordion-select-003.png
new file mode 100644
index 0000000000..a50077c4e3
Binary files /dev/null and b/inst/apps/306-accordion-add-remove/tests/testthat/_snaps/windows-4.0/306-accordion-add-remove/accordion-select-003.png differ
diff --git a/inst/apps/306-accordion-add-remove/tests/testthat/_snaps/windows-4.0/306-accordion-add-remove/accordion-select-004.png b/inst/apps/306-accordion-add-remove/tests/testthat/_snaps/windows-4.0/306-accordion-add-remove/accordion-select-004.png
new file mode 100644
index 0000000000..ca6fb04e4f
Binary files /dev/null and b/inst/apps/306-accordion-add-remove/tests/testthat/_snaps/windows-4.0/306-accordion-add-remove/accordion-select-004.png differ
diff --git a/inst/apps/306-accordion-add-remove/tests/testthat/_snaps/windows-4.0/shinytest2/accordion-select-001.png b/inst/apps/306-accordion-add-remove/tests/testthat/_snaps/windows-4.0/shinytest2/accordion-select-001.png
deleted file mode 100644
index 2a6b859904..0000000000
Binary files a/inst/apps/306-accordion-add-remove/tests/testthat/_snaps/windows-4.0/shinytest2/accordion-select-001.png and /dev/null differ
diff --git a/inst/apps/306-accordion-add-remove/tests/testthat/_snaps/windows-4.0/shinytest2/accordion-select-002.png b/inst/apps/306-accordion-add-remove/tests/testthat/_snaps/windows-4.0/shinytest2/accordion-select-002.png
deleted file mode 100644
index e4f3a0b214..0000000000
Binary files a/inst/apps/306-accordion-add-remove/tests/testthat/_snaps/windows-4.0/shinytest2/accordion-select-002.png and /dev/null differ
diff --git a/inst/apps/306-accordion-add-remove/tests/testthat/_snaps/windows-4.0/shinytest2/accordion-select-003.png b/inst/apps/306-accordion-add-remove/tests/testthat/_snaps/windows-4.0/shinytest2/accordion-select-003.png
deleted file mode 100644
index 6892b3ffad..0000000000
Binary files a/inst/apps/306-accordion-add-remove/tests/testthat/_snaps/windows-4.0/shinytest2/accordion-select-003.png and /dev/null differ
diff --git a/inst/apps/306-accordion-add-remove/tests/testthat/_snaps/windows-4.0/shinytest2/accordion-select-004.png b/inst/apps/306-accordion-add-remove/tests/testthat/_snaps/windows-4.0/shinytest2/accordion-select-004.png
deleted file mode 100644
index 492babd972..0000000000
Binary files a/inst/apps/306-accordion-add-remove/tests/testthat/_snaps/windows-4.0/shinytest2/accordion-select-004.png and /dev/null differ
diff --git a/inst/apps/306-accordion-add-remove/tests/testthat/_snaps/windows-4.1/306-accordion-add-remove/accordion-select-001.png b/inst/apps/306-accordion-add-remove/tests/testthat/_snaps/windows-4.1/306-accordion-add-remove/accordion-select-001.png
new file mode 100644
index 0000000000..3184e6054b
Binary files /dev/null and b/inst/apps/306-accordion-add-remove/tests/testthat/_snaps/windows-4.1/306-accordion-add-remove/accordion-select-001.png differ
diff --git a/inst/apps/306-accordion-add-remove/tests/testthat/_snaps/windows-4.1/306-accordion-add-remove/accordion-select-002.png b/inst/apps/306-accordion-add-remove/tests/testthat/_snaps/windows-4.1/306-accordion-add-remove/accordion-select-002.png
new file mode 100644
index 0000000000..8ed1a0228d
Binary files /dev/null and b/inst/apps/306-accordion-add-remove/tests/testthat/_snaps/windows-4.1/306-accordion-add-remove/accordion-select-002.png differ
diff --git a/inst/apps/306-accordion-add-remove/tests/testthat/_snaps/windows-4.1/306-accordion-add-remove/accordion-select-003.png b/inst/apps/306-accordion-add-remove/tests/testthat/_snaps/windows-4.1/306-accordion-add-remove/accordion-select-003.png
new file mode 100644
index 0000000000..a50077c4e3
Binary files /dev/null and b/inst/apps/306-accordion-add-remove/tests/testthat/_snaps/windows-4.1/306-accordion-add-remove/accordion-select-003.png differ
diff --git a/inst/apps/306-accordion-add-remove/tests/testthat/_snaps/windows-4.1/306-accordion-add-remove/accordion-select-004.png b/inst/apps/306-accordion-add-remove/tests/testthat/_snaps/windows-4.1/306-accordion-add-remove/accordion-select-004.png
new file mode 100644
index 0000000000..ca6fb04e4f
Binary files /dev/null and b/inst/apps/306-accordion-add-remove/tests/testthat/_snaps/windows-4.1/306-accordion-add-remove/accordion-select-004.png differ
diff --git a/inst/apps/306-accordion-add-remove/tests/testthat/_snaps/windows-4.1/shinytest2/accordion-select-001.png b/inst/apps/306-accordion-add-remove/tests/testthat/_snaps/windows-4.1/shinytest2/accordion-select-001.png
deleted file mode 100644
index 501bf7a0a5..0000000000
Binary files a/inst/apps/306-accordion-add-remove/tests/testthat/_snaps/windows-4.1/shinytest2/accordion-select-001.png and /dev/null differ
diff --git a/inst/apps/306-accordion-add-remove/tests/testthat/_snaps/windows-4.1/shinytest2/accordion-select-002.png b/inst/apps/306-accordion-add-remove/tests/testthat/_snaps/windows-4.1/shinytest2/accordion-select-002.png
deleted file mode 100644
index afb434ac5d..0000000000
Binary files a/inst/apps/306-accordion-add-remove/tests/testthat/_snaps/windows-4.1/shinytest2/accordion-select-002.png and /dev/null differ
diff --git a/inst/apps/306-accordion-add-remove/tests/testthat/_snaps/windows-4.1/shinytest2/accordion-select-003.png b/inst/apps/306-accordion-add-remove/tests/testthat/_snaps/windows-4.1/shinytest2/accordion-select-003.png
deleted file mode 100644
index b7659541a0..0000000000
Binary files a/inst/apps/306-accordion-add-remove/tests/testthat/_snaps/windows-4.1/shinytest2/accordion-select-003.png and /dev/null differ
diff --git a/inst/apps/306-accordion-add-remove/tests/testthat/_snaps/windows-4.1/shinytest2/accordion-select-004.png b/inst/apps/306-accordion-add-remove/tests/testthat/_snaps/windows-4.1/shinytest2/accordion-select-004.png
deleted file mode 100644
index 612ea7cfa4..0000000000
Binary files a/inst/apps/306-accordion-add-remove/tests/testthat/_snaps/windows-4.1/shinytest2/accordion-select-004.png and /dev/null differ
diff --git a/inst/apps/306-accordion-add-remove/tests/testthat/_snaps/windows-4.2/306-accordion-add-remove/accordion-select-001.png b/inst/apps/306-accordion-add-remove/tests/testthat/_snaps/windows-4.2/306-accordion-add-remove/accordion-select-001.png
new file mode 100644
index 0000000000..8d965a6081
Binary files /dev/null and b/inst/apps/306-accordion-add-remove/tests/testthat/_snaps/windows-4.2/306-accordion-add-remove/accordion-select-001.png differ
diff --git a/inst/apps/306-accordion-add-remove/tests/testthat/_snaps/windows-4.2/306-accordion-add-remove/accordion-select-002.png b/inst/apps/306-accordion-add-remove/tests/testthat/_snaps/windows-4.2/306-accordion-add-remove/accordion-select-002.png
new file mode 100644
index 0000000000..194caf4166
Binary files /dev/null and b/inst/apps/306-accordion-add-remove/tests/testthat/_snaps/windows-4.2/306-accordion-add-remove/accordion-select-002.png differ
diff --git a/inst/apps/306-accordion-add-remove/tests/testthat/_snaps/windows-4.2/306-accordion-add-remove/accordion-select-003.png b/inst/apps/306-accordion-add-remove/tests/testthat/_snaps/windows-4.2/306-accordion-add-remove/accordion-select-003.png
new file mode 100644
index 0000000000..1feaf2d574
Binary files /dev/null and b/inst/apps/306-accordion-add-remove/tests/testthat/_snaps/windows-4.2/306-accordion-add-remove/accordion-select-003.png differ
diff --git a/inst/apps/306-accordion-add-remove/tests/testthat/_snaps/windows-4.2/306-accordion-add-remove/accordion-select-004.png b/inst/apps/306-accordion-add-remove/tests/testthat/_snaps/windows-4.2/306-accordion-add-remove/accordion-select-004.png
new file mode 100644
index 0000000000..36a2c4c963
Binary files /dev/null and b/inst/apps/306-accordion-add-remove/tests/testthat/_snaps/windows-4.2/306-accordion-add-remove/accordion-select-004.png differ
diff --git a/inst/apps/306-accordion-add-remove/tests/testthat/_snaps/windows-4.2/shinytest2/accordion-select-001.png b/inst/apps/306-accordion-add-remove/tests/testthat/_snaps/windows-4.2/shinytest2/accordion-select-001.png
deleted file mode 100644
index 501bf7a0a5..0000000000
Binary files a/inst/apps/306-accordion-add-remove/tests/testthat/_snaps/windows-4.2/shinytest2/accordion-select-001.png and /dev/null differ
diff --git a/inst/apps/306-accordion-add-remove/tests/testthat/_snaps/windows-4.2/shinytest2/accordion-select-002.png b/inst/apps/306-accordion-add-remove/tests/testthat/_snaps/windows-4.2/shinytest2/accordion-select-002.png
deleted file mode 100644
index afb434ac5d..0000000000
Binary files a/inst/apps/306-accordion-add-remove/tests/testthat/_snaps/windows-4.2/shinytest2/accordion-select-002.png and /dev/null differ
diff --git a/inst/apps/306-accordion-add-remove/tests/testthat/_snaps/windows-4.2/shinytest2/accordion-select-003.png b/inst/apps/306-accordion-add-remove/tests/testthat/_snaps/windows-4.2/shinytest2/accordion-select-003.png
deleted file mode 100644
index b7659541a0..0000000000
Binary files a/inst/apps/306-accordion-add-remove/tests/testthat/_snaps/windows-4.2/shinytest2/accordion-select-003.png and /dev/null differ
diff --git a/inst/apps/306-accordion-add-remove/tests/testthat/_snaps/windows-4.2/shinytest2/accordion-select-004.png b/inst/apps/306-accordion-add-remove/tests/testthat/_snaps/windows-4.2/shinytest2/accordion-select-004.png
deleted file mode 100644
index 612ea7cfa4..0000000000
Binary files a/inst/apps/306-accordion-add-remove/tests/testthat/_snaps/windows-4.2/shinytest2/accordion-select-004.png and /dev/null differ
diff --git a/inst/apps/306-accordion-add-remove/tests/testthat/_snaps/windows-4.3/306-accordion-add-remove/accordion-select-001.png b/inst/apps/306-accordion-add-remove/tests/testthat/_snaps/windows-4.3/306-accordion-add-remove/accordion-select-001.png
new file mode 100644
index 0000000000..8d965a6081
Binary files /dev/null and b/inst/apps/306-accordion-add-remove/tests/testthat/_snaps/windows-4.3/306-accordion-add-remove/accordion-select-001.png differ
diff --git a/inst/apps/306-accordion-add-remove/tests/testthat/_snaps/windows-4.3/306-accordion-add-remove/accordion-select-002.png b/inst/apps/306-accordion-add-remove/tests/testthat/_snaps/windows-4.3/306-accordion-add-remove/accordion-select-002.png
new file mode 100644
index 0000000000..28fcc3f5cb
Binary files /dev/null and b/inst/apps/306-accordion-add-remove/tests/testthat/_snaps/windows-4.3/306-accordion-add-remove/accordion-select-002.png differ
diff --git a/inst/apps/306-accordion-add-remove/tests/testthat/_snaps/windows-4.3/306-accordion-add-remove/accordion-select-003.png b/inst/apps/306-accordion-add-remove/tests/testthat/_snaps/windows-4.3/306-accordion-add-remove/accordion-select-003.png
new file mode 100644
index 0000000000..1feaf2d574
Binary files /dev/null and b/inst/apps/306-accordion-add-remove/tests/testthat/_snaps/windows-4.3/306-accordion-add-remove/accordion-select-003.png differ
diff --git a/inst/apps/306-accordion-add-remove/tests/testthat/_snaps/windows-4.3/306-accordion-add-remove/accordion-select-004.png b/inst/apps/306-accordion-add-remove/tests/testthat/_snaps/windows-4.3/306-accordion-add-remove/accordion-select-004.png
new file mode 100644
index 0000000000..36a2c4c963
Binary files /dev/null and b/inst/apps/306-accordion-add-remove/tests/testthat/_snaps/windows-4.3/306-accordion-add-remove/accordion-select-004.png differ
diff --git a/inst/apps/306-accordion-add-remove/tests/testthat/_snaps/windows-4.3/shinytest2/accordion-select-001.png b/inst/apps/306-accordion-add-remove/tests/testthat/_snaps/windows-4.3/shinytest2/accordion-select-001.png
deleted file mode 100644
index 6d3a74a91a..0000000000
Binary files a/inst/apps/306-accordion-add-remove/tests/testthat/_snaps/windows-4.3/shinytest2/accordion-select-001.png and /dev/null differ
diff --git a/inst/apps/306-accordion-add-remove/tests/testthat/_snaps/windows-4.3/shinytest2/accordion-select-002.png b/inst/apps/306-accordion-add-remove/tests/testthat/_snaps/windows-4.3/shinytest2/accordion-select-002.png
deleted file mode 100644
index afb434ac5d..0000000000
Binary files a/inst/apps/306-accordion-add-remove/tests/testthat/_snaps/windows-4.3/shinytest2/accordion-select-002.png and /dev/null differ
diff --git a/inst/apps/306-accordion-add-remove/tests/testthat/_snaps/windows-4.3/shinytest2/accordion-select-003.png b/inst/apps/306-accordion-add-remove/tests/testthat/_snaps/windows-4.3/shinytest2/accordion-select-003.png
deleted file mode 100644
index b7659541a0..0000000000
Binary files a/inst/apps/306-accordion-add-remove/tests/testthat/_snaps/windows-4.3/shinytest2/accordion-select-003.png and /dev/null differ
diff --git a/inst/apps/306-accordion-add-remove/tests/testthat/_snaps/windows-4.3/shinytest2/accordion-select-004.png b/inst/apps/306-accordion-add-remove/tests/testthat/_snaps/windows-4.3/shinytest2/accordion-select-004.png
deleted file mode 100644
index 612ea7cfa4..0000000000
Binary files a/inst/apps/306-accordion-add-remove/tests/testthat/_snaps/windows-4.3/shinytest2/accordion-select-004.png and /dev/null differ
diff --git a/inst/apps/306-accordion-add-remove/tests/testthat/test-shinytest2.R b/inst/apps/306-accordion-add-remove/tests/testthat/test-306-accordion-add-remove.R
similarity index 88%
rename from inst/apps/306-accordion-add-remove/tests/testthat/test-shinytest2.R
rename to inst/apps/306-accordion-add-remove/tests/testthat/test-306-accordion-add-remove.R
index c9db76b6e6..1f21c1bf1a 100644
--- a/inst/apps/306-accordion-add-remove/tests/testthat/test-shinytest2.R
+++ b/inst/apps/306-accordion-add-remove/tests/testthat/test-306-accordion-add-remove.R
@@ -8,7 +8,12 @@ test_that("{shinytest2} recording: accordion-select", {
     variant = platform_variant(), name = "accordion-select",
     height = height, width = width,
     view = interactive(),
-    options = list(bslib.precompiled = FALSE)
+    options = list(bslib.precompiled = FALSE),
+    screenshot_args = list(
+      delay = 0.5,
+      selector = "viewport",
+      options = list(captureBeyondViewport = FALSE)
+    )
   )
 
   # Make sure the set_input() calls complete in order
diff --git a/inst/apps/308-sidebar-kitchen-sink/app.R b/inst/apps/308-sidebar-kitchen-sink/app.R
index 930c10d290..db1f6cc525 100644
--- a/inst/apps/308-sidebar-kitchen-sink/app.R
+++ b/inst/apps/308-sidebar-kitchen-sink/app.R
@@ -7,10 +7,18 @@ plotly_bars <- plot_ly(x = LETTERS[1:3], y = 1:3) %>%
   add_bars()
 
 sidebar_long <- sidebar(lorem::ipsum(3, 3))
-sidebar_short <- sidebar(
-  p("A simple sidebar"),
-  actionButton("foo", "This button does nothing")
-)
+sidebar_short <- local({
+  i <- 0
+  function() {
+    i <<- i + 1
+    sidebar(
+      p("A simple", code("sidebar")),
+      actionButton(sprintf("foo-%d", i), "This button does nothing"),
+      bg = "#1F77B4",
+      `data-bs-theme` = "dark"
+    )
+  }
+})
 
 ui <- page_navbar(
   title = "Sidebar kitchen sink",
@@ -21,12 +29,15 @@ ui <- page_navbar(
     position = "right",
     id = "global_sidebar",
     bg = "#1E1E1E",
+    `data-bs-theme` = "dark",
     shiny::markdown(
       "Learn more about `bslib::sidebar()` [here](https://rstudio.github.io/bslib/articles/sidebars.html)"
     )
   ),
   header = tagList(
-    tags$style(HTML(".plotly .modebar-container { display: none; }")),
+    tags$style(HTML("
+      .plotly .modebar-container { display: none; }
+    ")),
     span("header", class = "bg-dark"),
     span("content", class = "bg-dark")
   ),
@@ -37,10 +48,10 @@ ui <- page_navbar(
   nav_panel(
     "Fill",
     plotly_bars,
-    layout_sidebar(plotly_bars, sidebar = sidebar_short),
+    layout_sidebar(plotly_bars, sidebar = sidebar_short()),
     card(
       card_header("Depth"),
-      layout_sidebar(plotly_bars, sidebar = sidebar_short)
+      layout_sidebar(plotly_bars, sidebar = sidebar_short())
     )
   ),
   nav_panel(
diff --git a/inst/apps/308-sidebar-kitchen-sink/tests/testthat/_snaps/mac-4.3/308-sidebar-kitchen-sink/308-sidebar-kitchen-sink-001.png b/inst/apps/308-sidebar-kitchen-sink/tests/testthat/_snaps/mac-4.3/308-sidebar-kitchen-sink/308-sidebar-kitchen-sink-001.png
new file mode 100644
index 0000000000..3de99a96f6
Binary files /dev/null and b/inst/apps/308-sidebar-kitchen-sink/tests/testthat/_snaps/mac-4.3/308-sidebar-kitchen-sink/308-sidebar-kitchen-sink-001.png differ
diff --git a/inst/apps/308-sidebar-kitchen-sink/tests/testthat/_snaps/mac-4.3/308-sidebar-kitchen-sink/308-sidebar-kitchen-sink-002.png b/inst/apps/308-sidebar-kitchen-sink/tests/testthat/_snaps/mac-4.3/308-sidebar-kitchen-sink/308-sidebar-kitchen-sink-002.png
new file mode 100644
index 0000000000..41504b24dc
Binary files /dev/null and b/inst/apps/308-sidebar-kitchen-sink/tests/testthat/_snaps/mac-4.3/308-sidebar-kitchen-sink/308-sidebar-kitchen-sink-002.png differ
diff --git a/inst/apps/308-sidebar-kitchen-sink/tests/testthat/_snaps/mac-4.3/308-sidebar-kitchen-sink/308-sidebar-kitchen-sink-003.png b/inst/apps/308-sidebar-kitchen-sink/tests/testthat/_snaps/mac-4.3/308-sidebar-kitchen-sink/308-sidebar-kitchen-sink-003.png
new file mode 100644
index 0000000000..5e260ec260
Binary files /dev/null and b/inst/apps/308-sidebar-kitchen-sink/tests/testthat/_snaps/mac-4.3/308-sidebar-kitchen-sink/308-sidebar-kitchen-sink-003.png differ
diff --git a/inst/apps/308-sidebar-kitchen-sink/tests/testthat/_snaps/mac-4.3/308-sidebar-kitchen-sink/308-sidebar-kitchen-sink-004.png b/inst/apps/308-sidebar-kitchen-sink/tests/testthat/_snaps/mac-4.3/308-sidebar-kitchen-sink/308-sidebar-kitchen-sink-004.png
new file mode 100644
index 0000000000..e5f1744083
Binary files /dev/null and b/inst/apps/308-sidebar-kitchen-sink/tests/testthat/_snaps/mac-4.3/308-sidebar-kitchen-sink/308-sidebar-kitchen-sink-004.png differ
diff --git a/inst/apps/308-sidebar-kitchen-sink/tests/testthat/_snaps/mac-4.3/308-sidebar-kitchen-sink/308-sidebar-kitchen-sink-005.png b/inst/apps/308-sidebar-kitchen-sink/tests/testthat/_snaps/mac-4.3/308-sidebar-kitchen-sink/308-sidebar-kitchen-sink-005.png
new file mode 100644
index 0000000000..aeb2992b66
Binary files /dev/null and b/inst/apps/308-sidebar-kitchen-sink/tests/testthat/_snaps/mac-4.3/308-sidebar-kitchen-sink/308-sidebar-kitchen-sink-005.png differ
diff --git a/inst/apps/308-sidebar-kitchen-sink/tests/testthat/_snaps/mac-4.3/308-sidebar-kitchen-sink/308-sidebar-kitchen-sink-006.png b/inst/apps/308-sidebar-kitchen-sink/tests/testthat/_snaps/mac-4.3/308-sidebar-kitchen-sink/308-sidebar-kitchen-sink-006.png
new file mode 100644
index 0000000000..0e9a6e1470
Binary files /dev/null and b/inst/apps/308-sidebar-kitchen-sink/tests/testthat/_snaps/mac-4.3/308-sidebar-kitchen-sink/308-sidebar-kitchen-sink-006.png differ
diff --git a/inst/apps/308-sidebar-kitchen-sink/tests/testthat/_snaps/mac-4.3/shinytest2/308-sidebar-kitchen-sink-001.png b/inst/apps/308-sidebar-kitchen-sink/tests/testthat/_snaps/mac-4.3/shinytest2/308-sidebar-kitchen-sink-001.png
deleted file mode 100644
index 35efb43fac..0000000000
Binary files a/inst/apps/308-sidebar-kitchen-sink/tests/testthat/_snaps/mac-4.3/shinytest2/308-sidebar-kitchen-sink-001.png and /dev/null differ
diff --git a/inst/apps/308-sidebar-kitchen-sink/tests/testthat/_snaps/mac-4.3/shinytest2/308-sidebar-kitchen-sink-002.png b/inst/apps/308-sidebar-kitchen-sink/tests/testthat/_snaps/mac-4.3/shinytest2/308-sidebar-kitchen-sink-002.png
deleted file mode 100644
index 5351797427..0000000000
Binary files a/inst/apps/308-sidebar-kitchen-sink/tests/testthat/_snaps/mac-4.3/shinytest2/308-sidebar-kitchen-sink-002.png and /dev/null differ
diff --git a/inst/apps/308-sidebar-kitchen-sink/tests/testthat/_snaps/mac-4.3/shinytest2/308-sidebar-kitchen-sink-003.png b/inst/apps/308-sidebar-kitchen-sink/tests/testthat/_snaps/mac-4.3/shinytest2/308-sidebar-kitchen-sink-003.png
deleted file mode 100644
index c4669a06b4..0000000000
Binary files a/inst/apps/308-sidebar-kitchen-sink/tests/testthat/_snaps/mac-4.3/shinytest2/308-sidebar-kitchen-sink-003.png and /dev/null differ
diff --git a/inst/apps/308-sidebar-kitchen-sink/tests/testthat/_snaps/mac-4.3/shinytest2/308-sidebar-kitchen-sink-004.png b/inst/apps/308-sidebar-kitchen-sink/tests/testthat/_snaps/mac-4.3/shinytest2/308-sidebar-kitchen-sink-004.png
deleted file mode 100644
index 72decf0b83..0000000000
Binary files a/inst/apps/308-sidebar-kitchen-sink/tests/testthat/_snaps/mac-4.3/shinytest2/308-sidebar-kitchen-sink-004.png and /dev/null differ
diff --git a/inst/apps/308-sidebar-kitchen-sink/tests/testthat/_snaps/mac-4.3/shinytest2/308-sidebar-kitchen-sink-005.png b/inst/apps/308-sidebar-kitchen-sink/tests/testthat/_snaps/mac-4.3/shinytest2/308-sidebar-kitchen-sink-005.png
deleted file mode 100644
index 7c38ceb4ee..0000000000
Binary files a/inst/apps/308-sidebar-kitchen-sink/tests/testthat/_snaps/mac-4.3/shinytest2/308-sidebar-kitchen-sink-005.png and /dev/null differ
diff --git a/inst/apps/308-sidebar-kitchen-sink/tests/testthat/_snaps/mac-4.3/shinytest2/308-sidebar-kitchen-sink-006.png b/inst/apps/308-sidebar-kitchen-sink/tests/testthat/_snaps/mac-4.3/shinytest2/308-sidebar-kitchen-sink-006.png
deleted file mode 100644
index 295268e17b..0000000000
Binary files a/inst/apps/308-sidebar-kitchen-sink/tests/testthat/_snaps/mac-4.3/shinytest2/308-sidebar-kitchen-sink-006.png and /dev/null differ
diff --git a/inst/apps/308-sidebar-kitchen-sink/tests/testthat/test-shinytest2.R b/inst/apps/308-sidebar-kitchen-sink/tests/testthat/test-308-sidebar-kitchen-sink.R
similarity index 68%
rename from inst/apps/308-sidebar-kitchen-sink/tests/testthat/test-shinytest2.R
rename to inst/apps/308-sidebar-kitchen-sink/tests/testthat/test-308-sidebar-kitchen-sink.R
index 1349b55186..e94d9f3e09 100644
--- a/inst/apps/308-sidebar-kitchen-sink/tests/testthat/test-shinytest2.R
+++ b/inst/apps/308-sidebar-kitchen-sink/tests/testthat/test-308-sidebar-kitchen-sink.R
@@ -1,7 +1,7 @@
 library(shinytest2)
 
 # Only take screenshots on mac + r-release to reduce diff noise
-release <- rversions::r_release()$version
+release <- jsonlite::fromJSON("https://api.r-hub.io/rversions/resolve/release")$version
 release <- paste0(
   strsplit(release, ".", fixed = TRUE)[[1]][1:2],
   collapse = "."
@@ -10,7 +10,8 @@ release <- paste0(
 is_testing_on_ci <- identical(Sys.getenv("CI"), "true") && testthat::is_testing()
 is_mac_release <- identical(paste0("mac-", release), platform_variant())
 
-DO_SCREENSHOT <- is_testing_on_ci && is_mac_release
+DO_SCREENSHOT <- (is_testing_on_ci && is_mac_release) ||
+  identical(Sys.getenv("SHINYTEST2_SCREENSHOT"), "true")
 
 test_that("{shinytest2} recording: 308-sidebar-kitchen-sink", {
   height <- 1200
@@ -22,7 +23,13 @@ test_that("{shinytest2} recording: 308-sidebar-kitchen-sink", {
     view = interactive(),
     seed = 101,
     height = height,
-    width = width
+    width = width,
+    # TODO: rstudio/shinytest2#367
+    screenshot_args = list(
+      selector = "viewport",
+      delay = 0.5,
+      options = list(captureBeyondViewport = FALSE)
+    )
   )
 
   expect_screenshot <- function() {
@@ -35,7 +42,7 @@ test_that("{shinytest2} recording: 308-sidebar-kitchen-sink", {
   expect_screenshot()
 
   # Contents should render to their natural height on mobile
-  app$set_window_size(width = 500, height = 1000)
+  app$set_window_size(width = 500, height = 2000)
   expect_screenshot()
   app$set_window_size(width = width, height = height)
 
@@ -48,6 +55,8 @@ test_that("{shinytest2} recording: 308-sidebar-kitchen-sink", {
   expect_screenshot()
 
   app$click("toggle_sidebar")
-  Sys.sleep(1) # Wait for transition to complete
+  app$wait_for_js("
+    document.querySelector('.bslib-sidebar-layout.transitioning') === null
+  ")
   expect_screenshot()
 })
diff --git a/inst/apps/310-bslib-sidebar-dynamic/tests/testthat/_snaps/mac-4.3/310-bslib-sidebar-dynamic/310-bslib-sidebar-dynamic-002.png b/inst/apps/310-bslib-sidebar-dynamic/tests/testthat/_snaps/mac-4.3/310-bslib-sidebar-dynamic/310-bslib-sidebar-dynamic-002.png
index 9f01e3f40e..2ba731a783 100644
Binary files a/inst/apps/310-bslib-sidebar-dynamic/tests/testthat/_snaps/mac-4.3/310-bslib-sidebar-dynamic/310-bslib-sidebar-dynamic-002.png and b/inst/apps/310-bslib-sidebar-dynamic/tests/testthat/_snaps/mac-4.3/310-bslib-sidebar-dynamic/310-bslib-sidebar-dynamic-002.png differ
diff --git a/inst/apps/310-bslib-sidebar-dynamic/tests/testthat/_snaps/mac-4.3/310-bslib-sidebar-dynamic/310-bslib-sidebar-dynamic-004.png b/inst/apps/310-bslib-sidebar-dynamic/tests/testthat/_snaps/mac-4.3/310-bslib-sidebar-dynamic/310-bslib-sidebar-dynamic-004.png
index e2afe8eb6c..c0d8a0d4b3 100644
Binary files a/inst/apps/310-bslib-sidebar-dynamic/tests/testthat/_snaps/mac-4.3/310-bslib-sidebar-dynamic/310-bslib-sidebar-dynamic-004.png and b/inst/apps/310-bslib-sidebar-dynamic/tests/testthat/_snaps/mac-4.3/310-bslib-sidebar-dynamic/310-bslib-sidebar-dynamic-004.png differ
diff --git a/inst/apps/310-bslib-sidebar-dynamic/tests/testthat/_snaps/mac-4.3/310-bslib-sidebar-dynamic/310-bslib-sidebar-dynamic-006.png b/inst/apps/310-bslib-sidebar-dynamic/tests/testthat/_snaps/mac-4.3/310-bslib-sidebar-dynamic/310-bslib-sidebar-dynamic-006.png
index 6afdfba603..d32b054956 100644
Binary files a/inst/apps/310-bslib-sidebar-dynamic/tests/testthat/_snaps/mac-4.3/310-bslib-sidebar-dynamic/310-bslib-sidebar-dynamic-006.png and b/inst/apps/310-bslib-sidebar-dynamic/tests/testthat/_snaps/mac-4.3/310-bslib-sidebar-dynamic/310-bslib-sidebar-dynamic-006.png differ
diff --git a/inst/apps/310-bslib-sidebar-dynamic/tests/testthat/_snaps/mac-4.3/310-bslib-sidebar-dynamic/310-bslib-sidebar-dynamic-008.png b/inst/apps/310-bslib-sidebar-dynamic/tests/testthat/_snaps/mac-4.3/310-bslib-sidebar-dynamic/310-bslib-sidebar-dynamic-008.png
index 03ab5941a9..f22c396d25 100644
Binary files a/inst/apps/310-bslib-sidebar-dynamic/tests/testthat/_snaps/mac-4.3/310-bslib-sidebar-dynamic/310-bslib-sidebar-dynamic-008.png and b/inst/apps/310-bslib-sidebar-dynamic/tests/testthat/_snaps/mac-4.3/310-bslib-sidebar-dynamic/310-bslib-sidebar-dynamic-008.png differ
diff --git a/inst/apps/310-bslib-sidebar-dynamic/tests/testthat/_snaps/mac-4.3/310-bslib-sidebar-dynamic/310-bslib-sidebar-dynamic-010.png b/inst/apps/310-bslib-sidebar-dynamic/tests/testthat/_snaps/mac-4.3/310-bslib-sidebar-dynamic/310-bslib-sidebar-dynamic-010.png
index c8e6a16af8..a06bdac8ef 100644
Binary files a/inst/apps/310-bslib-sidebar-dynamic/tests/testthat/_snaps/mac-4.3/310-bslib-sidebar-dynamic/310-bslib-sidebar-dynamic-010.png and b/inst/apps/310-bslib-sidebar-dynamic/tests/testthat/_snaps/mac-4.3/310-bslib-sidebar-dynamic/310-bslib-sidebar-dynamic-010.png differ
diff --git a/inst/apps/310-bslib-sidebar-dynamic/tests/testthat/_snaps/mac-4.3/310-bslib-sidebar-dynamic/310-bslib-sidebar-dynamic-012.png b/inst/apps/310-bslib-sidebar-dynamic/tests/testthat/_snaps/mac-4.3/310-bslib-sidebar-dynamic/310-bslib-sidebar-dynamic-012.png
index 436ab19e1e..4dc40a6551 100644
Binary files a/inst/apps/310-bslib-sidebar-dynamic/tests/testthat/_snaps/mac-4.3/310-bslib-sidebar-dynamic/310-bslib-sidebar-dynamic-012.png and b/inst/apps/310-bslib-sidebar-dynamic/tests/testthat/_snaps/mac-4.3/310-bslib-sidebar-dynamic/310-bslib-sidebar-dynamic-012.png differ
diff --git a/inst/apps/310-bslib-sidebar-dynamic/tests/testthat/_snaps/mac-4.3/310-bslib-sidebar-dynamic/310-bslib-sidebar-dynamic-014.png b/inst/apps/310-bslib-sidebar-dynamic/tests/testthat/_snaps/mac-4.3/310-bslib-sidebar-dynamic/310-bslib-sidebar-dynamic-014.png
index 7549eb7ad2..a4dec86cef 100644
Binary files a/inst/apps/310-bslib-sidebar-dynamic/tests/testthat/_snaps/mac-4.3/310-bslib-sidebar-dynamic/310-bslib-sidebar-dynamic-014.png and b/inst/apps/310-bslib-sidebar-dynamic/tests/testthat/_snaps/mac-4.3/310-bslib-sidebar-dynamic/310-bslib-sidebar-dynamic-014.png differ
diff --git a/inst/apps/310-bslib-sidebar-dynamic/tests/testthat/_snaps/mac-4.3/310-bslib-sidebar-dynamic/310-bslib-sidebar-dynamic-015.png b/inst/apps/310-bslib-sidebar-dynamic/tests/testthat/_snaps/mac-4.3/310-bslib-sidebar-dynamic/310-bslib-sidebar-dynamic-015.png
index f928ba3be9..85d154a5cb 100644
Binary files a/inst/apps/310-bslib-sidebar-dynamic/tests/testthat/_snaps/mac-4.3/310-bslib-sidebar-dynamic/310-bslib-sidebar-dynamic-015.png and b/inst/apps/310-bslib-sidebar-dynamic/tests/testthat/_snaps/mac-4.3/310-bslib-sidebar-dynamic/310-bslib-sidebar-dynamic-015.png differ
diff --git a/inst/apps/310-bslib-sidebar-dynamic/tests/testthat/_snaps/mac-4.3/310-bslib-sidebar-dynamic/310-bslib-sidebar-dynamic-017.png b/inst/apps/310-bslib-sidebar-dynamic/tests/testthat/_snaps/mac-4.3/310-bslib-sidebar-dynamic/310-bslib-sidebar-dynamic-017.png
index 968fe5c324..40fc500746 100644
Binary files a/inst/apps/310-bslib-sidebar-dynamic/tests/testthat/_snaps/mac-4.3/310-bslib-sidebar-dynamic/310-bslib-sidebar-dynamic-017.png and b/inst/apps/310-bslib-sidebar-dynamic/tests/testthat/_snaps/mac-4.3/310-bslib-sidebar-dynamic/310-bslib-sidebar-dynamic-017.png differ
diff --git a/inst/apps/310-bslib-sidebar-dynamic/tests/testthat/_snaps/mac-4.3/310-bslib-sidebar-dynamic/310-bslib-sidebar-dynamic-019.png b/inst/apps/310-bslib-sidebar-dynamic/tests/testthat/_snaps/mac-4.3/310-bslib-sidebar-dynamic/310-bslib-sidebar-dynamic-019.png
index d6f6c8b042..c4eecf457b 100644
Binary files a/inst/apps/310-bslib-sidebar-dynamic/tests/testthat/_snaps/mac-4.3/310-bslib-sidebar-dynamic/310-bslib-sidebar-dynamic-019.png and b/inst/apps/310-bslib-sidebar-dynamic/tests/testthat/_snaps/mac-4.3/310-bslib-sidebar-dynamic/310-bslib-sidebar-dynamic-019.png differ
diff --git a/inst/apps/310-bslib-sidebar-dynamic/tests/testthat/_snaps/mac-4.3/310-bslib-sidebar-dynamic/310-bslib-sidebar-dynamic-021.png b/inst/apps/310-bslib-sidebar-dynamic/tests/testthat/_snaps/mac-4.3/310-bslib-sidebar-dynamic/310-bslib-sidebar-dynamic-021.png
index 96bde7469e..eeebffd4be 100644
Binary files a/inst/apps/310-bslib-sidebar-dynamic/tests/testthat/_snaps/mac-4.3/310-bslib-sidebar-dynamic/310-bslib-sidebar-dynamic-021.png and b/inst/apps/310-bslib-sidebar-dynamic/tests/testthat/_snaps/mac-4.3/310-bslib-sidebar-dynamic/310-bslib-sidebar-dynamic-021.png differ
diff --git a/inst/apps/310-bslib-sidebar-dynamic/tests/testthat/test-310-bslib-sidebar-dynamic.R b/inst/apps/310-bslib-sidebar-dynamic/tests/testthat/test-310-bslib-sidebar-dynamic.R
index 4423678871..cc3031433a 100644
--- a/inst/apps/310-bslib-sidebar-dynamic/tests/testthat/test-310-bslib-sidebar-dynamic.R
+++ b/inst/apps/310-bslib-sidebar-dynamic/tests/testthat/test-310-bslib-sidebar-dynamic.R
@@ -2,7 +2,7 @@ library(shinytest2)
 
 # Only take screenshots on mac + r-release to reduce diff noise
 expect_screenshot_mac_release <- local({
-  release <- rversions::r_release()$version
+  release <- jsonlite::fromJSON("https://api.r-hub.io/rversions/resolve/release")$version
   release <- paste0(
     strsplit(release, ".", fixed = TRUE)[[1]][1:2],
     collapse = "."
@@ -69,7 +69,12 @@ test_that("310-bslib-sidebar-dynamic: dynamically added sidebars are fully funct
     width = 1200,
     view = interactive(),
     options = list(bslib.precompiled = FALSE),
-    expect_values_screenshot_args = FALSE
+    expect_values_screenshot_args = FALSE,
+    screenshot_args = list(
+      selector = "viewport",
+      delay = 0.5,
+      options = list(captureBeyondViewport = FALSE)
+    )
   )
 
   expect_sidebar_hidden <- expect_sidebar_hidden_factory(app)