diff --git a/crates/ui-egui/src/lib.rs b/crates/ui-egui/src/lib.rs
index 4efc27211..1e1c1c4b8 100644
--- a/crates/ui-egui/src/lib.rs
+++ b/crates/ui-egui/src/lib.rs
@@ -73,113 +73,9 @@ pub mod workspaces;
 
 mod document_drag;
 #[cfg(test)]
-mod tests_adjust;
+use tests::{background as tests_background, labels as tests_labels, picks as tests_picks, removeanchors as tests_removeanchors, svg as tests_svg, synthetic as tests_synthetic, sysclip as tests_sysclip};
 #[cfg(test)]
-mod tests_aisave;
-#[cfg(test)]
-mod tests_automation;
-#[cfg(test)]
-mod tests_background;
-#[cfg(test)]
-mod tests_clipboard;
-#[cfg(test)]
-mod tests_contextmenu;
-#[cfg(test)]
-mod tests_cut;
-#[cfg(test)]
-mod tests_distortkeys;
-#[cfg(test)]
-mod tests_docsetup;
-#[cfg(test)]
-mod tests_document_drag;
-#[cfg(test)]
-mod tests_font_menu;
-#[cfg(test)]
-mod tests_fonts;
-#[cfg(test)]
-mod tests_guide_escape;
-#[cfg(test)]
-mod tests_home;
-#[cfg(test)]
-mod tests_labels;
-#[cfg(test)]
-mod tests_lifecycle;
-#[cfg(test)]
-mod tests_nativemenu;
-#[cfg(test)]
-mod tests_nativeoptions;
-#[cfg(test)]
-mod tests_numfields;
-#[cfg(test)]
-mod tests_overprint;
-#[cfg(test)]
-mod tests_paintchips;
-#[cfg(test)]
-mod tests_pastechords;
-#[cfg(test)]
-mod tests_pathtype;
-#[cfg(test)]
-mod tests_pdfoutput;
-#[cfg(test)]
-mod tests_picks;
-#[cfg(test)]
-mod tests_place;
-#[cfg(test)]
-mod tests_plugin_runs;
-#[cfg(test)]
-mod tests_plugins;
-#[cfg(test)]
-mod tests_printps;
-#[cfg(test)]
-mod tests_printtiling;
-#[cfg(test)]
-mod tests_puppetwarp;
-#[cfg(test)]
-mod tests_recolor;
-#[cfg(test)]
-mod tests_recovery;
-#[cfg(test)]
-mod tests_removeanchors;
-#[cfg(test)]
-mod tests_rotateview;
-#[cfg(test)]
-mod tests_ruler_origin;
-#[cfg(test)]
-mod tests_save;
-#[cfg(test)]
-mod tests_saveext;
-#[cfg(test)]
-mod tests_screenmode;
-#[cfg(test)]
-mod tests_screenshots;
-#[cfg(test)]
-mod tests_script_check;
-#[cfg(test)]
-mod tests_scrub;
-#[cfg(test)]
-mod tests_selectall;
-#[cfg(test)]
-mod tests_slices;
-#[cfg(test)]
-mod tests_svg;
-#[cfg(test)]
-mod tests_svgsave;
-#[cfg(test)]
-mod tests_synthetic;
-#[cfg(test)]
-mod tests_sysclip;
-#[cfg(test)]
-mod tests_sysclip_emf;
-#[cfg(test)]
-mod tests_sysclip_probe;
-#[cfg(test)]
-mod tests_tab_overflow;
-#[cfg(test)]
-mod tests_taskbar;
-#[cfg(test)]
-mod tests_transparencygrid;
-#[cfg(test)]
-mod tests_widthtool;
+mod tests;
 
 use std::sync::atomic::{AtomicBool, Ordering};
 use std::sync::mpsc::{Receiver, Sender};
diff --git a/crates/ui-egui/src/tests.rs b/crates/ui-egui/src/tests.rs
new file mode 100644
index 000000000..fc3a59d43
--- /dev/null
+++ b/crates/ui-egui/src/tests.rs
@@ -0,0 +1,54 @@
+mod adjust;
+mod aisave;
+mod automation;
+pub(super) mod background;
+mod clipboard;
+mod contextmenu;
+mod cut;
+mod distortkeys;
+mod docsetup;
+mod document_drag;
+mod font_menu;
+mod fonts;
+mod guide_escape;
+mod home;
+pub(super) mod labels;
+mod lifecycle;
+mod nativemenu;
+mod nativeoptions;
+mod numfields;
+mod overprint;
+mod paintchips;
+mod pastechords;
+mod pathtype;
+mod pdfoutput;
+pub(super) mod picks;
+mod place;
+mod plugin_runs;
+mod plugins;
+mod printps;
+mod printtiling;
+mod puppetwarp;
+mod recolor;
+mod recovery;
+pub(super) mod removeanchors;
+mod rotateview;
+mod ruler_origin;
+mod save;
+mod saveext;
+mod screenmode;
+mod screenshots;
+mod script_check;
+mod scrub;
+mod selectall;
+mod slices;
+pub(super) mod svg;
+mod svgsave;
+pub(super) mod synthetic;
+pub(super) mod sysclip;
+mod sysclip_emf;
+mod sysclip_probe;
+mod tab_overflow;
+mod taskbar;
+mod transparencygrid;
+mod widthtool;
diff --git a/crates/ui-egui/src/tests_adjust.rs b/crates/ui-egui/src/tests/adjust.rs
similarity index 100%
rename from crates/ui-egui/src/tests_adjust.rs
rename to crates/ui-egui/src/tests/adjust.rs
diff --git a/crates/ui-egui/src/tests_aisave.rs b/crates/ui-egui/src/tests/aisave.rs
similarity index 100%
rename from crates/ui-egui/src/tests_aisave.rs
rename to crates/ui-egui/src/tests/aisave.rs
diff --git a/crates/ui-egui/src/tests_automation.rs b/crates/ui-egui/src/tests/automation.rs
similarity index 100%
rename from crates/ui-egui/src/tests_automation.rs
rename to crates/ui-egui/src/tests/automation.rs
diff --git a/crates/ui-egui/src/tests_background.rs b/crates/ui-egui/src/tests/background.rs
similarity index 98%
rename from crates/ui-egui/src/tests_background.rs
rename to crates/ui-egui/src/tests/background.rs
index bc0f67735..add53156e 100644
--- a/crates/ui-egui/src/tests_background.rs
+++ b/crates/ui-egui/src/tests/background.rs
@@ -12,17 +12,17 @@ use vectorcraft_geom::{Rect, shapes};
 use crate::control::ControlRequest;
 use crate::{Services, VectorcraftApp, background, io};
 
-pub(super) type Files = Arc<Mutex<Vec<(String, Vec<u8>)>>>;
+pub(crate) type Files = Arc<Mutex<Vec<(String, Vec<u8>)>>>;
 
 /// Holds the background writer until opened.
 #[derive(Clone, Default)]
-pub(super) struct Gate(Arc<AtomicBool>);
+pub(crate) struct Gate(Arc<AtomicBool>);
 
 impl Gate {
-    pub(super) fn open(&self) {
+    pub(crate) fn open(&self) {
         self.0.store(true, Ordering::SeqCst);
     }
-    pub(super) fn wait(&self) {
+    pub(crate) fn wait(&self) {
         while !self.0.load(Ordering::SeqCst) {
             std::thread::sleep(std::time::Duration::from_millis(1));
         }
@@ -57,7 +57,7 @@ fn paths(n: usize) -> Document {
     d
 }
 
-pub(super) fn written(files: &Files) -> Vec<String> {
+pub(crate) fn written(files: &Files) -> Vec<String> {
     files.lock().unwrap().iter().map(|(p, _)| p.clone()).collect()
 }
 
diff --git a/crates/ui-egui/src/tests_clipboard.rs b/crates/ui-egui/src/tests/clipboard.rs
similarity index 100%
rename from crates/ui-egui/src/tests_clipboard.rs
rename to crates/ui-egui/src/tests/clipboard.rs
diff --git a/crates/ui-egui/src/tests_contextmenu.rs b/crates/ui-egui/src/tests/contextmenu.rs
similarity index 100%
rename from crates/ui-egui/src/tests_contextmenu.rs
rename to crates/ui-egui/src/tests/contextmenu.rs
diff --git a/crates/ui-egui/src/tests_cut.rs b/crates/ui-egui/src/tests/cut.rs
similarity index 100%
rename from crates/ui-egui/src/tests_cut.rs
rename to crates/ui-egui/src/tests/cut.rs
diff --git a/crates/ui-egui/src/tests_distortkeys.rs b/crates/ui-egui/src/tests/distortkeys.rs
similarity index 100%
rename from crates/ui-egui/src/tests_distortkeys.rs
rename to crates/ui-egui/src/tests/distortkeys.rs
diff --git a/crates/ui-egui/src/tests_docsetup.rs b/crates/ui-egui/src/tests/docsetup.rs
similarity index 100%
rename from crates/ui-egui/src/tests_docsetup.rs
rename to crates/ui-egui/src/tests/docsetup.rs
diff --git a/crates/ui-egui/src/tests_document_drag.rs b/crates/ui-egui/src/tests/document_drag.rs
similarity index 100%
rename from crates/ui-egui/src/tests_document_drag.rs
rename to crates/ui-egui/src/tests/document_drag.rs
diff --git a/crates/ui-egui/src/tests_font_menu.rs b/crates/ui-egui/src/tests/font_menu.rs
similarity index 100%
rename from crates/ui-egui/src/tests_font_menu.rs
rename to crates/ui-egui/src/tests/font_menu.rs
diff --git a/crates/ui-egui/src/tests_fonts.rs b/crates/ui-egui/src/tests/fonts.rs
similarity index 100%
rename from crates/ui-egui/src/tests_fonts.rs
rename to crates/ui-egui/src/tests/fonts.rs
diff --git a/crates/ui-egui/src/tests_guide_escape.rs b/crates/ui-egui/src/tests/guide_escape.rs
similarity index 100%
rename from crates/ui-egui/src/tests_guide_escape.rs
rename to crates/ui-egui/src/tests/guide_escape.rs
diff --git a/crates/ui-egui/src/tests_home.rs b/crates/ui-egui/src/tests/home.rs
similarity index 100%
rename from crates/ui-egui/src/tests_home.rs
rename to crates/ui-egui/src/tests/home.rs
diff --git a/crates/ui-egui/src/tests_labels.rs b/crates/ui-egui/src/tests/labels.rs
similarity index 100%
rename from crates/ui-egui/src/tests_labels.rs
rename to crates/ui-egui/src/tests/labels.rs
diff --git a/crates/ui-egui/src/tests_lifecycle.rs b/crates/ui-egui/src/tests/lifecycle.rs
similarity index 100%
rename from crates/ui-egui/src/tests_lifecycle.rs
rename to crates/ui-egui/src/tests/lifecycle.rs
diff --git a/crates/ui-egui/src/tests_nativemenu.rs b/crates/ui-egui/src/tests/nativemenu.rs
similarity index 100%
rename from crates/ui-egui/src/tests_nativemenu.rs
rename to crates/ui-egui/src/tests/nativemenu.rs
diff --git a/crates/ui-egui/src/tests_nativeoptions.rs b/crates/ui-egui/src/tests/nativeoptions.rs
similarity index 100%
rename from crates/ui-egui/src/tests_nativeoptions.rs
rename to crates/ui-egui/src/tests/nativeoptions.rs
diff --git a/crates/ui-egui/src/tests_numfields.rs b/crates/ui-egui/src/tests/numfields.rs
similarity index 100%
rename from crates/ui-egui/src/tests_numfields.rs
rename to crates/ui-egui/src/tests/numfields.rs
diff --git a/crates/ui-egui/src/tests_overprint.rs b/crates/ui-egui/src/tests/overprint.rs
similarity index 100%
rename from crates/ui-egui/src/tests_overprint.rs
rename to crates/ui-egui/src/tests/overprint.rs
diff --git a/crates/ui-egui/src/tests_paintchips.rs b/crates/ui-egui/src/tests/paintchips.rs
similarity index 100%
rename from crates/ui-egui/src/tests_paintchips.rs
rename to crates/ui-egui/src/tests/paintchips.rs
diff --git a/crates/ui-egui/src/tests_pastechords.rs b/crates/ui-egui/src/tests/pastechords.rs
similarity index 100%
rename from crates/ui-egui/src/tests_pastechords.rs
rename to crates/ui-egui/src/tests/pastechords.rs
diff --git a/crates/ui-egui/src/tests_pathtype.rs b/crates/ui-egui/src/tests/pathtype.rs
similarity index 100%
rename from crates/ui-egui/src/tests_pathtype.rs
rename to crates/ui-egui/src/tests/pathtype.rs
diff --git a/crates/ui-egui/src/tests_pdfoutput.rs b/crates/ui-egui/src/tests/pdfoutput.rs
similarity index 100%
rename from crates/ui-egui/src/tests_pdfoutput.rs
rename to crates/ui-egui/src/tests/pdfoutput.rs
diff --git a/crates/ui-egui/src/tests_picks.rs b/crates/ui-egui/src/tests/picks.rs
similarity index 100%
rename from crates/ui-egui/src/tests_picks.rs
rename to crates/ui-egui/src/tests/picks.rs
diff --git a/crates/ui-egui/src/tests_place.rs b/crates/ui-egui/src/tests/place.rs
similarity index 100%
rename from crates/ui-egui/src/tests_place.rs
rename to crates/ui-egui/src/tests/place.rs
diff --git a/crates/ui-egui/src/tests_plugin_runs.rs b/crates/ui-egui/src/tests/plugin_runs.rs
similarity index 100%
rename from crates/ui-egui/src/tests_plugin_runs.rs
rename to crates/ui-egui/src/tests/plugin_runs.rs
diff --git a/crates/ui-egui/src/tests_plugins.rs b/crates/ui-egui/src/tests/plugins.rs
similarity index 98%
rename from crates/ui-egui/src/tests_plugins.rs
rename to crates/ui-egui/src/tests/plugins.rs
index c934ef672..3bd693afa 100644
--- a/crates/ui-egui/src/tests_plugins.rs
+++ b/crates/ui-egui/src/tests/plugins.rs
@@ -9,7 +9,7 @@ use vectorcraft_plugins::wat as tpl;
 use crate::state::Dialog;
 use crate::{VectorcraftApp, dialogs, io, menus, theme};
 
-const DESATURATE: &[u8] = include_bytes!("../../plugins/tests/fixtures/desaturate.wasm");
+const DESATURATE: &[u8] = include_bytes!("../../../plugins/tests/fixtures/desaturate.wasm");
 const DESATURATE_ID: &str = "org.vectorcraft.example.desaturate";
 
 fn app() -> VectorcraftApp {
diff --git a/crates/ui-egui/src/tests_printps.rs b/crates/ui-egui/src/tests/printps.rs
similarity index 100%
rename from crates/ui-egui/src/tests_printps.rs
rename to crates/ui-egui/src/tests/printps.rs
diff --git a/crates/ui-egui/src/tests_printtiling.rs b/crates/ui-egui/src/tests/printtiling.rs
similarity index 100%
rename from crates/ui-egui/src/tests_printtiling.rs
rename to crates/ui-egui/src/tests/printtiling.rs
diff --git a/crates/ui-egui/src/tests_puppetwarp.rs b/crates/ui-egui/src/tests/puppetwarp.rs
similarity index 100%
rename from crates/ui-egui/src/tests_puppetwarp.rs
rename to crates/ui-egui/src/tests/puppetwarp.rs
diff --git a/crates/ui-egui/src/tests_recolor.rs b/crates/ui-egui/src/tests/recolor.rs
similarity index 100%
rename from crates/ui-egui/src/tests_recolor.rs
rename to crates/ui-egui/src/tests/recolor.rs
diff --git a/crates/ui-egui/src/tests_recovery.rs b/crates/ui-egui/src/tests/recovery.rs
similarity index 100%
rename from crates/ui-egui/src/tests_recovery.rs
rename to crates/ui-egui/src/tests/recovery.rs
diff --git a/crates/ui-egui/src/tests_removeanchors.rs b/crates/ui-egui/src/tests/removeanchors.rs
similarity index 100%
rename from crates/ui-egui/src/tests_removeanchors.rs
rename to crates/ui-egui/src/tests/removeanchors.rs
diff --git a/crates/ui-egui/src/tests_rotateview.rs b/crates/ui-egui/src/tests/rotateview.rs
similarity index 100%
rename from crates/ui-egui/src/tests_rotateview.rs
rename to crates/ui-egui/src/tests/rotateview.rs
diff --git a/crates/ui-egui/src/tests_ruler_origin.rs b/crates/ui-egui/src/tests/ruler_origin.rs
similarity index 100%
rename from crates/ui-egui/src/tests_ruler_origin.rs
rename to crates/ui-egui/src/tests/ruler_origin.rs
diff --git a/crates/ui-egui/src/tests_save.rs b/crates/ui-egui/src/tests/save.rs
similarity index 100%
rename from crates/ui-egui/src/tests_save.rs
rename to crates/ui-egui/src/tests/save.rs
diff --git a/crates/ui-egui/src/tests_saveext.rs b/crates/ui-egui/src/tests/saveext.rs
similarity index 100%
rename from crates/ui-egui/src/tests_saveext.rs
rename to crates/ui-egui/src/tests/saveext.rs
diff --git a/crates/ui-egui/src/tests_screenmode.rs b/crates/ui-egui/src/tests/screenmode.rs
similarity index 100%
rename from crates/ui-egui/src/tests_screenmode.rs
rename to crates/ui-egui/src/tests/screenmode.rs
diff --git a/crates/ui-egui/src/tests_screenshots.rs b/crates/ui-egui/src/tests/screenshots.rs
similarity index 100%
rename from crates/ui-egui/src/tests_screenshots.rs
rename to crates/ui-egui/src/tests/screenshots.rs
diff --git a/crates/ui-egui/src/tests_script_check.rs b/crates/ui-egui/src/tests/script_check.rs
similarity index 100%
rename from crates/ui-egui/src/tests_script_check.rs
rename to crates/ui-egui/src/tests/script_check.rs
diff --git a/crates/ui-egui/src/tests_scrub.rs b/crates/ui-egui/src/tests/scrub.rs
similarity index 100%
rename from crates/ui-egui/src/tests_scrub.rs
rename to crates/ui-egui/src/tests/scrub.rs
diff --git a/crates/ui-egui/src/tests_selectall.rs b/crates/ui-egui/src/tests/selectall.rs
similarity index 100%
rename from crates/ui-egui/src/tests_selectall.rs
rename to crates/ui-egui/src/tests/selectall.rs
diff --git a/crates/ui-egui/src/tests_slices.rs b/crates/ui-egui/src/tests/slices.rs
similarity index 100%
rename from crates/ui-egui/src/tests_slices.rs
rename to crates/ui-egui/src/tests/slices.rs
diff --git a/crates/ui-egui/src/tests_svg.rs b/crates/ui-egui/src/tests/svg.rs
similarity index 100%
rename from crates/ui-egui/src/tests_svg.rs
rename to crates/ui-egui/src/tests/svg.rs
diff --git a/crates/ui-egui/src/tests_svgsave.rs b/crates/ui-egui/src/tests/svgsave.rs
similarity index 100%
rename from crates/ui-egui/src/tests_svgsave.rs
rename to crates/ui-egui/src/tests/svgsave.rs
diff --git a/crates/ui-egui/src/tests_synthetic.rs b/crates/ui-egui/src/tests/synthetic.rs
similarity index 100%
rename from crates/ui-egui/src/tests_synthetic.rs
rename to crates/ui-egui/src/tests/synthetic.rs
diff --git a/crates/ui-egui/src/tests_sysclip.rs b/crates/ui-egui/src/tests/sysclip.rs
similarity index 99%
rename from crates/ui-egui/src/tests_sysclip.rs
rename to crates/ui-egui/src/tests/sysclip.rs
index 38e08fbf7..2e2197481 100644
--- a/crates/ui-egui/src/tests_sysclip.rs
+++ b/crates/ui-egui/src/tests/sysclip.rs
@@ -143,7 +143,7 @@ fn text_and_image_paste_events_paste_once_as_text() {
 }
 
 /// A 4 × 2 px blue PNG.
-pub(super) fn blue_png() -> Vec<u8> {
+pub(crate) fn blue_png() -> Vec<u8> {
     let img = image::RgbaImage::from_pixel(4, 2, image::Rgba([0, 0, 255, 255]));
     let mut png = vec![];
     img.write_to(&mut std::io::Cursor::new(&mut png), image::ImageFormat::Png).unwrap();
diff --git a/crates/ui-egui/src/tests_sysclip_emf.rs b/crates/ui-egui/src/tests/sysclip_emf.rs
similarity index 100%
rename from crates/ui-egui/src/tests_sysclip_emf.rs
rename to crates/ui-egui/src/tests/sysclip_emf.rs
diff --git a/crates/ui-egui/src/tests_sysclip_probe.rs b/crates/ui-egui/src/tests/sysclip_probe.rs
similarity index 100%
rename from crates/ui-egui/src/tests_sysclip_probe.rs
rename to crates/ui-egui/src/tests/sysclip_probe.rs
diff --git a/crates/ui-egui/src/tests_tab_overflow.rs b/crates/ui-egui/src/tests/tab_overflow.rs
similarity index 100%
rename from crates/ui-egui/src/tests_tab_overflow.rs
rename to crates/ui-egui/src/tests/tab_overflow.rs
diff --git a/crates/ui-egui/src/tests_taskbar.rs b/crates/ui-egui/src/tests/taskbar.rs
similarity index 100%
rename from crates/ui-egui/src/tests_taskbar.rs
rename to crates/ui-egui/src/tests/taskbar.rs
diff --git a/crates/ui-egui/src/tests_transparencygrid.rs b/crates/ui-egui/src/tests/transparencygrid.rs
similarity index 100%
rename from crates/ui-egui/src/tests_transparencygrid.rs
rename to crates/ui-egui/src/tests/transparencygrid.rs
diff --git a/crates/ui-egui/src/tests_widthtool.rs b/crates/ui-egui/src/tests/widthtool.rs
similarity index 100%
rename from crates/ui-egui/src/tests_widthtool.rs
rename to crates/ui-egui/src/tests/widthtool.rs