From 5ea43e852082db911bf8b56a2416b9e23cf8c3bd Mon Sep 17 00:00:00 2001
From: Eval Exec <execvy@gmail.com>
Date: Thu, 8 Oct 2026 01:16:46 +0800
Subject: [PATCH] refactor: colocate production unit tests with strict test
 suffix

---
 crates/neomacs-diagnostics/src/flamegraph.rs  |   1 +
 .../tests/{mod.rs => flamegraph_test.rs}      |   0
 crates/neomacs-diagnostics/src/metrics.rs     |   1 +
 .../metrics/tests/{mod.rs => metrics_test.rs} |   0
 crates/neomacs-diagnostics/src/pprof.rs       |   1 +
 .../src/pprof/tests/{mod.rs => pprof_test.rs} |   0
 crates/neomacs-diagnostics/src/report.rs      |   1 +
 .../report/tests/{mod.rs => report_test.rs}   |   0
 crates/neomacs-diagnostics/src/server.rs      |   1 +
 .../server/tests/{mod.rs => server_test.rs}   |   0
 .../src/child_frame_animation.rs              |   1 +
 .../{mod.rs => child_frame_animation_test.rs} |   0
 .../src/display_identity.rs                   |   1 +
 .../{mod.rs => display_identity_test.rs}      |   0
 .../src/effect_config.rs                      |   1 +
 .../tests/{mod.rs => effect_config_test.rs}   |   0
 crates/neomacs-display-protocol/src/face.rs   |   1 +
 .../src/face/tests/{mod.rs => face_test.rs}   |   0
 crates/neomacs-display-protocol/src/font.rs   |   1 +
 .../src/font/tests/{mod.rs => font_test.rs}   |   0
 .../src/frame_chrome.rs                       |   1 +
 .../tests/{mod.rs => frame_chrome_test.rs}    |   0
 .../src/frame_glyphs.rs                       |   1 +
 .../tests/{mod.rs => frame_glyphs_test.rs}    |   0
 .../src/frame_time.rs                         |   1 +
 .../tests/{mod.rs => frame_time_test.rs}      |   0
 .../neomacs-display-protocol/src/geometry.rs  |   1 +
 .../tests/{mod.rs => geometry_test.rs}        |   0
 .../src/glyph_matrix.rs                       |   1 +
 .../tests/{mod.rs => glyph_matrix_test.rs}    |   1 +
 .../src/glyph_matrix/text_geometry.rs         |   1 +
 .../tests/{mod.rs => text_geometry_test.rs}   |   0
 .../src/input_latency.rs                      | 198 +-------
 .../src/input_progress.rs                     | 107 +----
 .../src/interaction_projection.rs             |   1 +
 ...{mod.rs => interaction_projection_test.rs} |   0
 .../src/motion_spec.rs                        |   1 +
 .../tests/{mod.rs => motion_spec_test.rs}     |   0
 .../src/popup_placement.rs                    |   1 +
 .../tests/{mod.rs => popup_placement_test.rs} |   0
 .../src/present_mapping.rs                    |   1 +
 .../tests/{mod.rs => present_mapping_test.rs} |   0
 .../src/presentation_origin.rs                |   1 +
 .../{mod.rs => presentation_origin_test.rs}   |   0
 .../src/presented_frame.rs                    |   1 +
 .../tests/{mod.rs => presented_frame_test.rs} |   0
 .../src/presented_pointer.rs                  |   1 +
 .../src/presented_pointer/scroll.rs           |  77 +---
 .../{mod.rs => presented_pointer_test.rs}     |   0
 .../presented_pointer/tests/scroll_test.rs    |  73 +++
 crates/neomacs-display-protocol/src/scene.rs  |   1 +
 .../src/scene/tests/{mod.rs => scene_test.rs} |   0
 .../src/scroll_animation.rs                   |   1 +
 .../{mod.rs => scroll_animation_test.rs}      |   0
 .../src/sealed_frame_presentation.rs          |   1 +
 ...d.rs => sealed_frame_presentation_test.rs} |   0
 .../src/snapshot_text.rs                      |   1 +
 .../tests/{mod.rs => snapshot_text_test.rs}   |   0
 .../src/terminal_color.rs                     |   1 +
 .../tests/{mod.rs => terminal_color_test.rs}  |   0
 .../src/tests/input_latency_test.rs           | 194 ++++++++
 .../src/tests/input_progress_test.rs          | 103 +++++
 .../src/toolbar_icon.rs                       |   1 +
 .../tests/{mod.rs => toolbar_icon_test.rs}    |   0
 .../src/tooltip/lifetime.rs                   |   1 +
 .../tests/{mod.rs => lifetime_test.rs}        |   0
 .../src/transition_policy.rs                  |   1 +
 .../{mod.rs => transition_policy_test.rs}     |   0
 .../src/tty_palette.rs                        |   1 +
 .../tests/{mod.rs => tty_palette_test.rs}     |   0
 crates/neomacs-display-protocol/src/types.rs  |   1 +
 .../src/types/tests/{mod.rs => types_test.rs} |   0
 .../src/window_animation.rs                   |   1 +
 .../{mod.rs => window_animation_test.rs}      |   0
 .../src/window_chrome.rs                      |   1 +
 .../tests/{mod.rs => window_chrome_test.rs}   |   0
 .../src/xterm_palette.rs                      |   1 +
 .../tests/{mod.rs => xterm_palette_test.rs}   |   0
 .../src/xwidget_extent.rs                     |   1 +
 .../tests/{mod.rs => xwidget_extent_test.rs}  |   0
 .../src/backend/tty/rif.rs                    |   1 +
 .../tty/rif/tests/{mod.rs => rif_test.rs}     |   0
 .../src/backend/wgpu/animation.rs             |   1 +
 .../tests/{mod.rs => animation_test.rs}       |   0
 .../src/backend/wgpu/drm_device.rs            |   1 +
 .../tests/{mod.rs => drm_device_test.rs}      |   0
 .../src/backend/wgpu/events.rs                |   1 +
 .../events/tests/{mod.rs => events_test.rs}   |   0
 .../src/display_scale.rs                      |   1 +
 .../tests/{mod.rs => display_scale_test.rs}   |   0
 .../src/macos_bundle_runtime.rs               |   1 +
 .../{mod.rs => macos_bundle_runtime_test.rs}  |   0
 .../src/menus/controller.rs                   |   1 +
 .../tests/{mod.rs => controller_test.rs}      |   0
 .../neomacs-display-runtime/src/menus/help.rs |   1 +
 .../menus/help/tests/{mod.rs => help_test.rs} |   0
 .../src/menus/session.rs                      |   1 +
 .../session/tests/{mod.rs => session_test.rs} |   0
 .../src/presentation/pacing.rs                |  12 +-
 .../src/presentation/retirement.rs            |   1 +
 .../tests/{mod.rs => retirement_test.rs}      |   0
 .../src/presentation/tests/pacing_test.rs     |   8 +
 .../tests/wayland_test.rs                     |  65 +++
 .../src/presentation_feedback/wayland.rs      |  69 +--
 .../src/redisplay/maintenance.rs              |  57 +--
 .../src/redisplay/tests/maintenance_test.rs   |  53 +++
 .../src/render_thread/child_frames.rs         |   1 +
 .../tests/{mod.rs => child_frames_test.rs}    |   0
 .../src/render_thread/cursor.rs               |   1 +
 .../cursor/tests/{mod.rs => cursor_test.rs}   |   0
 .../src/render_thread/device_loss.rs          |   1 +
 .../tests/{mod.rs => device_loss_test.rs}     |   0
 .../continuity/pane_layout.rs                 |   1 +
 .../tests/{mod.rs => pane_layout_test.rs}     |   0
 .../frame_compositor/continuity/reflow.rs     |   1 +
 .../reflow/tests/{mod.rs => reflow_test.rs}   |   0
 .../frame_compositor/continuity/scroll.rs     |   1 +
 .../scroll/tests/{mod.rs => scroll_test.rs}   |   0
 .../frame_compositor/continuity/selection.rs  |   1 +
 .../tests/{mod.rs => selection_test.rs}       |   0
 .../frame_compositor/continuity/theme.rs      |   1 +
 .../theme/tests/{mod.rs => theme_test.rs}     |   0
 .../frame_compositor/input_scroll.rs          |   1 +
 .../{tests.rs => tests/input_scroll_test.rs}  |   0
 .../frame_compositor/layout_continuity.rs     |   1 +
 .../{mod.rs => layout_continuity_test.rs}     |   0
 .../frame_compositor/layout_driver.rs         |   1 +
 .../tests/{mod.rs => layout_driver_test.rs}   |   0
 .../render_thread/frame_compositor/motion.rs  |   1 +
 .../motion/tests/{mod.rs => motion_test.rs}   |   0
 .../src/render_thread/frame_ingest.rs         |   1 +
 .../tests/{mod.rs => frame_ingest_test.rs}    |   0
 .../src/render_thread/frame_state.rs          |   1 +
 .../tests/{mod.rs => frame_state_test.rs}     |   0
 .../src/render_thread/frame_windows.rs        |   1 +
 .../tests/{mod.rs => frame_windows_test.rs}   |   0
 .../src/render_thread/input.rs                |   1 +
 .../input/tests/{mod.rs => input_test.rs}     |   0
 .../src/render_thread/mod.rs                  |   1 +
 .../src/render_thread/modifier_sides.rs       |   1 +
 .../modifier_sides_test.rs}                   |   0
 .../src/render_thread/pointer_events.rs       | 122 +----
 .../render_pass/composition_targets.rs        |   2 +-
 .../{mod.rs => composition_targets_test.rs}   |   0
 .../src/render_thread/render_pass/mod.rs      |   2 +-
 .../render_pass/retained_scroll.rs            |  15 +-
 .../retained_scroll_test.rs}                  |   0
 .../render_pass/retained_static.rs            |   1 +
 .../tests/{mod.rs => retained_static_test.rs} |   0
 .../src/render_thread/render_pass/scene.rs    |   2 +-
 .../native_boundary_test.rs}                  |   0
 .../pane_size_boundary_test.rs}               |   0
 .../pinned_lifecycle_test.rs}                 |   0
 .../retained_owner_test.rs}                   |   0
 .../scene/{tests.rs => tests/scene_test.rs}   |   8 +-
 .../tests/{mod.rs => render_pass_test.rs}     |   0
 .../tests/retained_scroll_geometry_test.rs    |   9 +
 .../src/render_thread/state.rs                |   1 +
 .../state/tests/{mod.rs => state_test.rs}     |   0
 .../src/render_thread/surface_readback.rs     |   1 +
 .../{mod.rs => surface_readback_test.rs}      |   0
 .../src/render_thread/terminal_commands.rs    |   1 +
 .../{mod.rs => terminal_commands_test.rs}     |   0
 .../src/render_thread/terminal_expansion.rs   |   1 +
 .../{mod.rs => terminal_expansion_test.rs}    |   0
 .../tests/pointer_events_webview_test.rs      | 113 +++++
 .../{tests.rs => tests/render_thread_test.rs} |   0
 .../src/render_thread/thread_handle.rs        |   1 +
 .../tests/{mod.rs => thread_handle_test.rs}   |   0
 .../src/render_thread/toolbar.rs              |   1 +
 .../toolbar/tests/{mod.rs => toolbar_test.rs} |   0
 .../src/render_thread/transitions.rs          |   1 +
 .../tests/{mod.rs => transitions_test.rs}     |   0
 .../src/terminal/colors.rs                    |   1 +
 .../colors/tests/{mod.rs => colors_test.rs}   |   0
 .../src/terminal/content.rs                   |   1 +
 .../content/tests/{mod.rs => content_test.rs} |   0
 .../src/terminal/view.rs                      |   1 +
 .../view/tests/{mod.rs => view_test.rs}       |   0
 .../src/tests/window_icon_test.rs             |  43 ++
 .../src/tests/window_identity_test.rs         |  23 +
 .../src/thread_comm.rs                        |   1 +
 .../src/thread_comm/frame_opacity.rs          |   2 +-
 .../tests/{mod.rs => frame_opacity_test.rs}   |   0
 .../tests/{mod.rs => thread_comm_test.rs}     |   0
 .../src/window_icon.rs                        |  47 +-
 .../src/window_identity.rs                    |  27 +-
 .../neomacs-font-materializer/src/fontdb.rs   |   1 +
 .../fontdb/tests/{mod.rs => fontdb_test.rs}   |   0
 .../neomacs-layout-engine/src/bidi/reorder.rs |   1 +
 .../reorder/tests/{mod.rs => reorder_test.rs} |   0
 .../src/bidi/resolver.rs                      |   1 +
 .../tests/{mod.rs => resolver_test.rs}        |   0
 .../neomacs-layout-engine/src/bidi/tables.rs  |   1 +
 .../tables/tests/{mod.rs => tables_test.rs}   |   0
 .../neomacs-layout-engine/src/bidi/types.rs   |   1 +
 .../types/tests/{mod.rs => types_test.rs}     |   0
 .../src/buffer_source/body_render.rs          |   2 +-
 ...ow_storage.rs => mini_row_storage_test.rs} |   0
 .../src/buffer_source/end_of_buffer_rows.rs   |   1 +
 .../{mod.rs => end_of_buffer_rows_test.rs}    |   0
 .../src/buffer_source/fringe_arrows.rs        |   1 +
 .../tests/{mod.rs => fringe_arrows_test.rs}   |   0
 .../src/buffer_source/owned_capture.rs        | 107 +----
 .../src/buffer_source/producer/mod.rs         |   1 +
 .../tests/{mod.rs => producer_test.rs}        |   0
 .../src/buffer_source/producer/vocabulary.rs  |   1 +
 .../tests/{mod.rs => vocabulary_test.rs}      |   0
 .../src/buffer_source/row_route/mod.rs        |   1 +
 .../tests/{mod.rs => row_route_test.rs}       |   0
 .../buffer_source/tests/owned_capture_test.rs | 102 +++++
 ...s => property_keys_budget_support_test.rs} |   0
 ...s => source_budget_default_policy_test.rs} |   0
 ...s => source_budget_policy_aliases_test.rs} |   0
 ..._source_tests.rs => window_source_test.rs} |   0
 .../src/buffer_source/window_geometry.rs      |   1 +
 .../tests/{mod.rs => window_geometry_test.rs} |   0
 .../src/buffer_source/window_source.rs        |   9 +-
 .../tests/{mod.rs => window_source_test.rs}   |   0
 .../neomacs-layout-engine/src/composition.rs  |   1 +
 .../tests/{mod.rs => composition_test.rs}     |   0
 .../src/display_face_layout.rs                |   1 +
 .../{mod.rs => display_face_layout_test.rs}   |   0
 .../src/display_frame_output.rs               |   1 +
 .../{mod.rs => display_frame_output_test.rs}  |   0
 .../neomacs-layout-engine/src/display_item.rs |   1 +
 .../tests/{mod.rs => display_item_test.rs}    |   0
 .../src/display_pixel_calc.rs                 |   1 +
 .../{mod.rs => display_pixel_calc_test.rs}    |   0
 .../src/display_property.rs                   |   1 +
 .../{mod.rs => display_property_test.rs}      |   0
 .../src/display_row/builder.rs                |   1 +
 .../builder/tests/{mod.rs => builder_test.rs} |   0
 .../src/display_row/finalizer.rs              |   1 +
 .../tests/{mod.rs => finalizer_test.rs}       |   0
 .../src/display_row/geometry.rs               |   1 +
 .../tests/{mod.rs => geometry_test.rs}        |   0
 .../src/display_row/mod.rs                    |   2 +-
 .../src/display_row/source_append.rs          |   1 +
 .../tests/{mod.rs => source_append_test.rs}   |   0
 .../src/display_row/source_render.rs          |   1 +
 .../tests/{mod.rs => source_render_test.rs}   |   0
 .../src/display_row/source_state.rs           |   2 +-
 .../tests/{mod.rs => source_state_test.rs}    |   0
 .../{test.rs => tests/display_row_test.rs}    |   0
 .../src/display_row/trailing_whitespace.rs    |   1 +
 .../{mod.rs => trailing_whitespace_test.rs}   |   0
 .../src/display_source.rs                     |   1 +
 .../tests/{mod.rs => display_source_test.rs}  |   0
 .../src/display_source_overflow.rs            |   1 +
 ...mod.rs => display_source_overflow_test.rs} |   0
 ...s => compiled_collection_mutation_test.rs} |   0
 .../tests/display_source_resolver_test.rs     |   2 +-
 .../src/display_status_line.rs                |   1 +
 .../{mod.rs => display_status_line_test.rs}   |   0
 .../neomacs-layout-engine/src/display_when.rs |   1 +
 .../tests/{mod.rs => display_when_test.rs}    |   0
 crates/neomacs-layout-engine/src/engine.rs    |   1 +
 .../src/engine/mini_source_start.rs           |   2 +-
 .../src/engine/mini_source_stop.rs            |   2 +-
 .../src/engine/tests/edit_sync_engine_test.rs |   4 +-
 ...edit_sync_source_budget_consumers_test.rs} |   0
 ...t_sync_source_budget_replay_retry_test.rs} |   0
 .../engine/tests/{mod.rs => engine_test.rs}   |  23 +-
 ...oll_sites.rs => mini_scroll_sites_test.rs} |   0
 ...rce_start.rs => mini_source_start_test.rs} |   0
 ...ource_stop.rs => mini_source_stop_test.rs} |   0
 .../neomacs-layout-engine/src/font/catalog.rs |   1 +
 .../catalog/tests/{mod.rs => catalog_test.rs} |   0
 .../src/font/font_match.rs                    |   1 +
 .../tests/{mod.rs => font_match_test.rs}      |   0
 .../src/font/fontconfig.rs                    |   1 +
 .../src/font/fontconfig/candidate_cache.rs    |  73 +--
 .../fontconfig/tests/candidate_cache_test.rs  |  69 +++
 .../tests/{mod.rs => fontconfig_test.rs}      |   0
 .../neomacs-layout-engine/src/font/metrics.rs |   1 +
 .../metrics/tests/{mod.rs => metrics_test.rs} |   0
 .../neomacs-layout-engine/src/font/policy.rs  |   1 +
 .../policy/tests/{mod.rs => policy_test.rs}   |   0
 .../src/font/resolver.rs                      |   1 +
 .../tests/{mod.rs => resolver_test.rs}        |   0
 .../tests/worker_policy_cache_budget_test.rs  |  26 ++
 .../src/font/resolver/worker_policy.rs        |  32 +-
 .../neomacs-layout-engine/src/font/sizing.rs  |   1 +
 .../sizing/tests/{mod.rs => sizing_test.rs}   |   0
 .../src/font_backend/native_asset_cache.rs    |   1 +
 .../{mod.rs => native_asset_cache_test.rs}    |   0
 .../src/font_backend/windows/mod.rs           |   1 +
 .../windows/tests/{mod.rs => windows_test.rs} |   0
 .../src/frame_face_arena.rs                   |   1 +
 .../{mod.rs => frame_face_arena_test.rs}      |   0
 .../src/frame_presentation.rs                 |   1 +
 .../{mod.rs => frame_presentation_test.rs}    |   0
 .../src/glyph_row_writer.rs                   |   2 +-
 .../glyph_row_writer_test.rs}                 |   0
 .../neomacs-layout-engine/src/gui_chrome.rs   |   1 +
 .../tests/{mod.rs => gui_chrome_test.rs}      |   0
 .../src/incremental_layout/edit_sync.rs       |   8 +-
 .../src/incremental_layout/mode_line_gate.rs  |   4 +-
 ...cy.rs => edit_sync_default_policy_test.rs} |   0
 ...it_sync_lazy_proof_policy_absence_test.rs} |   0
 ...it_sync_lazy_proof_policy_aliases_test.rs} |   0
 ...es.rs => edit_sync_policy_aliases_test.rs} |   0
 ... => mode_line_gate_default_policy_test.rs} |   0
 ... => mode_line_gate_policy_aliases_test.rs} |   0
 .../neomacs-layout-engine/src/neovm_bridge.rs |   3 +-
 .../{ => tests}/line_count_test.rs            |   0
 .../tests/{mod.rs => neovm_bridge_test.rs}    |   0
 .../src/output/builder.rs                     |   1 +
 .../builder/tests/{mod.rs => builder_test.rs} |   0
 .../src/output/window_state.rs                |   3 +-
 ...reparation.rs => mini_preparation_test.rs} |   0
 .../tests/{mod.rs => window_state_test.rs}    |   0
 .../src/presentation/pointer.rs               |   1 +
 .../pointer/tests/{mod.rs => pointer_test.rs} |   0
 .../src/presentation/presented_pointer_map.rs |   1 +
 .../{mod.rs => presented_pointer_map_test.rs} |   0
 .../src/row_layout/font_measurement.rs        | 114 +----
 .../src/row_layout/input.rs                   |  44 +-
 .../src/row_layout/mapped_input.rs            |  29 +-
 .../src/row_layout/program.rs                 | 423 +-----------------
 .../src/row_layout/spacing_input.rs           |  46 +-
 .../row_layout/tests/font_measurement_test.rs | 110 +++++
 .../src/row_layout/tests/input_test.rs        |  40 ++
 .../src/row_layout/tests/mapped_input_test.rs |  25 ++
 .../src/row_layout/tests/program_test.rs      | 416 +++++++++++++++++
 .../row_layout/tests/spacing_input_test.rs    |  42 ++
 .../src/row_layout/tests/worker_test.rs       | 133 ++++++
 .../src/row_layout/worker.rs                  | 137 +-----
 .../src/scroll_policy.rs                      |   1 +
 .../tests/{mod.rs => scroll_policy_test.rs}   |   0
 .../neomacs-layout-engine/src/tty_menu_bar.rs |   1 +
 .../tests/{mod.rs => tty_menu_bar_test.rs}    |   0
 crates/neomacs-layout-engine/src/types.rs     |   1 +
 .../src/types/tests/{mod.rs => types_test.rs} |   0
 crates/neomacs-layout-engine/src/unicode.rs   |   1 +
 .../unicode/tests/{mod.rs => unicode_test.rs} |   0
 .../src/window_output.rs                      |   1 +
 .../src/window_output/row_geometry.rs         |  56 +--
 .../row_geometry/{ => tests}/lookup_test.rs   |   0
 .../src/window_output/snapshot_rows.rs        |  47 +-
 .../window_output/tests/row_geometry_test.rs  |  50 +++
 .../window_output/tests/snapshot_rows_test.rs |  43 ++
 .../tests/{mod.rs => window_output_test.rs}   |   0
 crates/neomacs-perf/src/artifact.rs           |   1 +
 .../tests/{mod.rs => artifact_test.rs}        |   0
 crates/neomacs-perf/src/capture.rs            |   1 +
 .../capture/tests/{mod.rs => capture_test.rs} |   0
 crates/neomacs-perf/src/catalog.rs            |   1 +
 .../catalog/tests/{mod.rs => catalog_test.rs} |   0
 crates/neomacs-perf/src/cli.rs                |   1 +
 .../src/cli/tests/{mod.rs => cli_test.rs}     |   0
 crates/neomacs-perf/src/comparison.rs         |   1 +
 .../tests/{mod.rs => comparison_test.rs}      |   0
 crates/neomacs-perf/src/counters.rs           |   1 +
 .../tests/{mod.rs => counters_test.rs}        |   0
 crates/neomacs-perf/src/harness.rs            |   1 +
 .../src/harness/scenarios/bounded_search.rs   |   1 +
 .../tests/{mod.rs => bounded_search_test.rs}  |   0
 .../src/harness/scenarios/builtin_call.rs     |   1 +
 .../tests/{mod.rs => builtin_call_test.rs}    |   0
 .../src/harness/scenarios/search_shape.rs     |   1 +
 .../tests/{mod.rs => search_shape_test.rs}    |   0
 .../src/harness/scenarios/vm_loop.rs          |   1 +
 .../harness/scenarios/vm_loop/first_entry.rs  |   1 +
 .../tests/{mod.rs => first_entry_test.rs}     |   0
 .../vm_loop/tests/{mod.rs => vm_loop_test.rs} |   0
 .../harness/tests/{mod.rs => harness_test.rs} |   5 +
 crates/neomacs-perf/src/host.rs               |   1 +
 .../src/host/tests/{mod.rs => host_test.rs}   |   0
 crates/neomacs-perf/src/input_latency.rs      |  63 +--
 crates/neomacs-perf/src/native_video.rs       |   1 +
 .../tests/{mod.rs => native_video_test.rs}    |   0
 crates/neomacs-perf/src/portable_dump.rs      |   1 +
 .../tests/{mod.rs => portable_dump_test.rs}   |   0
 crates/neomacs-perf/src/profile.rs            |   1 +
 .../profile/tests/{mod.rs => profile_test.rs} |   0
 crates/neomacs-perf/src/suite.rs              |   1 +
 .../src/suite/tests/{mod.rs => suite_test.rs} |   0
 .../src/tests/input_latency_test.rs           |  59 +++
 .../src/external_buffer.rs                    |   1 +
 .../tests/{mod.rs => external_buffer_test.rs} |   0
 .../src/glyph_atlas/allocator.rs              |   1 +
 .../tests/{mod.rs => allocator_test.rs}       |   0
 .../src/glyph_atlas/mod.rs                    |   1 +
 .../tests/{mod.rs => glyph_atlas_test.rs}     |   0
 .../src/gpu_frame_timing.rs                   |   1 +
 .../{mod.rs => gpu_frame_timing_test.rs}      |   0
 .../neomacs-renderer-wgpu/src/image_bands.rs  |   2 +-
 .../{tests.rs => tests/image_bands_test.rs}   |   0
 .../neomacs-renderer-wgpu/src/image_cache.rs  |   1 +
 ...iagnostic.rs => decode_diagnostic_test.rs} |   0
 .../tests/{mod.rs => image_cache_test.rs}     |   2 +-
 .../neomacs-renderer-wgpu/src/image_scale.rs  |   2 +-
 .../{tests.rs => tests/image_scale_test.rs}   |   0
 .../src/image_sequence.rs                     |   1 +
 .../tests/{mod.rs => image_sequence_test.rs}  |   0
 .../neomacs-renderer-wgpu/src/media_budget.rs |   1 +
 .../tests/{mod.rs => media_budget_test.rs}    |   0
 .../src/native_presentation/abi.rs            |  15 +-
 .../src/native_presentation/clock.rs          |  33 +-
 .../src/native_presentation/query.rs          | 103 +----
 .../src/native_presentation/tests/abi_test.rs |  11 +
 .../native_presentation/tests/clock_test.rs   |  29 ++
 .../native_presentation/tests/query_test.rs   |  99 ++++
 .../src/renderer/composition_ring.rs          |   1 +
 .../{mod.rs => composition_ring_test.rs}      |   0
 .../src/renderer/content.rs                   |   1 +
 .../content/tests/{mod.rs => content_test.rs} |   0
 .../src/renderer/cursor_effects.rs            |   1 +
 .../tests/{mod.rs => cursor_effects_test.rs}  |   0
 .../src/renderer/cursor_presentation.rs       |   1 +
 .../{mod.rs => cursor_presentation_test.rs}   |   0
 .../src/renderer/deform.rs                    |   1 +
 .../deform/tests/{mod.rs => deform_test.rs}   |   0
 .../src/renderer/effect_common.rs             |   1 +
 .../tests/{mod.rs => effect_common_test.rs}   |   0
 .../src/renderer/effects_state.rs             |   1 +
 .../tests/{mod.rs => effects_state_test.rs}   |   0
 .../src/renderer/glyphs.rs                    |   1 +
 .../glyphs/tests/{mod.rs => glyphs_test.rs}   |   0
 .../src/renderer/gpu_budget.rs                |   1 +
 .../tests/{mod.rs => gpu_budget_test.rs}      |   0
 .../src/renderer/layer_media.rs               |   1 +
 .../tests/{mod.rs => layer_media_test.rs}     |   0
 .../src/renderer/layout_pass.rs               |   1 +
 .../tests/{mod.rs => layout_pass_test.rs}     |   0
 .../src/renderer/pattern_effects.rs           |   1 +
 .../tests/{mod.rs => pattern_effects_test.rs} |   0
 .../src/renderer/pointer_override.rs          |   1 +
 .../{mod.rs => pointer_override_test.rs}      |   0
 .../src/renderer/row_reuse.rs                 |   1 +
 .../tests/{mod.rs => row_reuse_test.rs}       |   0
 .../src/renderer/snapshot_pool.rs             |   1 +
 .../tests/{mod.rs => snapshot_pool_test.rs}   |   0
 .../src/renderer/transitions.rs               |   1 +
 .../tests/{mod.rs => transitions_test.rs}     |   0
 .../src/renderer/ui_overlays.rs               |   1 +
 .../tests/{mod.rs => ui_overlays_test.rs}     |   0
 .../src/renderer/window_effects.rs            |   1 +
 .../tests/{mod.rs => window_effects_test.rs}  |   0
 .../src/shader_surface_cache.rs               |   1 +
 .../{mod.rs => shader_surface_cache_test.rs}  |   0
 .../src/tooltip_layout.rs                     |   1 +
 .../tests/{mod.rs => tooltip_layout_test.rs}  |   0
 crates/neomacs-renderer-wgpu/src/vertex.rs    |   1 +
 .../vertex/tests/{mod.rs => vertex_test.rs}   |   0
 .../neomacs-renderer-wgpu/src/video_cache.rs  |   1 +
 .../tests/{mod.rs => video_cache_test.rs}     |   0
 .../src/vulkan_dmabuf.rs                      |   1 +
 .../tests/{mod.rs => vulkan_dmabuf_test.rs}   |   0
 crates/neomacs-renderer-wgpu/src/xbm.rs       |   1 +
 .../src/xbm/tests/{mod.rs => xbm_test.rs}     |   0
 crates/neomacs-renderer-wgpu/src/xpm.rs       |   1 +
 .../src/xpm/tests/{mod.rs => xpm_test.rs}     |   0
 .../src/platform/linux/decoder.rs             |  36 +-
 .../decoder/tests/{mod.rs => decoder_test.rs} |  17 +-
 .../src/platform/linux/dmabuf.rs              |   1 +
 .../dmabuf/tests/{mod.rs => dmabuf_test.rs}   |   0
 .../neomacs-video/src/platform/linux/frame.rs |   1 +
 .../frame/tests/{mod.rs => frame_test.rs}     |   0
 crates/neomacs-webview/src/load_state.rs      |   1 +
 .../tests/{mod.rs => load_state_test.rs}      |   0
 .../src/platform/linux/display.rs             |   1 +
 .../display/tests/{mod.rs => display_test.rs} |   0
 .../neomacs-webview/src/platform/linux/sys.rs |   1 +
 .../linux/sys/tests/{mod.rs => sys_test.rs}   |   0
 .../src/platform/macos/focus.rs               |   1 +
 .../focus/tests/{mod.rs => focus_test.rs}     |   0
 crates/neomacs/src/bin/neomacsclient.rs       |   6 +-
 ...itor_tests.rs => alternate_editor_test.rs} |   0
 .../{timeout_tests.rs => timeout_test.rs}     |   0
 .../{transport_tests.rs => transport_test.rs} |   0
 crates/neomacs/src/build_info.rs              |   1 +
 .../tests/{mod.rs => build_info_test.rs}      |   0
 crates/neomacs/src/daemon.rs                  |   2 +-
 .../daemon/tests/{mod.rs => daemon_test.rs}   |   0
 crates/neomacs/src/input_bridge.rs            |   1 +
 .../tests/{mod.rs => input_bridge_test.rs}    |   0
 ...olicy.rs => frame_snapshot_policy_test.rs} |   0
 crates/neomacs/src/tests/main_test.rs         |   2 +-
 crates/neomacs/src/tests/tty_output_test.rs   | 279 ++++++++++++
 crates/neomacs/src/tty_output.rs              | 286 +-----------
 crates/neovm-core/src/buffer/buffer.rs        |   1 +
 .../buffer/tests/{mod.rs => buffer_test.rs}   |   4 +
 crates/neovm-core/src/buffer/buffer_text.rs   |   1 +
 .../tests/{mod.rs => buffer_text_test.rs}     |   3 +
 .../neovm-core/src/buffer/edit_transaction.rs |   2 +-
 ...transpose_gnu.rs => transpose_gnu_test.rs} |   0
 crates/neovm-core/src/buffer/gap_buffer.rs    |   1 +
 .../tests/{mod.rs => gap_buffer_test.rs}      |   0
 crates/neovm-core/src/buffer/overlay.rs       |   1 +
 .../overlay/tests/{mod.rs => overlay_test.rs} |   0
 crates/neovm-core/src/buffer/overlay_bplus.rs |  12 +-
 crates/neovm-core/src/buffer/overlay_index.rs |   1 +
 .../{local_move.rs => local_move_test.rs}     |   0
 .../tests/{mod.rs => overlay_index_test.rs}   |   1 +
 crates/neovm-core/src/buffer/overlay_order.rs |   1 +
 .../tests/{mod.rs => overlay_order_test.rs}   |   0
 .../overlay_bplus_traversal_storage_test.rs   |   8 +
 .../neovm-core/src/buffer/text/backend/mod.rs |   1 +
 .../conformance_test.rs}                      |   0
 crates/neovm-core/src/buffer/text_index.rs    |   2 +-
 .../tests/{mod.rs => text_index_test.rs}      |   0
 crates/neovm-core/src/buffer/text_props.rs    |   1 +
 ...ce_graft.rs => source_slice_graft_test.rs} |   0
 .../tests/{mod.rs => text_props_test.rs}      |   3 +
 ...ob.rs => watched_prop_demand_knob_test.rs} |   0
 ..._demand.rs => watched_prop_demand_test.rs} |   0
 crates/neovm-core/src/buffer/undo.rs          |   1 +
 .../undo/tests/{mod.rs => undo_test.rs}       |   0
 crates/neovm-core/src/display_evaluation.rs   |   1 +
 .../{mod.rs => display_evaluation_test.rs}    |   0
 .../src/emacs_core/commands/abbrev/mod.rs     |   2 +-
 .../abbrev/tests/{mod.rs => abbrev_test.rs}   |   0
 .../emacs_core/commands/interactive/mod.rs    |   2 +-
 .../tests/{mod.rs => interactive_test.rs}     |   0
 .../src/emacs_core/commands/kbd/mod.rs        |   2 +-
 .../kbd/tests/{mod.rs => kbd_test.rs}         |   0
 .../src/emacs_core/commands/keyboard/mod.rs   |   1 +
 .../src/emacs_core/commands/keyboard/pure.rs  |   2 +-
 .../tests/{mod.rs => keyboard_test.rs}        |   0
 .../keyboard/tests/{pure.rs => pure_test.rs}  |   0
 .../src/emacs_core/commands/keymap/mod.rs     |   2 +-
 .../keymap/tests/{mod.rs => keymap_test.rs}   |   0
 .../src/emacs_core/commands/kmacro/mod.rs     |   2 +-
 .../kmacro/tests/{mod.rs => kmacro_test.rs}   |   0
 .../src/emacs_core/commands/minibuffer/mod.rs |   2 +-
 ...se_table.rs => compare_case_table_test.rs} |   0
 .../tests/{mod.rs => minibuffer_test.rs}      |   1 +
 .../src/emacs_core/commands/register/mod.rs   |   2 +-
 .../tests/{mod.rs => register_test.rs}        |   0
 .../src/emacs_core/display/display/mod.rs     |   2 +-
 .../display/tests/{mod.rs => display_test.rs} |   6 +
 ...isplay.rs => popup_idle_redisplay_test.rs} |   0
 .../emacs_core/display/display_host/mod.rs    |   2 +-
 .../{display_host.rs => display_host_test.rs} |   0
 .../emacs_core/display/display_spec/mod.rs    |   2 +-
 .../tests/{mod.rs => display_spec_test.rs}    |   0
 .../emacs_core/display/display_when/mod.rs    |   2 +-
 .../tests/{mod.rs => display_when_test.rs}    |   0
 .../src/emacs_core/display/dispnew/mod.rs     |   1 +
 .../src/emacs_core/display/dispnew/pure.rs    |   2 +-
 .../dispnew/tests/{mod.rs => dispnew_test.rs} |   1 +
 ...icit_redraw.rs => explicit_redraw_test.rs} |   0
 .../{idle_redraw.rs => idle_redraw_test.rs}   |   0
 .../src/emacs_core/display/font/mod.rs        |   2 +-
 .../font/tests/{mod.rs => font_test.rs}       |   1 +
 .../src/emacs_core/display/fontset/mod.rs     |   2 +-
 .../fontset/tests/{mod.rs => fontset_test.rs} |   0
 .../src/emacs_core/display/frame/mod.rs       |   2 +-
 .../tests/{selection.rs => selection_test.rs} |   0
 .../src/emacs_core/display/hscroll/mod.rs     |   2 +-
 .../hscroll/tests/{mod.rs => hscroll_test.rs} |   0
 .../src/emacs_core/display/image/mod.rs       |   2 +-
 .../image/tests/{mod.rs => image_test.rs}     |   0
 .../src/emacs_core/display/image_path/mod.rs  |   2 +-
 .../tests/{mod.rs => image_path_test.rs}      |   0
 .../src/emacs_core/display/neo/modifiers.rs   |   1 +
 .../tests/{mod.rs => modifiers_test.rs}       |   0
 .../src/emacs_core/display/neo/scroll.rs      | 185 +-------
 .../emacs_core/display/neo/terminal/mod.rs    |   2 +-
 .../tests/{mod.rs => terminal_test.rs}        |   0
 .../display/neo/tests/scroll_test.rs          | 181 ++++++++
 .../tests/{runtime.rs => runtime_test.rs}     |   0
 .../src/emacs_core/display/terminal/mod.rs    |   1 +
 .../src/emacs_core/display/terminal/pure.rs   |   4 +-
 ...ration.rs => gc_context_migration_test.rs} |   0
 ...ownership.rs => gc_heap_ownership_test.rs} |   0
 ...le_redisplay.rs => idle_redisplay_test.rs} |   0
 ...einstall.rs => registry_reinstall_test.rs} |   0
 .../tests/{mod.rs => terminal_test.rs}        |   2 +
 .../tests/{runtime.rs => runtime_test.rs}     |   0
 .../src/emacs_core/display/window_cmds/mod.rs |   3 +-
 ...defaults.rs => core_hook_defaults_test.rs} |   0
 ...k_restore.rs => core_hook_restore_test.rs} |   0
 ...ion_chrome.rs => selection_chrome_test.rs} |   0
 .../tests/{mod.rs => window_cmds_test.rs}     |   5 +
 ...eload.rs => window_system_preload_test.rs} |   0
 .../display/window_edge_drag/mod.rs           |   2 +-
 .../{mod.rs => window_edge_drag_test.rs}      |   0
 .../src/emacs_core/display/xdisp/mod.rs       |  29 +-
 .../xdisp/mode_line_numeric_padding.rs        |   2 +-
 .../emacs_core/display/xdisp/motion/mod.rs    |   2 +-
 .../motion/tests/{mod.rs => motion_test.rs}   |   0
 ...de_line_flow.rs => mode_line_flow_test.rs} |   0
 ...gc_roots.rs => mode_line_gc_roots_test.rs} |   0
 ...> mode_line_incremental_lifetimes_test.rs} |   0
 ...rs => mode_line_incremental_roots_test.rs} |   0
 ..._spine.rs => mode_line_live_spine_test.rs} |   0
 ...s => mode_line_multibyte_identity_test.rs} |   0
 ...r_flow.rs => mode_line_outer_flow_test.rs} |   0
 ...rs.rs => mode_line_outer_handlers_test.rs} |   0
 ...=> numeric_padding_default_policy_test.rs} |   0
 .../xdisp/tests/xdisp_row_edge_test.rs        |   9 +
 .../xdisp/tests/{mod.rs => xdisp_test.rs}     |   9 +
 .../src/emacs_core/display/xfaces/mod.rs      |   6 +-
 .../tests/{builtins.rs => builtins_test.rs}   |   0
 ..._ownership.rs => gc_tls_ownership_test.rs} |   0
 .../xfaces/tests/{mod.rs => xfaces_test.rs}   |   0
 .../tests/{runtime.rs => runtime_test.rs}     |   0
 .../src/emacs_core/editing/bookmark/mod.rs    |   2 +-
 .../tests/{mod.rs => bookmark_test.rs}        |   0
 .../src/emacs_core/editing/buffer/mod.rs      |   2 +-
 .../buffer/tests/{mod.rs => buffer_test.rs}   |   2 +
 ...n_primitives.rs => gdn_primitives_test.rs} |   0
 ...nu.rs => set_buffer_multibyte_gnu_test.rs} |   0
 .../src/emacs_core/editing/dired/mod.rs       |   2 +-
 ...se_table.rs => compare_case_table_test.rs} |   0
 .../dired/tests/{mod.rs => dired_test.rs}     |   1 +
 .../src/emacs_core/editing/editfns/mod.rs     |   2 +-
 .../editfns/tests/{mod.rs => editfns_test.rs} |   0
 .../src/emacs_core/editing/indent/mod.rs      |   2 +-
 .../indent/tests/{mod.rs => indent_test.rs}   |   0
 .../src/emacs_core/editing/marker/mod.rs      |   2 +-
 .../marker/tests/{mod.rs => marker_test.rs}   |   0
 .../src/emacs_core/editing/mode/mod.rs        |   4 +-
 ...stom_type_gc.rs => custom_type_gc_test.rs} |   0
 .../mode/tests/{mod.rs => mode_test.rs}       |   0
 .../src/emacs_core/editing/navigation/mod.rs  |   2 +-
 .../{line_index.rs => line_index_test.rs}     |   0
 .../tests/{mod.rs => navigation_test.rs}      |   2 +
 ...y_gnu.rs => selective_display_gnu_test.rs} |   0
 .../src/emacs_core/editing/rect/mod.rs        |   2 +-
 .../rect/tests/{mod.rs => rect_test.rs}       |   0
 .../src/emacs_core/editing/undo/mod.rs        |   2 +-
 .../tests/{kill_ring.rs => kill_ring_test.rs} |   0
 .../undo/tests/{mod.rs => undo_test.rs}       |   0
 .../src/emacs_core/lisp/advice/mod.rs         |   2 +-
 .../advice/tests/{mod.rs => advice_test.rs}   |   0
 .../src/emacs_core/lisp/autoload/mod.rs       |   2 +-
 .../tests/{mod.rs => autoload_test.rs}        |   0
 .../src/emacs_core/lisp/cl_lib/mod.rs         |   2 +-
 .../cl_lib/tests/{mod.rs => cl_lib_test.rs}   |   0
 .../src/emacs_core/lisp/custom/mod.rs         |   2 +-
 .../custom/tests/{mod.rs => custom_test.rs}   |   0
 .../neovm-core/src/emacs_core/lisp/doc/mod.rs |   2 +-
 .../lisp/doc/tests/{mod.rs => doc_test.rs}    |   0
 .../src/emacs_core/lisp/load/mod.rs           |   4 +-
 ...eager_failure.rs => eager_failure_test.rs} |   0
 .../lisp/load/tests/{mod.rs => load_test.rs}  |   0
 ...ale_bytecode.rs => stale_bytecode_test.rs} |   0
 .../src/emacs_core/lisp/lread/mod.rs          |   2 +-
 .../lread/tests/{mod.rs => lread_test.rs}     |   0
 .../lisp/native/builtins/arithmetic.rs        |  16 +-
 .../lisp/native/builtins/collections.rs       |   4 +-
 .../lisp/native/builtins/cons_list.rs         |   6 +-
 .../native/builtins/file_notify/delivery.rs   |   2 +-
 .../lisp/native/builtins/file_notify/mod.rs   |   8 +-
 .../lisp/native/builtins/file_notify/model.rs |   2 +-
 .../file_notify/platform/linux/mod.rs         |   2 +-
 .../linux/tests/{linux.rs => linux_test.rs}   |   0
 .../linux/tests/{worker.rs => worker_test.rs} |   0
 .../file_notify/platform/linux/worker.rs      |   2 +-
 .../file_notify/platform/macos/mod.rs         |   2 +-
 .../macos/tests/{macos.rs => macos_test.rs}   |   0
 .../{unsupported.rs => unsupported_test.rs}   |   0
 .../file_notify/platform/unsupported.rs       |   2 +-
 .../file_notify/platform/windows/mod.rs       |   2 +-
 .../tests/{windows.rs => windows_test.rs}     |   0
 .../tests/{delivery.rs => delivery_test.rs}   |   0
 .../tests/{mod.rs => file_notify_test.rs}     |   0
 ..._ownership.rs => gc_tls_ownership_test.rs} |   0
 .../tests/{linux.rs => linux_test.rs}         |   0
 .../tests/{model.rs => model_test.rs}         |   0
 ...tive_runtime.rs => native_runtime_test.rs} |   0
 .../lisp/native/builtins/fringe_bitmap.rs     |   2 +-
 .../lisp/native/builtins/from_value.rs        |   2 +-
 .../lisp/native/builtins/higher_order.rs      |  10 +-
 .../emacs_core/lisp/native/builtins/hooks.rs  |   2 +-
 .../native/builtins/hooks/redisplay_gnu.rs    |   2 +-
 .../{default_read.rs => default_read_test.rs} |   0
 ...=> window_configuration_redisplay_test.rs} |   0
 .../hooks/window_configuration_redisplay.rs   |   2 +-
 .../lisp/native/builtins/keymaps.rs           |   2 +-
 .../lisp/native/builtins/leaves/mod.rs        |   2 +-
 .../{equivalence.rs => equivalence_test.rs}   |   0
 .../emacs_core/lisp/native/builtins/mod.rs    |  33 +-
 .../emacs_core/lisp/native/builtins/search.rs |   6 +-
 ..._ownership.rs => gc_tls_ownership_test.rs} |   0
 .../lisp/native/builtins/strings.rs           |   2 +-
 ...low.rs => arithmetic_ash_overflow_test.rs} |   0
 ....rs => arithmetic_bignum_borrowed_test.rs} |   0
 ...ue.rs => arithmetic_integer_value_test.rs} |   0
 ...els.rs => arithmetic_limb_kernels_test.rs} |   0
 ...e.rs => arithmetic_minmax_compare_test.rs} |   0
 ...rs => arithmetic_rounding_capture_test.rs} |   0
 ...> arithmetic_rounding_float_exact_test.rs} |   0
 ...> arithmetic_rounding_nil_divisor_test.rs} |   0
 ..._place.rs => aset_string_in_place_test.rs} |   0
 ...c_callbacks.rs => assoc_callbacks_test.rs} |   0
 .../tests/{mod.rs => builtins_test.rs}        |   0
 ...ntity.rs => closure_slot_identity_test.rs} |   0
 ...ure.rs => collection_scan_capture_test.rs} |   0
 ...pture.rs => copy_sequence_capture_test.rs} |   0
 ...subrs.rs => fixed_arity_hot_subrs_test.rs} |   0
 ...fringe_bitmap.rs => fringe_bitmap_test.rs} |   0
 .../{from_value.rs => from_value_test.rs}     |   0
 ...lections.rs => gc_tls_collections_test.rs} |   0
 ...rs => gc_tls_window_configuration_test.rs} |   0
 .../{gdn_equality.rs => gdn_equality_test.rs} |   0
 ...s => higher_order_callback_policy_test.rs} |   0
 ...apture.rs => higher_order_capture_test.rs} |   0
 .../tests/{keymaps.rs => keymaps_test.rs}     |   0
 ..._names.rs => lisp_only_misc_names_test.rs} |   0
 ... lisp_only_predicates_and_aliases_test.rs} |   0
 ...nds.rs => lisp_only_undo_commands_test.rs} |   0
 ...s => lisp_only_window_frame_names_test.rs} |   0
 ...als.rs => make_byte_code_literals_test.rs} |   0
 ...tance.rs => make_closure_instance_test.rs} |   0
 ..._capture.rs => map_resume_capture_test.rs} |   0
 .../{map_resume.rs => map_resume_test.rs}     |   0
 ...ctivation.rs => mapcar_activation_test.rs} |   0
 ...array_growth.rs => obarray_growth_test.rs} |   0
 ...obarray_order.rs => obarray_order_test.rs} |   0
 ...e_walk_gc.rs => predicate_walk_gc_test.rs} |   0
 ...> process_launchers_are_lisp_only_test.rs} |   0
 ...nts.rs => replace_region_contents_test.rs} |   0
 ...rs => rust_subrs_shadowed_by_lisp_test.rs} |   0
 ...ch_frontend.rs => search_frontend_test.rs} |   0
 .../tests/{search.rs => search_test.rs}       |   0
 .../{sort_capture.rs => sort_capture_test.rs} |   0
 .../tests/{strings.rs => strings_test.rs}     |   0
 ...freshness.rs => treesit_freshness_test.rs} |   0
 .../lisp/native/builtins/treesit.rs           |   2 +-
 .../lisp/native/builtins_extra/mod.rs         |   2 +-
 .../tests/{mod.rs => builtins_extra_test.rs}  |   0
 .../emacs_core/lisp/native/floatfns/mod.rs    |   2 +-
 .../tests/{mod.rs => floatfns_test.rs}        |   0
 .../src/emacs_core/lisp/native/fns/mod.rs     |   2 +-
 ...se_table.rs => compare_case_table_test.rs} |   0
 ...ache.rs => compare_position_cache_test.rs} |   0
 .../native/fns/tests/{mod.rs => fns_test.rs}  |   2 +
 .../src/emacs_core/lisp/native/misc/mod.rs    |   2 +-
 .../misc/tests/{mod.rs => misc_test.rs}       |   0
 .../src/emacs_core/lisp/native/subr/info.rs   |   2 +-
 .../src/emacs_core/lisp/native/subr/leaf.rs   |   2 +-
 .../src/emacs_core/lisp/native/subr/mod.rs    |   1 +
 .../subr/tests/{info.rs => info_test.rs}      |   0
 ...leaf_contract.rs => leaf_contract_test.rs} |   0
 .../subr/tests/{mod.rs => subr_test.rs}       |   1 +
 .../src/emacs_core/lisp/print/mod.rs          |   2 +-
 .../print/tests/{mod.rs => print_test.rs}     |   0
 ...ime_surface.rs => runtime_surface_test.rs} |   0
 .../src/emacs_core/lisp/reader/mod.rs         |   8 +-
 ...eardown.rs => minibuffer_teardown_test.rs} |   0
 ...der.rs => minibuffer_unwind_order_test.rs} |   0
 .../tests/{raw_bytes.rs => raw_bytes_test.rs} |   0
 .../reader/tests/{mod.rs => reader_test.rs}   |   0
 crates/neovm-core/src/emacs_core/mod.rs       |  46 +-
 .../src/emacs_core/runtime/alloc/mod.rs       |   2 +-
 .../alloc/tests/{mod.rs => alloc_test.rs}     |   0
 .../emacs_core/runtime/bytecode/arith_kind.rs |   2 +-
 .../src/emacs_core/runtime/bytecode/chunk.rs  |   2 +-
 .../src/emacs_core/runtime/bytecode/decode.rs |   2 +-
 .../src/emacs_core/runtime/bytecode/opcode.rs |   2 +-
 .../runtime/bytecode/resumed_chain.rs         |   4 +-
 ...ath.rs => arith_integer_fast_path_test.rs} |   0
 .../{arith_kind.rs => arith_kind_test.rs}     |   0
 ...eturn.rs => builtin_result_return_test.rs} |   0
 .../tests/{chunk.rs => chunk_test.rs}         |   0
 ..._capture.rs => collection_capture_test.rs} |   0
 .../tests/{decode.rs => decode_test.rs}       |   0
 .../tests/{opcode.rs => opcode_test.rs}       |   0
 .../tests/{osr_chain.rs => osr_chain_test.rs} |   0
 ...ells.rs => primitive_opcode_cells_test.rs} |   0
 ...resumed_chain.rs => resumed_chain_test.rs} |   0
 .../{stack_pool.rs => stack_pool_test.rs}     |   0
 .../tests/{vm_leaf.rs => vm_leaf_test.rs}     |   0
 .../bytecode/tests/{vm.rs => vm_test.rs}      |   2 +-
 .../src/emacs_core/runtime/bytecode/vm.rs     |  10 +-
 .../emacs_core/runtime/bytecode/vm_leaf.rs    |   2 +-
 .../src/emacs_core/runtime/data/mod.rs        |   1 +
 .../data/tests/{mod.rs => data_test.rs}       |   0
 .../src/emacs_core/runtime/debug/mod.rs       |   2 +-
 .../debug/tests/{mod.rs => debug_test.rs}     |   0
 .../emacs_core/runtime/debug_on_call/mod.rs   |   2 +-
 .../tests/{mod.rs => debug_on_call_test.rs}   |   0
 .../src/emacs_core/runtime/error/mod.rs       |  10 +-
 .../error/tests/{mod.rs => error_test.rs}     |   0
 .../tests/{flow_kind.rs => flow_kind_test.rs} |   0
 .../{flow_word_gc.rs => flow_word_gc_test.rs} |   0
 .../tests/{flow_word.rs => flow_word_test.rs} |   0
 ..._ownership.rs => gc_tls_ownership_test.rs} |   0
 .../src/emacs_core/runtime/errors/mod.rs      |   2 +-
 .../errors/tests/{mod.rs => errors_test.rs}   |   0
 .../src/emacs_core/runtime/eval/attention.rs  |   2 +-
 .../src/emacs_core/runtime/eval/callback.rs   |   2 +-
 .../emacs_core/runtime/eval/command_loop.rs   |   4 +-
 .../src/emacs_core/runtime/eval/mod.rs        |  42 +-
 .../emacs_core/runtime/eval/native_stack.rs   |   2 +-
 .../runtime/eval/redisplay_hooks.rs           |  12 +-
 .../eval/redisplay_hooks/echo_message.rs      |   2 +-
 .../{echo_message.rs => echo_message_test.rs} |   0
 ...de_line_flow.rs => mode_line_flow_test.rs} |   0
 ...y1_bytecode.rs => apply1_bytecode_test.rs} |   0
 ...y2_bytecode.rs => apply2_bytecode_test.rs} |   0
 .../tests/{attention.rs => attention_test.rs} |   0
 .../{builtin_vars.rs => builtin_vars_test.rs} |   0
 .../{cconv_memo.rs => cconv_memo_test.rs}     |   0
 ...nsitions.rs => chrome_transitions_test.rs} |   0
 ...rcular_lists.rs => circular_lists_test.rs} |   0
 .../eval/tests/{mod.rs => eval_test.rs}       |   4 +
 ...cycle.rs => gc_forced_first_cycle_test.rs} |   0
 ...major.rs => gc_generational_major_test.rs} |   0
 ...cing.rs => gc_generational_pacing_test.rs} |   0
 ...enerational.rs => gc_generational_test.rs} |   0
 ...closure.rs => gc_heap_mut_closure_test.rs} |   0
 ...ownership.rs => gc_root_ownership_test.rs} |   0
 .../{gc_sweep_cap.rs => gc_sweep_cap_test.rs} |   0
 ...ofs.rs => gc_tls_migration_proofs_test.rs} |   0
 ..._ownership.rs => gc_tls_ownership_test.rs} |   0
 ...le_redisplay.rs => idle_redisplay_test.rs} |   0
 ...crash_repro.rs => jit_crash_repro_test.rs} |   0
 ...onum_nbody.rs => jit_flonum_nbody_test.rs} |   0
 ...loat.rs => jit_known_fixnum_float_test.rs} |   0
 ...jit_leaf_slot.rs => jit_leaf_slot_test.rs} |   0
 ....rs => jit_mir_known_fixnum_float_test.rs} |   0
 .../{leaf_guard.rs => leaf_guard_test.rs}     |   0
 ...cache.rs => native_callback_cache_test.rs} |   0
 .../{native_stack.rs => native_stack_test.rs} |   0
 ..._regression.rs => quit_regression_test.rs} |   0
 .../{quit_request.rs => quit_request_test.rs} |   0
 ...ip.rs => redisplay_hook_ownership_test.rs} |   0
 ...ni_only.rs => redisplay_mini_only_test.rs} |   0
 ...> redisplay_mini_preparer_context_test.rs} |   0
 ...redisplay_mini_source_eligibility_test.rs} |   0
 ...ow.rs => redisplay_mode_line_flow_test.rs} |   0
 ...rs => redisplay_transaction_owner_test.rs} |   0
 .../tests/{var_fast.rs => var_fast_test.rs}   |   0
 ...path.rs => varset_plain_fast_path_test.rs} |   0
 .../tests/{analyzer.rs => analyzer_test.rs}   |   0
 .../tests/{census.rs => census_test.rs}       |   0
 .../{differential.rs => differential_test.rs} |   0
 .../tier_i/tests/{knobs.rs => knobs_test.rs}  |   0
 ...list_bindings.rs => list_bindings_test.rs} |   0
 .../runtime/eval/tier_i/tests/mod.rs          |   6 +
 .../tier_i/tests/{soak.rs => soak_test.rs}    |   0
 .../src/emacs_core/runtime/forward/mod.rs     |   2 +-
 .../tests/{mod.rs => forward_module_test.rs}  |   0
 .../src/emacs_core/runtime/hashtab/mod.rs     |   4 +-
 ...bignum_sxhash.rs => bignum_sxhash_test.rs} |   0
 .../hashtab/tests/{mod.rs => hashtab_test.rs} |   0
 ..._test_guard.rs => user_test_guard_test.rs} |   0
 .../runtime/hashtab/user_test_guard.rs        |   2 +-
 .../emacs_core/runtime/heap_registry/mod.rs   |   2 +-
 .../tests/{ownership.rs => ownership_test.rs} |   0
 .../src/emacs_core/runtime/intern/mod.rs      |   6 +-
 ..._ownership.rs => gc_tls_ownership_test.rs} |   0
 .../intern/tests/{mod.rs => intern_test.rs}   |   0
 .../{seed_prefix.rs => seed_prefix_test.rs}   |   0
 .../src/emacs_core/runtime/jit/cache.rs       |   6 +-
 ..._ownership.rs => gc_tls_ownership_test.rs} |   0
 .../{hof_regalloc.rs => hof_regalloc_test.rs} |   0
 .../{osr_inline.rs => osr_inline_test.rs}     |   0
 .../src/emacs_core/runtime/jit/compile.rs     | 130 +++---
 .../emacs_core/runtime/jit/compile/calls.rs   |   2 +-
 .../runtime/jit/compile/chain_framestate.rs   |   4 +-
 .../runtime/jit/compile/cold_exits.rs         |   2 +-
 .../runtime/jit/compile/dispatch.rs           |   2 +-
 .../runtime/jit/compile/hof_runtime.rs        |   4 +-
 .../runtime/jit/compile/inline_entry_cache.rs |   2 +-
 .../tests/{admission.rs => admission_test.rs} |   0
 .../runtime/jit/compile/inline_hof.rs         |   2 +-
 .../jit/compile/inline_hof/captures.rs        |   2 +-
 .../jit/compile/inline_hof/heap_policy.rs     |   2 +-
 .../runtime/jit/compile/inline_regalloc.rs    |   2 +-
 .../runtime/jit/compile/intrinsics.rs         |   2 +-
 .../runtime/jit/compile/jit_layout.rs         |   4 +-
 .../tests/{golden.rs => golden_test.rs}       |   0
 ...ntime_prefix.rs => runtime_prefix_test.rs} |   0
 .../runtime/jit/compile/opt_backend.rs        |   2 +-
 .../runtime/jit/compile/opt_census.rs         |   2 +-
 .../emacs_core/runtime/jit/compile/shared.rs  |   2 +-
 ..._journal.rs => collection_journal_test.rs} |   0
 ...re.rs => array_projection_capture_test.rs} |   0
 .../{chain_entry.rs => chain_entry_test.rs}   |   0
 ...framestate.rs => chain_framestate_test.rs} |   0
 ...opt_admission.rs => opt_admission_test.rs} |   0
 ...y_profile.rs => opt_array_profile_test.rs} |   0
 .../{opt_arrays.rs => opt_arrays_test.rs}     |   0
 ...ol_numeric.rs => opt_bool_numeric_test.rs} |   0
 .../tests/{opt_bool.rs => opt_bool_test.rs}   |   0
 .../{opt_census.rs => opt_census_test.rs}     |   0
 ...fold_select.rs => opt_fold_select_test.rs} |   0
 .../{opt_ir_lower.rs => opt_ir_lower_test.rs} |   0
 ..._positive.rs => opt_licm_positive_test.rs} |   0
 ...s => opt_opcode_transport_effects_test.rs} |   0
 .../{opt_passes.rs => opt_passes_test.rs}     |   0
 ...t_range_licm.rs => opt_range_licm_test.rs} |   0
 .../{opt_regalloc.rs => opt_regalloc_test.rs} |   0
 .../tests/{opt_reps.rs => opt_reps_test.rs}   |   4 +-
 ...n_counts.rs => opt_rootwin_counts_test.rs} |   0
 ..._probe.rs => opt_sink_alloc_probe_test.rs} |   0
 ...demand.rs => opt_sink_cold_demand_test.rs} |   0
 ..._identity.rs => opt_sink_identity_test.rs} |   0
 ...s => opt_sink_native_verification_test.rs} |   0
 ..._cold.rs => opt_sink_numeric_cold_test.rs} |   0
 ...rs => opt_sink_numeric_infallible_test.rs} |   0
 ...eady.rs => opt_sink_numeric_ready_test.rs} |   0
 ...d.rs => opt_sink_numeric_resolved_test.rs} |   0
 ...> opt_sink_numeric_sqrt_contagion_test.rs} |   0
 ...opt_sink_numeric_static_contagion_test.rs} |   0
 ...opt_sink_sqrt.rs => opt_sink_sqrt_test.rs} |   0
 ...rt_binding.rs => opt_sqrt_binding_test.rs} |   0
 ..._snapshot.rs => opt_sqrt_snapshot_test.rs} |   0
 ...galloc_small.rs => regalloc_small_test.rs} |   0
 .../src/emacs_core/runtime/jit/inline.rs      |  14 +-
 .../src/emacs_core/runtime/jit/opt/build.rs   |   4 +-
 .../src/emacs_core/runtime/jit/opt/mod.rs     |   8 +-
 .../runtime/jit/opt/passes/array_reads.rs     |   2 +-
 .../runtime/jit/opt/passes/bools.rs           |   2 +-
 .../emacs_core/runtime/jit/opt/passes/cfg.rs  |   2 +-
 .../emacs_core/runtime/jit/opt/passes/fold.rs |   2 +-
 .../emacs_core/runtime/jit/opt/passes/mod.rs  |   2 +-
 .../emacs_core/runtime/jit/opt/passes/reps.rs |   2 +-
 .../runtime/jit/opt/passes/reps_lift.rs       |   2 +-
 .../{array_reads.rs => array_reads_test.rs}   |   0
 ...s_reference.rs => bools_reference_test.rs} |   0
 .../passes/tests/{bools.rs => bools_test.rs}  |   0
 .../opt/passes/tests/{cfg.rs => cfg_test.rs}  |   0
 .../passes/tests/{fold.rs => fold_test.rs}    |   0
 .../tests/{reps_lift.rs => reps_lift_test.rs} |   0
 .../passes/tests/{reps.rs => reps_test.rs}    |   0
 .../tests/{verify.rs => verify_test.rs}       |   0
 .../runtime/jit/opt/sink_recipes/verify.rs    |   2 +-
 .../tests/{build_ssa.rs => build_ssa_test.rs} |   0
 .../jit/opt/tests/{eval.rs => eval_test.rs}   |   0
 .../tests/{ir_verify.rs => ir_verify_test.rs} |   0
 ...e_effects.rs => primitive_effects_test.rs} |   0
 ...e_licm_eval.rs => range_licm_eval_test.rs} |   0
 .../jit/opt/tests/{types.rs => types_test.rs} |   0
 .../src/emacs_core/runtime/jit/reopt.rs       |   2 +-
 .../{end_to_end.rs => end_to_end_test.rs}     |   0
 ...teger.rs => arith_generic_integer_test.rs} |   0
 .../{array_shims.rs => array_shims_test.rs}   |   0
 ...call_feedback.rs => call_feedback_test.rs} |   0
 .../{cold_exits.rs => cold_exits_test.rs}     |   0
 ...e_pipeline.rs => compile_pipeline_test.rs} |   0
 .../jit/tests/{compile.rs => compile_test.rs} |   0
 ...l_framed.rs => direct_call_framed_test.rs} |   0
 ...l_memory.rs => direct_call_memory_test.rs} |   0
 ...ges.rs => direct_call_shape_edges_test.rs} |   0
 ...ty.rs => direct_call_shape_parity_test.rs} |   2 +-
 ...l_shapes.rs => direct_call_shapes_test.rs} |   0
 .../{direct_call.rs => direct_call_test.rs}   |   8 +-
 ..._self_heat.rs => direct_self_heat_test.rs} |   0
 ...f_kernel.rs => direct_self_kernel_test.rs} |   0
 .../{direct_self.rs => direct_self_test.rs}   |   4 +-
 ..._prefilter.rs => eq_swp_prefilter_test.rs} |   0
 ...parisons.rs => fixnum_comparisons_test.rs} |   0
 ...fixnum_ranges.rs => fixnum_ranges_test.rs} |   0
 .../{flonum_slots.rs => flonum_slots_test.rs} |   0
 ...=> gen0_observed_blv_cold_capture_test.rs} |   0
 ...gen0_observed_collection_revision_test.rs} |   0
 ....rs => gen0_observed_multi_unbind_test.rs} |   0
 ... gen0_tracked_collection_revision_test.rs} |   0
 ...in_deopt.rs => inline_chain_deopt_test.rs} |   0
 ...line_closure.rs => inline_closure_test.rs} |   0
 ...ry_cache.rs => inline_entry_cache_test.rs} |   0
 ...> inline_heap_collection_revision_test.rs} |   0
 ...ine_heap_gen0_collection_revision_test.rs} |   0
 ...al.rs => inline_heap_generational_test.rs} |  12 +-
 ...ne_heap_ops.rs => inline_heap_ops_test.rs} |   0
 ...aptures.rs => inline_hof_captures_test.rs} |   0
 ..._headers.rs => inline_hof_headers_test.rs} |   0
 ...licy.rs => inline_hof_heap_policy_test.rs} |   0
 ...of_length.rs => inline_hof_length_test.rs} |   0
 ..._runtime.rs => inline_hof_runtime_test.rs} |   0
 ...ed_front.rs => inline_named_front_test.rs} |   0
 ...untime.rs => inline_named_runtime_test.rs} |   0
 ...ne_regalloc.rs => inline_regalloc_test.rs} |   0
 .../jit/tests/{inline.rs => inline_test.rs}   |   0
 ...2_closure.rs => inline_v2_closure_test.rs} |   0
 ...inline_v2_hof.rs => inline_v2_hof_test.rs} |   0
 .../tests/{inline_v2.rs => inline_v2_test.rs} |   0
 .../{inline_vars.rs => inline_vars_test.rs}   |   0
 .../{intrinsics.rs => intrinsics_test.rs}     |   0
 .../{leaf_calls.rs => leaf_calls_test.rs}     |   0
 .../tests/{mir_calls.rs => mir_calls_test.rs} |   0
 ...r_cons_deopt.rs => mir_cons_deopt_test.rs} |   0
 ...ne_guards.rs => mir_inline_guards_test.rs} |   0
 ...af_effects.rs => mir_leaf_effects_test.rs} |   0
 ...named_calls.rs => mir_named_calls_test.rs} |   0
 ...r_reach_dead.rs => mir_reach_dead_test.rs} |   0
 ..._detach.rs => native_frame_detach_test.rs} |   0
 ...observability.rs => observability_test.rs} |   0
 .../tests/{opt_lower.rs => opt_lower_test.rs} |   0
 .../{osr_bindings.rs => osr_bindings_test.rs} |   0
 ...try_guards.rs => osr_entry_guards_test.rs} |   0
 .../tests/{osr_poll.rs => osr_poll_test.rs}   |   0
 .../jit/tests/{osr_raw.rs => osr_raw_test.rs} |   0
 ...branches.rs => predicate_branches_test.rs} |   0
 ...shared_module.rs => shared_module_test.rs} |   0
 .../{source_slots.rs => source_slots_test.rs} |   0
 .../{spec_frames.rs => spec_frames_test.rs}   |   0
 .../tests/{spec_gate.rs => spec_gate_test.rs} |   0
 ..._rest_calls.rs => spec_rest_calls_test.rs} |   0
 .../{stack_guard.rs => stack_guard_test.rs}   |   0
 ...ty.rs => string_observed_capacity_test.rs} |   0
 ...ch_dispatch.rs => switch_dispatch_test.rs} |   0
 ...switch_inline.rs => switch_inline_test.rs} |   0
 .../{tail_calls.rs => tail_calls_test.rs}     |   0
 ...varref_inline.rs => varref_inline_test.rs} |   0
 .../src/emacs_core/runtime/jit/vframe.rs      |   2 +-
 .../src/emacs_core/runtime/owned_roots/mod.rs |  44 +-
 .../owned_roots/tests/owned_roots_test.rs     |  40 ++
 .../emacs_core/runtime/pdump/charset_image.rs |   2 +-
 .../{mule_order.rs => mule_order_test.rs}     |   0
 .../src/emacs_core/runtime/pdump/mod.rs       |   2 +-
 .../{bool_vectors.rs => bool_vectors_test.rs} |   0
 ...jects.rs => bytecode_slot_objects_test.rs} |   0
 ..._hardening.rs => decode_hardening_test.rs} |   0
 .../pdump/tests/{mod.rs => pdump_test.rs}     |   3 +
 .../src/emacs_core/runtime/plist/mod.rs       |   2 +-
 ..._capture.rs => collection_capture_test.rs} |   0
 .../runtime/runtime_identity/mod.rs           |   2 +-
 .../{mod.rs => runtime_identity_test.rs}      |   0
 .../src/emacs_core/runtime/symbol/mod.rs      |   8 +-
 ...ad.rs => buffer_local_global_read_test.rs} |   0
 .../tests/{fn_stamps.rs => fn_stamps_test.rs} |   0
 ...ression.rs => function_regression_test.rs} |   0
 .../{jit_layout.rs => jit_layout_test.rs}     |   0
 ...regression.rs => plist_regression_test.rs} |   0
 ...ression.rs => redirect_regression_test.rs} |   0
 .../symbol/tests/{mod.rs => symbol_test.rs}   |   0
 .../src/emacs_core/runtime/threads/mod.rs     |   2 +-
 .../threads/tests/{mod.rs => threads_test.rs} |   0
 .../src/emacs_core/runtime/value/mod.rs       |  10 +-
 ...de_capture.rs => bytecode_capture_test.rs} |   0
 ...lookup_gnu.rs => equal_lookup_gnu_test.rs} |   0
 ...n.rs => gc_generational_hydration_test.rs} |   0
 .../{hash_probe.rs => hash_probe_test.rs}     |   0
 ...uard.rs => heap_mut_closure_guard_test.rs} |   0
 ...le_lookup.rs => jump_table_lookup_test.rs} |   0
 ...ta_capture.rs => metadata_capture_test.rs} |   0
 .../value/tests/{mod.rs => value_test.rs}     |   3 +
 .../emacs_core/runtime/value_reader/mod.rs    |   2 +-
 .../tests/{mod.rs => value_reader_test.rs}    |   0
 .../src/emacs_core/system/callproc/mod.rs     |   6 +-
 .../src/emacs_core/system/callproc/spawn.rs   |   2 +-
 .../tests/{raw_bytes.rs => raw_bytes_test.rs} |   0
 .../{read_coding.rs => read_coding_test.rs}   |   0
 .../tests/{spawn.rs => spawn_test.rs}         |   0
 ...r_infile.rs => working_dir_infile_test.rs} |   0
 .../dbusbind/tests/{call.rs => call_test.rs}  |   3 +-
 .../{connection.rs => connection_test.rs}     |   4 +-
 .../emacs_core/system/dbusbind/tests/mod.rs   |   5 +
 .../tests/{signal.rs => signal_test.rs}       |   3 +-
 .../tests/{surface.rs => surface_test.rs}     |   0
 .../tests/{types.rs => types_test.rs}         |  10 +-
 .../emacs_core/system/dynamic_module/mod.rs   |   2 +-
 ..._ownership.rs => gc_tls_ownership_test.rs} |   0
 .../src/emacs_core/system/fileio/mod.rs       |   4 +-
 .../fileio/tests/{mod.rs => fileio_test.rs}   |   2 +
 .../fileio/tests/{fix8.rs => fix8_test.rs}    |   0
 .../src/emacs_core/system/filelock/mod.rs     |   2 +-
 .../tests/{mod.rs => filelock_test.rs}        |   0
 .../src/emacs_core/system/network/mod.rs      |   2 +-
 .../network/tests/{mod.rs => network_test.rs} |   0
 .../src/emacs_core/system/os_signal/mod.rs    |   2 +-
 .../tests/{mod.rs => os_signal_test.rs}       |   0
 .../src/emacs_core/system/path_exec/mod.rs    |   2 +-
 .../tests/{mod.rs => path_exec_test.rs}       |   0
 .../tests/{surface.rs => surface_test.rs}     |   0
 .../emacs_core/system/post_image_init/mod.rs  |   2 +-
 .../tests/{mod.rs => post_image_init_test.rs} |   0
 .../src/emacs_core/system/process/mod.rs      |   4 +-
 .../process/tests/{mod.rs => process_test.rs} |   0
 .../tests/{raw_bytes.rs => raw_bytes_test.rs} |   0
 .../emacs_core/system/shell_file_name/mod.rs  |   2 +-
 .../tests/{mod.rs => shell_file_name_test.rs} |   0
 .../src/emacs_core/system/sqlite/mod.rs       |   4 +-
 .../tests/{disabled.rs => disabled_test.rs}   |   0
 .../tests/{enabled.rs => enabled_test.rs}     |   0
 .../src/emacs_core/system/timefns/mod.rs      |   2 +-
 .../timefns/tests/{mod.rs => timefns_test.rs} |   0
 .../src/emacs_core/system/timer/mod.rs        |   2 +-
 .../timer/tests/{mod.rs => timer_test.rs}     |   0
 .../tls/tests/{runtime.rs => runtime_test.rs} |   0
 .../{layout.rs => layout_test.rs}             |   0
 ..._guard.rs => runtime_string_guard_test.rs} |   0
 ...ol_id_guard.rs => symbol_id_guard_test.rs} |   0
 ...smute_guard.rs => transmute_guard_test.rs} |   0
 ...main_rule.rs => compile_main_rule_test.rs} |   0
 ...nerated_lisp.rs => generated_lisp_test.rs} |   0
 .../tests/compat_regressions/mod.rs           |   2 +-
 .../{mod.rs => compat_regressions_test.rs}    |   0
 ...fvar_special.rs => defvar_special_test.rs} |   0
 .../gnu_surface/{subr.rs => subr_test.rs}     |   0
 .../src/emacs_core/text/boolvec/mod.rs        |   2 +-
 .../boolvec/tests/{mod.rs => boolvec_test.rs} |   0
 .../src/emacs_core/text/casefiddle/mod.rs     |   2 +-
 .../tests/{mod.rs => casefiddle_test.rs}      |   0
 .../src/emacs_core/text/casetab/mod.rs        |   4 +-
 .../casetab/tests/{mod.rs => casetab_test.rs} |   0
 ..._ownership.rs => gc_tls_ownership_test.rs} |   0
 .../src/emacs_core/text/category/mod.rs       |   4 +-
 .../tests/{mod.rs => category_test.rs}        |   0
 ..._ownership.rs => gc_tls_ownership_test.rs} |   0
 .../neovm-core/src/emacs_core/text/ccl/mod.rs |   4 +-
 .../text/ccl/tests/{mod.rs => ccl_test.rs}    |   0
 ..._ownership.rs => gc_tls_ownership_test.rs} |   0
 .../src/emacs_core/text/charset/mod.rs        |   4 +-
 .../charset/tests/{mod.rs => charset_test.rs} |   2 +
 ..._ownership.rs => gc_tls_ownership_test.rs} |   0
 ...mule_identity.rs => mule_identity_test.rs} |   0
 ...prepared_mule.rs => prepared_mule_test.rs} |   0
 .../src/emacs_core/text/chartable/mod.rs      |   4 +-
 .../tests/{mod.rs => chartable_test.rs}       |   0
 ...e.rs => collection_lookup_capture_test.rs} |   0
 .../src/emacs_core/text/coding/mod.rs         |   2 +-
 .../coding/tests/{mod.rs => coding_test.rs}   |   0
 .../src/emacs_core/text/composite/mod.rs      |   2 +-
 .../tests/{mod.rs => composite_test.rs}       |   0
 .../src/emacs_core/text/emacs_char/mod.rs     |   2 +-
 .../tests/{mod.rs => emacs_char_test.rs}      |   1 +
 ...te_gnu.rs => str_as_multibyte_gnu_test.rs} |   0
 .../src/emacs_core/text/format/mod.rs         |   2 +-
 .../format/tests/{mod.rs => format_test.rs}   |   0
 .../src/emacs_core/text/json/mod.rs           |   2 +-
 .../text/json/tests/{mod.rs => json_test.rs}  |   0
 .../src/emacs_core/text/regex/dfa.rs          |   2 +-
 .../src/emacs_core/text/regex/emacs.rs        |  14 +-
 .../src/emacs_core/text/regex/mod.rs          |  10 +-
 ...casefold_scan.rs => casefold_scan_test.rs} |   0
 .../text/regex/tests/{dfa.rs => dfa_test.rs}  |   0
 .../regex/tests/{emacs.rs => emacs_test.rs}   |   0
 ...ck_parity.rs => fail_stack_parity_test.rs} |   0
 ...r.rs => gc_collection_epoch_minor_test.rs} |   0
 ...n_epoch.rs => gc_collection_epoch_test.rs} |   0
 ...eral_epoch.rs => gc_literal_epoch_test.rs} |   0
 ..._ownership.rs => gc_tls_ownership_test.rs} |   0
 ...opcode_decode.rs => opcode_decode_test.rs} |   0
 .../regex/tests/{mod.rs => regex_test.rs}     |   0
 ...short_literal.rs => short_literal_test.rs} |   0
 .../{start_anchor.rs => start_anchor_test.rs} |   0
 ...ffix_literal.rs => suffix_literal_test.rs} |   0
 .../src/emacs_core/text/search/mod.rs         |   2 +-
 .../search/tests/{mod.rs => search_test.rs}   |   0
 .../src/emacs_core/text/string_escape/mod.rs  |   2 +-
 .../tests/{mod.rs => string_escape_test.rs}   |   0
 .../emacs_core/text/string_pos_cache/mod.rs   |   8 +-
 ...r.rs => gc_collection_epoch_minor_test.rs} |   0
 ...n_epoch.rs => gc_collection_epoch_test.rs} |   0
 ..._ownership.rs => gc_tls_ownership_test.rs} |   0
 .../{mod.rs => string_pos_cache_test.rs}      |   0
 .../src/emacs_core/text/syntax/mod.rs         |  16 +-
 .../src/emacs_core/text/syntax/parse_cache.rs |   6 +-
 .../src/emacs_core/text/syntax/parse_loop.rs  |   2 +-
 .../emacs_core/text/syntax/pps_propertize.rs  |   2 +-
 ...ical.rs => back_comment_canonical_test.rs} |   0
 ...rs => back_comment_safe_positions_test.rs} |   0
 ..._property.rs => category_property_test.rs} |   0
 ..._ownership.rs => gc_tls_ownership_test.rs} |   0
 ...word_motion.rs => gdn_word_motion_test.rs} |   0
 ...ssion.rs => gnu_parity_regression_test.rs} |   0
 ...on.rs => parse_cache_invalidation_test.rs} |   0
 .../{parse_cache.rs => parse_cache_test.rs}   |   0
 ...op_resume.rs => parse_loop_resume_test.rs} |   0
 ....rs => parse_state_divergence_gnu_test.rs} |   0
 ...tize_gnu.rs => pps_propertize_gnu_test.rs} |   0
 ...ze_knob.rs => pps_propertize_knob_test.rs} |   0
 ...ata_gnu.rs => scan_error_data_gnu_test.rs} |   0
 ...classes.rs => skip_syntax_classes_test.rs} |   0
 ...te_run.rs => syntax_prop_byte_run_test.rs} |   0
 .../syntax/tests/{mod.rs => syntax_test.rs}   |   1 +
 .../src/emacs_core/text/textprop/mod.rs       |   2 +-
 .../tests/{mod.rs => textprop_test.rs}        |   0
 .../src/emacs_core/text/treesit/mod.rs        |   2 +-
 .../treesit/tests/{mod.rs => treesit_test.rs} |   0
 .../neovm-core/src/emacs_core/text/xml/mod.rs |   2 +-
 .../text/xml/tests/{mod.rs => xml_test.rs}    |   0
 crates/neovm-core/src/encoding.rs             |   1 +
 .../tests/{mod.rs => encoding_test.rs}        |   1 +
 ...prepared_mule.rs => prepared_mule_test.rs} |   0
 crates/neovm-core/src/face.rs                 |   1 +
 .../src/face/tests/{mod.rs => face_test.rs}   |   0
 crates/neovm-core/src/image_identity.rs       |   1 +
 .../tests/{mod.rs => image_identity_test.rs}  |   0
 crates/neovm-core/src/keyboard.rs             |   1 +
 .../src/keyboard/display_service.rs           |  48 +-
 .../keyboard/tests/display_service_test.rs    |  44 ++
 .../tests/{mod.rs => keyboard_test.rs}        |   0
 crates/neovm-core/src/lib.rs                  |   2 +-
 .../neovm-core/src/tagged/collection_reads.rs |  11 +-
 .../collection_reads_test.rs}                 |   1 +
 .../{fast_paths.rs => fast_paths_test.rs}     |   0
 .../{lazy_window.rs => lazy_window_test.rs}   |   0
 ...lisions.rs => observed_collisions_test.rs} |   0
 ...served_epoch.rs => observed_epoch_test.rs} |   0
 .../{observed_gap.rs => observed_gap_test.rs} |   0
 crates/neovm-core/src/tagged/gc.rs            |  56 +--
 .../neovm-core/src/tagged/gc/arena_pages.rs   |   2 +-
 crates/neovm-core/src/tagged/gc/chunk_map.rs  |   2 +-
 .../src/tagged/gc/collection_observed.rs      |   4 +-
 .../src/tagged/gc/cons_block_trailer.rs       |   2 +-
 .../neovm-core/src/tagged/gc/cons_blocks.rs   |   2 +-
 crates/neovm-core/src/tagged/gc/gc_thread.rs  |   2 +-
 .../src/tagged/gc/memory_inventory.rs         |   2 +-
 .../src/tagged/gc/memory_telemetry.rs         |   2 +-
 ...c_region_tests.rs => alloc_region_test.rs} |   0
 ...ena_minor_tests.rs => arena_minor_test.rs} |   0
 ...otion_tests.rs => arena_promotion_test.rs} |   0
 ...rs => barrier_window_generational_test.rs} |   0
 ...window_tests.rs => barrier_window_test.rs} |   0
 ...um_arena_tests.rs => bignum_arena_test.rs} |   0
 ...birth_logs_tests.rs => birth_logs_test.rs} |   0
 ..._arena_tests.rs => bytecode_arena_test.rs} |   0
 .../tests/{census_tests.rs => census_test.rs} |   0
 ...de_tests.rs => chunk_entry_decode_test.rs} |   0
 .../{chunk_map_tests.rs => chunk_map_test.rs} |   0
 ...s => collection_observed_registry_test.rs} |   0
 ...d_tests.rs => collection_observed_test.rs} |   0
 ...sts.rs => concurrent_major_worker_test.rs} |   0
 ...cons_alloc_tests.rs => cons_alloc_test.rs} |   0
 ...cons_minor_tests.rs => cons_minor_test.rs} |   0
 ..._trailer_tests.rs => cons_trailer_test.rs} |   0
 ...oat_arena_tests.rs => float_arena_test.rs} |   0
 ...generation_tests.rs => generation_test.rs} |   0
 ...or_tests.rs => generational_major_test.rs} |   0
 ...g_tests.rs => generational_pacing_test.rs} |   0
 ...rational_tests.rs => generational_test.rs} |   0
 ...tests.rs => generational_verifier_test.rs} |   0
 ...sure_tests.rs => heap_mut_closure_test.rs} |   0
 ...na_tests.rs => lambda_macro_arena_test.rs} |   0
 ...ut_stats_tests.rs => layout_stats_test.rs} |   0
 ...tests.rs => major_symbol_preimage_test.rs} |   0
 ...er_arena_tests.rs => marker_arena_test.rs} |   0
 ...tory_tests.rs => memory_inventory_test.rs} |   0
 ...etry_tests.rs => memory_telemetry_test.rs} |   0
 .../{ownership_tests.rs => ownership_test.rs} |   0
 .../tests/{pacer_tests.rs => pacer_test.rs}   |   0
 ...rd_arena_tests.rs => record_arena_test.rs} |   0
 ...slot_store_tests.rs => slot_store_test.rs} |   0
 ...arrier_tests.rs => symbol_barrier_test.rs} |   0
 ...tests.rs => symbol_with_pos_arena_test.rs} |   0
 ...ship.rs => thread_local_ownership_test.rs} |   0
 .../{vec_scan_tests.rs => vec_scan_test.rs}   |   0
 crates/neovm-core/src/tagged/mod.rs           |   1 +
 crates/neovm-core/src/tagged/mutate.rs        |   2 +-
 crates/neovm-core/src/tagged/symbol_marks.rs  |   1 +
 .../tests/{mod.rs => symbol_marks_test.rs}    |   0
 .../tagged/{tests.rs => tests/tagged_test.rs} |   1 +
 .../{write_fusion.rs => write_fusion_test.rs} |   0
 crates/neovm-core/src/tagged/value.rs         |   2 +-
 ..._ownership.rs => gc_tls_ownership_test.rs} |   0
 .../{test_utils.rs => test_utils_test.rs}     |   0
 crates/neovm-core/src/window/frame_alpha.rs   |   2 +-
 .../tests/{mod.rs => frame_alpha_test.rs}     |   0
 crates/neovm-core/src/window/mod.rs           |   1 +
 ...hook_epoch.rs => split_hook_epoch_test.rs} |   0
 .../window/tests/{mod.rs => window_test.rs}   |   2 +
 crates/xtask/src/tests/window_icon_test.rs    |  58 +++
 crates/xtask/src/window_icon.rs               |  63 +--
 1255 files changed, 3479 insertions(+), 3183 deletions(-)
 rename crates/neomacs-diagnostics/src/flamegraph/tests/{mod.rs => flamegraph_test.rs} (100%)
 rename crates/neomacs-diagnostics/src/metrics/tests/{mod.rs => metrics_test.rs} (100%)
 rename crates/neomacs-diagnostics/src/pprof/tests/{mod.rs => pprof_test.rs} (100%)
 rename crates/neomacs-diagnostics/src/report/tests/{mod.rs => report_test.rs} (100%)
 rename crates/neomacs-diagnostics/src/server/tests/{mod.rs => server_test.rs} (100%)
 rename crates/neomacs-display-protocol/src/child_frame_animation/tests/{mod.rs => child_frame_animation_test.rs} (100%)
 rename crates/neomacs-display-protocol/src/display_identity/tests/{mod.rs => display_identity_test.rs} (100%)
 rename crates/neomacs-display-protocol/src/effect_config/tests/{mod.rs => effect_config_test.rs} (100%)
 rename crates/neomacs-display-protocol/src/face/tests/{mod.rs => face_test.rs} (100%)
 rename crates/neomacs-display-protocol/src/font/tests/{mod.rs => font_test.rs} (100%)
 rename crates/neomacs-display-protocol/src/frame_chrome/tests/{mod.rs => frame_chrome_test.rs} (100%)
 rename crates/neomacs-display-protocol/src/frame_glyphs/tests/{mod.rs => frame_glyphs_test.rs} (100%)
 rename crates/neomacs-display-protocol/src/frame_time/tests/{mod.rs => frame_time_test.rs} (100%)
 rename crates/neomacs-display-protocol/src/geometry/tests/{mod.rs => geometry_test.rs} (100%)
 rename crates/neomacs-display-protocol/src/glyph_matrix/tests/{mod.rs => glyph_matrix_test.rs} (99%)
 rename crates/neomacs-display-protocol/src/glyph_matrix/text_geometry/tests/{mod.rs => text_geometry_test.rs} (100%)
 rename crates/neomacs-display-protocol/src/interaction_projection/tests/{mod.rs => interaction_projection_test.rs} (100%)
 rename crates/neomacs-display-protocol/src/motion_spec/tests/{mod.rs => motion_spec_test.rs} (100%)
 rename crates/neomacs-display-protocol/src/popup_placement/tests/{mod.rs => popup_placement_test.rs} (100%)
 rename crates/neomacs-display-protocol/src/present_mapping/tests/{mod.rs => present_mapping_test.rs} (100%)
 rename crates/neomacs-display-protocol/src/presentation_origin/tests/{mod.rs => presentation_origin_test.rs} (100%)
 rename crates/neomacs-display-protocol/src/presented_frame/tests/{mod.rs => presented_frame_test.rs} (100%)
 rename crates/neomacs-display-protocol/src/presented_pointer/tests/{mod.rs => presented_pointer_test.rs} (100%)
 create mode 100644 crates/neomacs-display-protocol/src/presented_pointer/tests/scroll_test.rs
 rename crates/neomacs-display-protocol/src/scene/tests/{mod.rs => scene_test.rs} (100%)
 rename crates/neomacs-display-protocol/src/scroll_animation/tests/{mod.rs => scroll_animation_test.rs} (100%)
 rename crates/neomacs-display-protocol/src/sealed_frame_presentation/tests/{mod.rs => sealed_frame_presentation_test.rs} (100%)
 rename crates/neomacs-display-protocol/src/snapshot_text/tests/{mod.rs => snapshot_text_test.rs} (100%)
 rename crates/neomacs-display-protocol/src/terminal_color/tests/{mod.rs => terminal_color_test.rs} (100%)
 create mode 100644 crates/neomacs-display-protocol/src/tests/input_latency_test.rs
 create mode 100644 crates/neomacs-display-protocol/src/tests/input_progress_test.rs
 rename crates/neomacs-display-protocol/src/toolbar_icon/tests/{mod.rs => toolbar_icon_test.rs} (100%)
 rename crates/neomacs-display-protocol/src/tooltip/lifetime/tests/{mod.rs => lifetime_test.rs} (100%)
 rename crates/neomacs-display-protocol/src/transition_policy/tests/{mod.rs => transition_policy_test.rs} (100%)
 rename crates/neomacs-display-protocol/src/tty_palette/tests/{mod.rs => tty_palette_test.rs} (100%)
 rename crates/neomacs-display-protocol/src/types/tests/{mod.rs => types_test.rs} (100%)
 rename crates/neomacs-display-protocol/src/window_animation/tests/{mod.rs => window_animation_test.rs} (100%)
 rename crates/neomacs-display-protocol/src/window_chrome/tests/{mod.rs => window_chrome_test.rs} (100%)
 rename crates/neomacs-display-protocol/src/xterm_palette/tests/{mod.rs => xterm_palette_test.rs} (100%)
 rename crates/neomacs-display-protocol/src/xwidget_extent/tests/{mod.rs => xwidget_extent_test.rs} (100%)
 rename crates/neomacs-display-runtime/src/backend/tty/rif/tests/{mod.rs => rif_test.rs} (100%)
 rename crates/neomacs-display-runtime/src/backend/wgpu/animation/tests/{mod.rs => animation_test.rs} (100%)
 rename crates/neomacs-display-runtime/src/backend/wgpu/drm_device/tests/{mod.rs => drm_device_test.rs} (100%)
 rename crates/neomacs-display-runtime/src/backend/wgpu/events/tests/{mod.rs => events_test.rs} (100%)
 rename crates/neomacs-display-runtime/src/display_scale/tests/{mod.rs => display_scale_test.rs} (100%)
 rename crates/neomacs-display-runtime/src/macos_bundle_runtime/tests/{mod.rs => macos_bundle_runtime_test.rs} (100%)
 rename crates/neomacs-display-runtime/src/menus/controller/tests/{mod.rs => controller_test.rs} (100%)
 rename crates/neomacs-display-runtime/src/menus/help/tests/{mod.rs => help_test.rs} (100%)
 rename crates/neomacs-display-runtime/src/menus/session/tests/{mod.rs => session_test.rs} (100%)
 rename crates/neomacs-display-runtime/src/presentation/retirement/tests/{mod.rs => retirement_test.rs} (100%)
 create mode 100644 crates/neomacs-display-runtime/src/presentation/tests/pacing_test.rs
 create mode 100644 crates/neomacs-display-runtime/src/presentation_feedback/tests/wayland_test.rs
 create mode 100644 crates/neomacs-display-runtime/src/redisplay/tests/maintenance_test.rs
 rename crates/neomacs-display-runtime/src/render_thread/child_frames/tests/{mod.rs => child_frames_test.rs} (100%)
 rename crates/neomacs-display-runtime/src/render_thread/cursor/tests/{mod.rs => cursor_test.rs} (100%)
 rename crates/neomacs-display-runtime/src/render_thread/device_loss/tests/{mod.rs => device_loss_test.rs} (100%)
 rename crates/neomacs-display-runtime/src/render_thread/frame_compositor/continuity/pane_layout/tests/{mod.rs => pane_layout_test.rs} (100%)
 rename crates/neomacs-display-runtime/src/render_thread/frame_compositor/continuity/reflow/tests/{mod.rs => reflow_test.rs} (100%)
 rename crates/neomacs-display-runtime/src/render_thread/frame_compositor/continuity/scroll/tests/{mod.rs => scroll_test.rs} (100%)
 rename crates/neomacs-display-runtime/src/render_thread/frame_compositor/continuity/selection/tests/{mod.rs => selection_test.rs} (100%)
 rename crates/neomacs-display-runtime/src/render_thread/frame_compositor/continuity/theme/tests/{mod.rs => theme_test.rs} (100%)
 rename crates/neomacs-display-runtime/src/render_thread/frame_compositor/input_scroll/{tests.rs => tests/input_scroll_test.rs} (100%)
 rename crates/neomacs-display-runtime/src/render_thread/frame_compositor/layout_continuity/tests/{mod.rs => layout_continuity_test.rs} (100%)
 rename crates/neomacs-display-runtime/src/render_thread/frame_compositor/layout_driver/tests/{mod.rs => layout_driver_test.rs} (100%)
 rename crates/neomacs-display-runtime/src/render_thread/frame_compositor/motion/tests/{mod.rs => motion_test.rs} (100%)
 rename crates/neomacs-display-runtime/src/render_thread/frame_ingest/tests/{mod.rs => frame_ingest_test.rs} (100%)
 rename crates/neomacs-display-runtime/src/render_thread/frame_state/tests/{mod.rs => frame_state_test.rs} (100%)
 rename crates/neomacs-display-runtime/src/render_thread/frame_windows/tests/{mod.rs => frame_windows_test.rs} (100%)
 rename crates/neomacs-display-runtime/src/render_thread/input/tests/{mod.rs => input_test.rs} (100%)
 rename crates/neomacs-display-runtime/src/render_thread/modifier_sides/{tests.rs => tests/modifier_sides_test.rs} (100%)
 rename crates/neomacs-display-runtime/src/render_thread/render_pass/composition_targets/tests/{mod.rs => composition_targets_test.rs} (100%)
 rename crates/neomacs-display-runtime/src/render_thread/render_pass/retained_scroll/{tests.rs => tests/retained_scroll_test.rs} (100%)
 rename crates/neomacs-display-runtime/src/render_thread/render_pass/retained_static/tests/{mod.rs => retained_static_test.rs} (100%)
 rename crates/neomacs-display-runtime/src/render_thread/render_pass/scene/{native_boundary_tests.rs => tests/native_boundary_test.rs} (100%)
 rename crates/neomacs-display-runtime/src/render_thread/render_pass/scene/{pane_size_boundary_tests.rs => tests/pane_size_boundary_test.rs} (100%)
 rename crates/neomacs-display-runtime/src/render_thread/render_pass/scene/{pinned_lifecycle_tests.rs => tests/pinned_lifecycle_test.rs} (100%)
 rename crates/neomacs-display-runtime/src/render_thread/render_pass/scene/{retained_owner_tests.rs => tests/retained_owner_test.rs} (100%)
 rename crates/neomacs-display-runtime/src/render_thread/render_pass/scene/{tests.rs => tests/scene_test.rs} (99%)
 rename crates/neomacs-display-runtime/src/render_thread/render_pass/tests/{mod.rs => render_pass_test.rs} (100%)
 create mode 100644 crates/neomacs-display-runtime/src/render_thread/render_pass/tests/retained_scroll_geometry_test.rs
 rename crates/neomacs-display-runtime/src/render_thread/state/tests/{mod.rs => state_test.rs} (100%)
 rename crates/neomacs-display-runtime/src/render_thread/surface_readback/tests/{mod.rs => surface_readback_test.rs} (100%)
 rename crates/neomacs-display-runtime/src/render_thread/terminal_commands/tests/{mod.rs => terminal_commands_test.rs} (100%)
 rename crates/neomacs-display-runtime/src/render_thread/terminal_expansion/tests/{mod.rs => terminal_expansion_test.rs} (100%)
 create mode 100644 crates/neomacs-display-runtime/src/render_thread/tests/pointer_events_webview_test.rs
 rename crates/neomacs-display-runtime/src/render_thread/{tests.rs => tests/render_thread_test.rs} (100%)
 rename crates/neomacs-display-runtime/src/render_thread/thread_handle/tests/{mod.rs => thread_handle_test.rs} (100%)
 rename crates/neomacs-display-runtime/src/render_thread/toolbar/tests/{mod.rs => toolbar_test.rs} (100%)
 rename crates/neomacs-display-runtime/src/render_thread/transitions/tests/{mod.rs => transitions_test.rs} (100%)
 rename crates/neomacs-display-runtime/src/terminal/colors/tests/{mod.rs => colors_test.rs} (100%)
 rename crates/neomacs-display-runtime/src/terminal/content/tests/{mod.rs => content_test.rs} (100%)
 rename crates/neomacs-display-runtime/src/terminal/view/tests/{mod.rs => view_test.rs} (100%)
 create mode 100644 crates/neomacs-display-runtime/src/tests/window_icon_test.rs
 create mode 100644 crates/neomacs-display-runtime/src/tests/window_identity_test.rs
 rename crates/neomacs-display-runtime/src/thread_comm/frame_opacity/tests/{mod.rs => frame_opacity_test.rs} (100%)
 rename crates/neomacs-display-runtime/src/thread_comm/tests/{mod.rs => thread_comm_test.rs} (100%)
 rename crates/neomacs-font-materializer/src/fontdb/tests/{mod.rs => fontdb_test.rs} (100%)
 rename crates/neomacs-layout-engine/src/bidi/reorder/tests/{mod.rs => reorder_test.rs} (100%)
 rename crates/neomacs-layout-engine/src/bidi/resolver/tests/{mod.rs => resolver_test.rs} (100%)
 rename crates/neomacs-layout-engine/src/bidi/tables/tests/{mod.rs => tables_test.rs} (100%)
 rename crates/neomacs-layout-engine/src/bidi/types/tests/{mod.rs => types_test.rs} (100%)
 rename crates/neomacs-layout-engine/src/buffer_source/body_render/tests/{mini_row_storage.rs => mini_row_storage_test.rs} (100%)
 rename crates/neomacs-layout-engine/src/buffer_source/end_of_buffer_rows/tests/{mod.rs => end_of_buffer_rows_test.rs} (100%)
 rename crates/neomacs-layout-engine/src/buffer_source/fringe_arrows/tests/{mod.rs => fringe_arrows_test.rs} (100%)
 rename crates/neomacs-layout-engine/src/buffer_source/producer/tests/{mod.rs => producer_test.rs} (100%)
 rename crates/neomacs-layout-engine/src/buffer_source/producer/vocabulary/tests/{mod.rs => vocabulary_test.rs} (100%)
 rename crates/neomacs-layout-engine/src/buffer_source/row_route/tests/{mod.rs => row_route_test.rs} (100%)
 create mode 100644 crates/neomacs-layout-engine/src/buffer_source/tests/owned_capture_test.rs
 rename crates/neomacs-layout-engine/src/buffer_source/tests/{property_keys_budget_support.rs => property_keys_budget_support_test.rs} (100%)
 rename crates/neomacs-layout-engine/src/buffer_source/tests/{source_budget_default_policy.rs => source_budget_default_policy_test.rs} (100%)
 rename crates/neomacs-layout-engine/src/buffer_source/tests/{source_budget_policy_aliases.rs => source_budget_policy_aliases_test.rs} (100%)
 rename crates/neomacs-layout-engine/src/buffer_source/tests/{window_source_tests.rs => window_source_test.rs} (100%)
 rename crates/neomacs-layout-engine/src/buffer_source/window_geometry/tests/{mod.rs => window_geometry_test.rs} (100%)
 rename crates/neomacs-layout-engine/src/buffer_source/window_source/tests/{mod.rs => window_source_test.rs} (100%)
 rename crates/neomacs-layout-engine/src/composition/tests/{mod.rs => composition_test.rs} (100%)
 rename crates/neomacs-layout-engine/src/display_face_layout/tests/{mod.rs => display_face_layout_test.rs} (100%)
 rename crates/neomacs-layout-engine/src/display_frame_output/tests/{mod.rs => display_frame_output_test.rs} (100%)
 rename crates/neomacs-layout-engine/src/display_item/tests/{mod.rs => display_item_test.rs} (100%)
 rename crates/neomacs-layout-engine/src/display_pixel_calc/tests/{mod.rs => display_pixel_calc_test.rs} (100%)
 rename crates/neomacs-layout-engine/src/display_property/tests/{mod.rs => display_property_test.rs} (100%)
 rename crates/neomacs-layout-engine/src/display_row/builder/tests/{mod.rs => builder_test.rs} (100%)
 rename crates/neomacs-layout-engine/src/display_row/finalizer/tests/{mod.rs => finalizer_test.rs} (100%)
 rename crates/neomacs-layout-engine/src/display_row/geometry/tests/{mod.rs => geometry_test.rs} (100%)
 rename crates/neomacs-layout-engine/src/display_row/source_append/tests/{mod.rs => source_append_test.rs} (100%)
 rename crates/neomacs-layout-engine/src/display_row/source_render/tests/{mod.rs => source_render_test.rs} (100%)
 rename crates/neomacs-layout-engine/src/display_row/source_state/tests/{mod.rs => source_state_test.rs} (100%)
 rename crates/neomacs-layout-engine/src/display_row/{test.rs => tests/display_row_test.rs} (100%)
 rename crates/neomacs-layout-engine/src/display_row/trailing_whitespace/tests/{mod.rs => trailing_whitespace_test.rs} (100%)
 rename crates/neomacs-layout-engine/src/display_source/tests/{mod.rs => display_source_test.rs} (100%)
 rename crates/neomacs-layout-engine/src/display_source_overflow/tests/{mod.rs => display_source_overflow_test.rs} (100%)
 rename crates/neomacs-layout-engine/src/display_source_resolver/tests/{compiled_collection_mutation.rs => compiled_collection_mutation_test.rs} (100%)
 rename crates/neomacs-layout-engine/src/display_status_line/tests/{mod.rs => display_status_line_test.rs} (100%)
 rename crates/neomacs-layout-engine/src/display_when/tests/{mod.rs => display_when_test.rs} (100%)
 rename crates/neomacs-layout-engine/src/engine/tests/{edit_sync_source_budget_consumers.rs => edit_sync_source_budget_consumers_test.rs} (100%)
 rename crates/neomacs-layout-engine/src/engine/tests/{edit_sync_source_budget_replay_retry.rs => edit_sync_source_budget_replay_retry_test.rs} (100%)
 rename crates/neomacs-layout-engine/src/engine/tests/{mod.rs => engine_test.rs} (99%)
 rename crates/neomacs-layout-engine/src/engine/tests/{mini_scroll_sites.rs => mini_scroll_sites_test.rs} (100%)
 rename crates/neomacs-layout-engine/src/engine/tests/{mini_source_start.rs => mini_source_start_test.rs} (100%)
 rename crates/neomacs-layout-engine/src/engine/tests/{mini_source_stop.rs => mini_source_stop_test.rs} (100%)
 rename crates/neomacs-layout-engine/src/font/catalog/tests/{mod.rs => catalog_test.rs} (100%)
 rename crates/neomacs-layout-engine/src/font/font_match/tests/{mod.rs => font_match_test.rs} (100%)
 create mode 100644 crates/neomacs-layout-engine/src/font/fontconfig/tests/candidate_cache_test.rs
 rename crates/neomacs-layout-engine/src/font/fontconfig/tests/{mod.rs => fontconfig_test.rs} (100%)
 rename crates/neomacs-layout-engine/src/font/metrics/tests/{mod.rs => metrics_test.rs} (100%)
 rename crates/neomacs-layout-engine/src/font/policy/tests/{mod.rs => policy_test.rs} (100%)
 rename crates/neomacs-layout-engine/src/font/resolver/tests/{mod.rs => resolver_test.rs} (100%)
 create mode 100644 crates/neomacs-layout-engine/src/font/resolver/tests/worker_policy_cache_budget_test.rs
 rename crates/neomacs-layout-engine/src/font/sizing/tests/{mod.rs => sizing_test.rs} (100%)
 rename crates/neomacs-layout-engine/src/font_backend/native_asset_cache/tests/{mod.rs => native_asset_cache_test.rs} (100%)
 rename crates/neomacs-layout-engine/src/font_backend/windows/tests/{mod.rs => windows_test.rs} (100%)
 rename crates/neomacs-layout-engine/src/frame_face_arena/tests/{mod.rs => frame_face_arena_test.rs} (100%)
 rename crates/neomacs-layout-engine/src/frame_presentation/tests/{mod.rs => frame_presentation_test.rs} (100%)
 rename crates/neomacs-layout-engine/src/glyph_row_writer/{tests.rs => tests/glyph_row_writer_test.rs} (100%)
 rename crates/neomacs-layout-engine/src/gui_chrome/tests/{mod.rs => gui_chrome_test.rs} (100%)
 rename crates/neomacs-layout-engine/src/incremental_layout/tests/{edit_sync_default_policy.rs => edit_sync_default_policy_test.rs} (100%)
 rename crates/neomacs-layout-engine/src/incremental_layout/tests/{edit_sync_lazy_proof_policy_absence.rs => edit_sync_lazy_proof_policy_absence_test.rs} (100%)
 rename crates/neomacs-layout-engine/src/incremental_layout/tests/{edit_sync_lazy_proof_policy_aliases.rs => edit_sync_lazy_proof_policy_aliases_test.rs} (100%)
 rename crates/neomacs-layout-engine/src/incremental_layout/tests/{edit_sync_policy_aliases.rs => edit_sync_policy_aliases_test.rs} (100%)
 rename crates/neomacs-layout-engine/src/incremental_layout/tests/{mode_line_gate_default_policy.rs => mode_line_gate_default_policy_test.rs} (100%)
 rename crates/neomacs-layout-engine/src/incremental_layout/tests/{mode_line_gate_policy_aliases.rs => mode_line_gate_policy_aliases_test.rs} (100%)
 rename crates/neomacs-layout-engine/src/neovm_bridge/{ => tests}/line_count_test.rs (100%)
 rename crates/neomacs-layout-engine/src/neovm_bridge/tests/{mod.rs => neovm_bridge_test.rs} (100%)
 rename crates/neomacs-layout-engine/src/output/builder/tests/{mod.rs => builder_test.rs} (100%)
 rename crates/neomacs-layout-engine/src/output/window_state/tests/{mini_preparation.rs => mini_preparation_test.rs} (100%)
 rename crates/neomacs-layout-engine/src/output/window_state/tests/{mod.rs => window_state_test.rs} (100%)
 rename crates/neomacs-layout-engine/src/presentation/pointer/tests/{mod.rs => pointer_test.rs} (100%)
 rename crates/neomacs-layout-engine/src/presentation/presented_pointer_map/tests/{mod.rs => presented_pointer_map_test.rs} (100%)
 create mode 100644 crates/neomacs-layout-engine/src/row_layout/tests/font_measurement_test.rs
 create mode 100644 crates/neomacs-layout-engine/src/row_layout/tests/input_test.rs
 create mode 100644 crates/neomacs-layout-engine/src/row_layout/tests/mapped_input_test.rs
 create mode 100644 crates/neomacs-layout-engine/src/row_layout/tests/program_test.rs
 create mode 100644 crates/neomacs-layout-engine/src/row_layout/tests/spacing_input_test.rs
 create mode 100644 crates/neomacs-layout-engine/src/row_layout/tests/worker_test.rs
 rename crates/neomacs-layout-engine/src/scroll_policy/tests/{mod.rs => scroll_policy_test.rs} (100%)
 rename crates/neomacs-layout-engine/src/tty_menu_bar/tests/{mod.rs => tty_menu_bar_test.rs} (100%)
 rename crates/neomacs-layout-engine/src/types/tests/{mod.rs => types_test.rs} (100%)
 rename crates/neomacs-layout-engine/src/unicode/tests/{mod.rs => unicode_test.rs} (100%)
 rename crates/neomacs-layout-engine/src/window_output/row_geometry/{ => tests}/lookup_test.rs (100%)
 create mode 100644 crates/neomacs-layout-engine/src/window_output/tests/row_geometry_test.rs
 create mode 100644 crates/neomacs-layout-engine/src/window_output/tests/snapshot_rows_test.rs
 rename crates/neomacs-layout-engine/src/window_output/tests/{mod.rs => window_output_test.rs} (100%)
 rename crates/neomacs-perf/src/artifact/tests/{mod.rs => artifact_test.rs} (100%)
 rename crates/neomacs-perf/src/capture/tests/{mod.rs => capture_test.rs} (100%)
 rename crates/neomacs-perf/src/catalog/tests/{mod.rs => catalog_test.rs} (100%)
 rename crates/neomacs-perf/src/cli/tests/{mod.rs => cli_test.rs} (100%)
 rename crates/neomacs-perf/src/comparison/tests/{mod.rs => comparison_test.rs} (100%)
 rename crates/neomacs-perf/src/counters/tests/{mod.rs => counters_test.rs} (100%)
 rename crates/neomacs-perf/src/harness/scenarios/bounded_search/tests/{mod.rs => bounded_search_test.rs} (100%)
 rename crates/neomacs-perf/src/harness/scenarios/builtin_call/tests/{mod.rs => builtin_call_test.rs} (100%)
 rename crates/neomacs-perf/src/harness/scenarios/search_shape/tests/{mod.rs => search_shape_test.rs} (100%)
 rename crates/neomacs-perf/src/harness/scenarios/vm_loop/first_entry/tests/{mod.rs => first_entry_test.rs} (100%)
 rename crates/neomacs-perf/src/harness/scenarios/vm_loop/tests/{mod.rs => vm_loop_test.rs} (100%)
 rename crates/neomacs-perf/src/harness/tests/{mod.rs => harness_test.rs} (99%)
 rename crates/neomacs-perf/src/host/tests/{mod.rs => host_test.rs} (100%)
 rename crates/neomacs-perf/src/native_video/tests/{mod.rs => native_video_test.rs} (100%)
 rename crates/neomacs-perf/src/portable_dump/tests/{mod.rs => portable_dump_test.rs} (100%)
 rename crates/neomacs-perf/src/profile/tests/{mod.rs => profile_test.rs} (100%)
 rename crates/neomacs-perf/src/suite/tests/{mod.rs => suite_test.rs} (100%)
 create mode 100644 crates/neomacs-perf/src/tests/input_latency_test.rs
 rename crates/neomacs-renderer-wgpu/src/external_buffer/tests/{mod.rs => external_buffer_test.rs} (100%)
 rename crates/neomacs-renderer-wgpu/src/glyph_atlas/allocator/tests/{mod.rs => allocator_test.rs} (100%)
 rename crates/neomacs-renderer-wgpu/src/glyph_atlas/tests/{mod.rs => glyph_atlas_test.rs} (100%)
 rename crates/neomacs-renderer-wgpu/src/gpu_frame_timing/tests/{mod.rs => gpu_frame_timing_test.rs} (100%)
 rename crates/neomacs-renderer-wgpu/src/image_bands/{tests.rs => tests/image_bands_test.rs} (100%)
 rename crates/neomacs-renderer-wgpu/src/image_cache/tests/{decode_diagnostic.rs => decode_diagnostic_test.rs} (100%)
 rename crates/neomacs-renderer-wgpu/src/image_cache/tests/{mod.rs => image_cache_test.rs} (99%)
 rename crates/neomacs-renderer-wgpu/src/image_scale/{tests.rs => tests/image_scale_test.rs} (100%)
 rename crates/neomacs-renderer-wgpu/src/image_sequence/tests/{mod.rs => image_sequence_test.rs} (100%)
 rename crates/neomacs-renderer-wgpu/src/media_budget/tests/{mod.rs => media_budget_test.rs} (100%)
 create mode 100644 crates/neomacs-renderer-wgpu/src/native_presentation/tests/abi_test.rs
 create mode 100644 crates/neomacs-renderer-wgpu/src/native_presentation/tests/clock_test.rs
 create mode 100644 crates/neomacs-renderer-wgpu/src/native_presentation/tests/query_test.rs
 rename crates/neomacs-renderer-wgpu/src/renderer/composition_ring/tests/{mod.rs => composition_ring_test.rs} (100%)
 rename crates/neomacs-renderer-wgpu/src/renderer/content/tests/{mod.rs => content_test.rs} (100%)
 rename crates/neomacs-renderer-wgpu/src/renderer/cursor_effects/tests/{mod.rs => cursor_effects_test.rs} (100%)
 rename crates/neomacs-renderer-wgpu/src/renderer/cursor_presentation/tests/{mod.rs => cursor_presentation_test.rs} (100%)
 rename crates/neomacs-renderer-wgpu/src/renderer/deform/tests/{mod.rs => deform_test.rs} (100%)
 rename crates/neomacs-renderer-wgpu/src/renderer/effect_common/tests/{mod.rs => effect_common_test.rs} (100%)
 rename crates/neomacs-renderer-wgpu/src/renderer/effects_state/tests/{mod.rs => effects_state_test.rs} (100%)
 rename crates/neomacs-renderer-wgpu/src/renderer/glyphs/tests/{mod.rs => glyphs_test.rs} (100%)
 rename crates/neomacs-renderer-wgpu/src/renderer/gpu_budget/tests/{mod.rs => gpu_budget_test.rs} (100%)
 rename crates/neomacs-renderer-wgpu/src/renderer/layer_media/tests/{mod.rs => layer_media_test.rs} (100%)
 rename crates/neomacs-renderer-wgpu/src/renderer/layout_pass/tests/{mod.rs => layout_pass_test.rs} (100%)
 rename crates/neomacs-renderer-wgpu/src/renderer/pattern_effects/tests/{mod.rs => pattern_effects_test.rs} (100%)
 rename crates/neomacs-renderer-wgpu/src/renderer/pointer_override/tests/{mod.rs => pointer_override_test.rs} (100%)
 rename crates/neomacs-renderer-wgpu/src/renderer/row_reuse/tests/{mod.rs => row_reuse_test.rs} (100%)
 rename crates/neomacs-renderer-wgpu/src/renderer/snapshot_pool/tests/{mod.rs => snapshot_pool_test.rs} (100%)
 rename crates/neomacs-renderer-wgpu/src/renderer/transitions/tests/{mod.rs => transitions_test.rs} (100%)
 rename crates/neomacs-renderer-wgpu/src/renderer/ui_overlays/tests/{mod.rs => ui_overlays_test.rs} (100%)
 rename crates/neomacs-renderer-wgpu/src/renderer/window_effects/tests/{mod.rs => window_effects_test.rs} (100%)
 rename crates/neomacs-renderer-wgpu/src/shader_surface_cache/tests/{mod.rs => shader_surface_cache_test.rs} (100%)
 rename crates/neomacs-renderer-wgpu/src/tooltip_layout/tests/{mod.rs => tooltip_layout_test.rs} (100%)
 rename crates/neomacs-renderer-wgpu/src/vertex/tests/{mod.rs => vertex_test.rs} (100%)
 rename crates/neomacs-renderer-wgpu/src/video_cache/tests/{mod.rs => video_cache_test.rs} (100%)
 rename crates/neomacs-renderer-wgpu/src/vulkan_dmabuf/tests/{mod.rs => vulkan_dmabuf_test.rs} (100%)
 rename crates/neomacs-renderer-wgpu/src/xbm/tests/{mod.rs => xbm_test.rs} (100%)
 rename crates/neomacs-renderer-wgpu/src/xpm/tests/{mod.rs => xpm_test.rs} (100%)
 rename crates/neomacs-video/src/platform/linux/decoder/tests/{mod.rs => decoder_test.rs} (96%)
 rename crates/neomacs-video/src/platform/linux/dmabuf/tests/{mod.rs => dmabuf_test.rs} (100%)
 rename crates/neomacs-video/src/platform/linux/frame/tests/{mod.rs => frame_test.rs} (100%)
 rename crates/neomacs-webview/src/load_state/tests/{mod.rs => load_state_test.rs} (100%)
 rename crates/neomacs-webview/src/platform/linux/display/tests/{mod.rs => display_test.rs} (100%)
 rename crates/neomacs-webview/src/platform/linux/sys/tests/{mod.rs => sys_test.rs} (100%)
 rename crates/neomacs-webview/src/platform/macos/focus/tests/{mod.rs => focus_test.rs} (100%)
 rename crates/neomacs/src/bin/neomacsclient/tests/{alternate_editor_tests.rs => alternate_editor_test.rs} (100%)
 rename crates/neomacs/src/bin/neomacsclient/tests/{timeout_tests.rs => timeout_test.rs} (100%)
 rename crates/neomacs/src/bin/neomacsclient/tests/{transport_tests.rs => transport_test.rs} (100%)
 rename crates/neomacs/src/build_info/tests/{mod.rs => build_info_test.rs} (100%)
 rename crates/neomacs/src/daemon/tests/{mod.rs => daemon_test.rs} (100%)
 rename crates/neomacs/src/input_bridge/tests/{mod.rs => input_bridge_test.rs} (100%)
 rename crates/neomacs/src/tests/{frame_snapshot_policy.rs => frame_snapshot_policy_test.rs} (100%)
 create mode 100644 crates/neomacs/src/tests/tty_output_test.rs
 rename crates/neovm-core/src/buffer/buffer/tests/{mod.rs => buffer_test.rs} (99%)
 rename crates/neovm-core/src/buffer/buffer_text/tests/{mod.rs => buffer_text_test.rs} (99%)
 rename crates/neovm-core/src/buffer/edit_transaction/tests/{transpose_gnu.rs => transpose_gnu_test.rs} (100%)
 rename crates/neovm-core/src/buffer/gap_buffer/tests/{mod.rs => gap_buffer_test.rs} (100%)
 rename crates/neovm-core/src/buffer/overlay/tests/{mod.rs => overlay_test.rs} (100%)
 rename crates/neovm-core/src/buffer/overlay_index/tests/{local_move.rs => local_move_test.rs} (100%)
 rename crates/neovm-core/src/buffer/overlay_index/tests/{mod.rs => overlay_index_test.rs} (99%)
 rename crates/neovm-core/src/buffer/overlay_order/tests/{mod.rs => overlay_order_test.rs} (100%)
 create mode 100644 crates/neovm-core/src/buffer/tests/overlay_bplus_traversal_storage_test.rs
 rename crates/neovm-core/src/buffer/text/backend/{conformance.rs => tests/conformance_test.rs} (100%)
 rename crates/neovm-core/src/buffer/text_index/tests/{mod.rs => text_index_test.rs} (100%)
 rename crates/neovm-core/src/buffer/text_props/tests/{source_slice_graft.rs => source_slice_graft_test.rs} (100%)
 rename crates/neovm-core/src/buffer/text_props/tests/{mod.rs => text_props_test.rs} (99%)
 rename crates/neovm-core/src/buffer/text_props/tests/{watched_prop_demand_knob.rs => watched_prop_demand_knob_test.rs} (100%)
 rename crates/neovm-core/src/buffer/text_props/tests/{watched_prop_demand.rs => watched_prop_demand_test.rs} (100%)
 rename crates/neovm-core/src/buffer/undo/tests/{mod.rs => undo_test.rs} (100%)
 rename crates/neovm-core/src/display_evaluation/tests/{mod.rs => display_evaluation_test.rs} (100%)
 rename crates/neovm-core/src/emacs_core/commands/abbrev/tests/{mod.rs => abbrev_test.rs} (100%)
 rename crates/neovm-core/src/emacs_core/commands/interactive/tests/{mod.rs => interactive_test.rs} (100%)
 rename crates/neovm-core/src/emacs_core/commands/kbd/tests/{mod.rs => kbd_test.rs} (100%)
 rename crates/neovm-core/src/emacs_core/commands/keyboard/tests/{mod.rs => keyboard_test.rs} (100%)
 rename crates/neovm-core/src/emacs_core/commands/keyboard/tests/{pure.rs => pure_test.rs} (100%)
 rename crates/neovm-core/src/emacs_core/commands/keymap/tests/{mod.rs => keymap_test.rs} (100%)
 rename crates/neovm-core/src/emacs_core/commands/kmacro/tests/{mod.rs => kmacro_test.rs} (100%)
 rename crates/neovm-core/src/emacs_core/commands/minibuffer/tests/{compare_case_table.rs => compare_case_table_test.rs} (100%)
 rename crates/neovm-core/src/emacs_core/commands/minibuffer/tests/{mod.rs => minibuffer_test.rs} (99%)
 rename crates/neovm-core/src/emacs_core/commands/register/tests/{mod.rs => register_test.rs} (100%)
 rename crates/neovm-core/src/emacs_core/display/display/tests/{mod.rs => display_test.rs} (99%)
 rename crates/neovm-core/src/emacs_core/display/display/tests/{popup_idle_redisplay.rs => popup_idle_redisplay_test.rs} (100%)
 rename crates/neovm-core/src/emacs_core/display/display_host/tests/{display_host.rs => display_host_test.rs} (100%)
 rename crates/neovm-core/src/emacs_core/display/display_spec/tests/{mod.rs => display_spec_test.rs} (100%)
 rename crates/neovm-core/src/emacs_core/display/display_when/tests/{mod.rs => display_when_test.rs} (100%)
 rename crates/neovm-core/src/emacs_core/display/dispnew/tests/{mod.rs => dispnew_test.rs} (99%)
 rename crates/neovm-core/src/emacs_core/display/dispnew/tests/{explicit_redraw.rs => explicit_redraw_test.rs} (100%)
 rename crates/neovm-core/src/emacs_core/display/dispnew/tests/{idle_redraw.rs => idle_redraw_test.rs} (100%)
 rename crates/neovm-core/src/emacs_core/display/font/tests/{mod.rs => font_test.rs} (99%)
 rename crates/neovm-core/src/emacs_core/display/fontset/tests/{mod.rs => fontset_test.rs} (100%)
 rename crates/neovm-core/src/emacs_core/display/frame/tests/{selection.rs => selection_test.rs} (100%)
 rename crates/neovm-core/src/emacs_core/display/hscroll/tests/{mod.rs => hscroll_test.rs} (100%)
 rename crates/neovm-core/src/emacs_core/display/image/tests/{mod.rs => image_test.rs} (100%)
 rename crates/neovm-core/src/emacs_core/display/image_path/tests/{mod.rs => image_path_test.rs} (100%)
 rename crates/neovm-core/src/emacs_core/display/neo/modifiers/tests/{mod.rs => modifiers_test.rs} (100%)
 rename crates/neovm-core/src/emacs_core/display/neo/terminal/tests/{mod.rs => terminal_test.rs} (100%)
 create mode 100644 crates/neovm-core/src/emacs_core/display/neo/tests/scroll_test.rs
 rename crates/neovm-core/src/emacs_core/display/shader_surface/tests/{runtime.rs => runtime_test.rs} (100%)
 rename crates/neovm-core/src/emacs_core/display/terminal/tests/{gc_context_migration.rs => gc_context_migration_test.rs} (100%)
 rename crates/neovm-core/src/emacs_core/display/terminal/tests/{gc_heap_ownership.rs => gc_heap_ownership_test.rs} (100%)
 rename crates/neovm-core/src/emacs_core/display/terminal/tests/{idle_redisplay.rs => idle_redisplay_test.rs} (100%)
 rename crates/neovm-core/src/emacs_core/display/terminal/tests/{registry_reinstall.rs => registry_reinstall_test.rs} (100%)
 rename crates/neovm-core/src/emacs_core/display/terminal/tests/{mod.rs => terminal_test.rs} (99%)
 rename crates/neovm-core/src/emacs_core/display/video/tests/{runtime.rs => runtime_test.rs} (100%)
 rename crates/neovm-core/src/emacs_core/display/window_cmds/tests/{core_hook_defaults.rs => core_hook_defaults_test.rs} (100%)
 rename crates/neovm-core/src/emacs_core/display/window_cmds/tests/{core_hook_restore.rs => core_hook_restore_test.rs} (100%)
 rename crates/neovm-core/src/emacs_core/display/window_cmds/tests/{selection_chrome.rs => selection_chrome_test.rs} (100%)
 rename crates/neovm-core/src/emacs_core/display/window_cmds/tests/{mod.rs => window_cmds_test.rs} (99%)
 rename crates/neovm-core/src/emacs_core/display/window_cmds/tests/{window_system_preload.rs => window_system_preload_test.rs} (100%)
 rename crates/neovm-core/src/emacs_core/display/window_edge_drag/tests/{mod.rs => window_edge_drag_test.rs} (100%)
 rename crates/neovm-core/src/emacs_core/display/xdisp/motion/tests/{mod.rs => motion_test.rs} (100%)
 rename crates/neovm-core/src/emacs_core/display/xdisp/tests/{mode_line_flow.rs => mode_line_flow_test.rs} (100%)
 rename crates/neovm-core/src/emacs_core/display/xdisp/tests/{mode_line_gc_roots.rs => mode_line_gc_roots_test.rs} (100%)
 rename crates/neovm-core/src/emacs_core/display/xdisp/tests/{mode_line_incremental_lifetimes.rs => mode_line_incremental_lifetimes_test.rs} (100%)
 rename crates/neovm-core/src/emacs_core/display/xdisp/tests/{mode_line_incremental_roots.rs => mode_line_incremental_roots_test.rs} (100%)
 rename crates/neovm-core/src/emacs_core/display/xdisp/tests/{mode_line_live_spine.rs => mode_line_live_spine_test.rs} (100%)
 rename crates/neovm-core/src/emacs_core/display/xdisp/tests/{mode_line_multibyte_identity.rs => mode_line_multibyte_identity_test.rs} (100%)
 rename crates/neovm-core/src/emacs_core/display/xdisp/tests/{mode_line_outer_flow.rs => mode_line_outer_flow_test.rs} (100%)
 rename crates/neovm-core/src/emacs_core/display/xdisp/tests/{mode_line_outer_handlers.rs => mode_line_outer_handlers_test.rs} (100%)
 rename crates/neovm-core/src/emacs_core/display/xdisp/tests/{numeric_padding_default_policy.rs => numeric_padding_default_policy_test.rs} (100%)
 create mode 100644 crates/neovm-core/src/emacs_core/display/xdisp/tests/xdisp_row_edge_test.rs
 rename crates/neovm-core/src/emacs_core/display/xdisp/tests/{mod.rs => xdisp_test.rs} (99%)
 rename crates/neovm-core/src/emacs_core/display/xfaces/tests/{builtins.rs => builtins_test.rs} (100%)
 rename crates/neovm-core/src/emacs_core/display/xfaces/tests/{gc_tls_ownership.rs => gc_tls_ownership_test.rs} (100%)
 rename crates/neovm-core/src/emacs_core/display/xfaces/tests/{mod.rs => xfaces_test.rs} (100%)
 rename crates/neovm-core/src/emacs_core/display/xwidget/tests/{runtime.rs => runtime_test.rs} (100%)
 rename crates/neovm-core/src/emacs_core/editing/bookmark/tests/{mod.rs => bookmark_test.rs} (100%)
 rename crates/neovm-core/src/emacs_core/editing/buffer/tests/{mod.rs => buffer_test.rs} (99%)
 rename crates/neovm-core/src/emacs_core/editing/buffer/tests/{gdn_primitives.rs => gdn_primitives_test.rs} (100%)
 rename crates/neovm-core/src/emacs_core/editing/buffer/tests/{set_buffer_multibyte_gnu.rs => set_buffer_multibyte_gnu_test.rs} (100%)
 rename crates/neovm-core/src/emacs_core/editing/dired/tests/{compare_case_table.rs => compare_case_table_test.rs} (100%)
 rename crates/neovm-core/src/emacs_core/editing/dired/tests/{mod.rs => dired_test.rs} (99%)
 rename crates/neovm-core/src/emacs_core/editing/editfns/tests/{mod.rs => editfns_test.rs} (100%)
 rename crates/neovm-core/src/emacs_core/editing/indent/tests/{mod.rs => indent_test.rs} (100%)
 rename crates/neovm-core/src/emacs_core/editing/marker/tests/{mod.rs => marker_test.rs} (100%)
 rename crates/neovm-core/src/emacs_core/editing/mode/tests/{custom_type_gc.rs => custom_type_gc_test.rs} (100%)
 rename crates/neovm-core/src/emacs_core/editing/mode/tests/{mod.rs => mode_test.rs} (100%)
 rename crates/neovm-core/src/emacs_core/editing/navigation/tests/{line_index.rs => line_index_test.rs} (100%)
 rename crates/neovm-core/src/emacs_core/editing/navigation/tests/{mod.rs => navigation_test.rs} (99%)
 rename crates/neovm-core/src/emacs_core/editing/navigation/tests/{selective_display_gnu.rs => selective_display_gnu_test.rs} (100%)
 rename crates/neovm-core/src/emacs_core/editing/rect/tests/{mod.rs => rect_test.rs} (100%)
 rename crates/neovm-core/src/emacs_core/editing/undo/tests/{kill_ring.rs => kill_ring_test.rs} (100%)
 rename crates/neovm-core/src/emacs_core/editing/undo/tests/{mod.rs => undo_test.rs} (100%)
 rename crates/neovm-core/src/emacs_core/lisp/advice/tests/{mod.rs => advice_test.rs} (100%)
 rename crates/neovm-core/src/emacs_core/lisp/autoload/tests/{mod.rs => autoload_test.rs} (100%)
 rename crates/neovm-core/src/emacs_core/lisp/cl_lib/tests/{mod.rs => cl_lib_test.rs} (100%)
 rename crates/neovm-core/src/emacs_core/lisp/custom/tests/{mod.rs => custom_test.rs} (100%)
 rename crates/neovm-core/src/emacs_core/lisp/doc/tests/{mod.rs => doc_test.rs} (100%)
 rename crates/neovm-core/src/emacs_core/lisp/load/tests/{eager_failure.rs => eager_failure_test.rs} (100%)
 rename crates/neovm-core/src/emacs_core/lisp/load/tests/{mod.rs => load_test.rs} (100%)
 rename crates/neovm-core/src/emacs_core/lisp/load/tests/{stale_bytecode.rs => stale_bytecode_test.rs} (100%)
 rename crates/neovm-core/src/emacs_core/lisp/lread/tests/{mod.rs => lread_test.rs} (100%)
 rename crates/neovm-core/src/emacs_core/lisp/native/builtins/file_notify/platform/linux/tests/{linux.rs => linux_test.rs} (100%)
 rename crates/neovm-core/src/emacs_core/lisp/native/builtins/file_notify/platform/linux/tests/{worker.rs => worker_test.rs} (100%)
 rename crates/neovm-core/src/emacs_core/lisp/native/builtins/file_notify/platform/macos/tests/{macos.rs => macos_test.rs} (100%)
 rename crates/neovm-core/src/emacs_core/lisp/native/builtins/file_notify/platform/tests/{unsupported.rs => unsupported_test.rs} (100%)
 rename crates/neovm-core/src/emacs_core/lisp/native/builtins/file_notify/platform/windows/tests/{windows.rs => windows_test.rs} (100%)
 rename crates/neovm-core/src/emacs_core/lisp/native/builtins/file_notify/tests/{delivery.rs => delivery_test.rs} (100%)
 rename crates/neovm-core/src/emacs_core/lisp/native/builtins/file_notify/tests/{mod.rs => file_notify_test.rs} (100%)
 rename crates/neovm-core/src/emacs_core/lisp/native/builtins/file_notify/tests/{gc_tls_ownership.rs => gc_tls_ownership_test.rs} (100%)
 rename crates/neovm-core/src/emacs_core/lisp/native/builtins/file_notify/tests/{linux.rs => linux_test.rs} (100%)
 rename crates/neovm-core/src/emacs_core/lisp/native/builtins/file_notify/tests/{model.rs => model_test.rs} (100%)
 rename crates/neovm-core/src/emacs_core/lisp/native/builtins/file_notify/tests/{native_runtime.rs => native_runtime_test.rs} (100%)
 rename crates/neovm-core/src/emacs_core/lisp/native/builtins/hooks/redisplay_gnu/tests/{default_read.rs => default_read_test.rs} (100%)
 rename crates/neovm-core/src/emacs_core/lisp/native/builtins/hooks/tests/{window_configuration_redisplay.rs => window_configuration_redisplay_test.rs} (100%)
 rename crates/neovm-core/src/emacs_core/lisp/native/builtins/leaves/tests/{equivalence.rs => equivalence_test.rs} (100%)
 rename crates/neovm-core/src/emacs_core/lisp/native/builtins/search/tests/{gc_tls_ownership.rs => gc_tls_ownership_test.rs} (100%)
 rename crates/neovm-core/src/emacs_core/lisp/native/builtins/tests/{arithmetic_ash_overflow.rs => arithmetic_ash_overflow_test.rs} (100%)
 rename crates/neovm-core/src/emacs_core/lisp/native/builtins/tests/{arithmetic_bignum_borrowed.rs => arithmetic_bignum_borrowed_test.rs} (100%)
 rename crates/neovm-core/src/emacs_core/lisp/native/builtins/tests/{arithmetic_integer_value.rs => arithmetic_integer_value_test.rs} (100%)
 rename crates/neovm-core/src/emacs_core/lisp/native/builtins/tests/{arithmetic_limb_kernels.rs => arithmetic_limb_kernels_test.rs} (100%)
 rename crates/neovm-core/src/emacs_core/lisp/native/builtins/tests/{arithmetic_minmax_compare.rs => arithmetic_minmax_compare_test.rs} (100%)
 rename crates/neovm-core/src/emacs_core/lisp/native/builtins/tests/{arithmetic_rounding_capture.rs => arithmetic_rounding_capture_test.rs} (100%)
 rename crates/neovm-core/src/emacs_core/lisp/native/builtins/tests/{arithmetic_rounding_float_exact.rs => arithmetic_rounding_float_exact_test.rs} (100%)
 rename crates/neovm-core/src/emacs_core/lisp/native/builtins/tests/{arithmetic_rounding_nil_divisor.rs => arithmetic_rounding_nil_divisor_test.rs} (100%)
 rename crates/neovm-core/src/emacs_core/lisp/native/builtins/tests/{aset_string_in_place.rs => aset_string_in_place_test.rs} (100%)
 rename crates/neovm-core/src/emacs_core/lisp/native/builtins/tests/{assoc_callbacks.rs => assoc_callbacks_test.rs} (100%)
 rename crates/neovm-core/src/emacs_core/lisp/native/builtins/tests/{mod.rs => builtins_test.rs} (100%)
 rename crates/neovm-core/src/emacs_core/lisp/native/builtins/tests/{closure_slot_identity.rs => closure_slot_identity_test.rs} (100%)
 rename crates/neovm-core/src/emacs_core/lisp/native/builtins/tests/{collection_scan_capture.rs => collection_scan_capture_test.rs} (100%)
 rename crates/neovm-core/src/emacs_core/lisp/native/builtins/tests/{copy_sequence_capture.rs => copy_sequence_capture_test.rs} (100%)
 rename crates/neovm-core/src/emacs_core/lisp/native/builtins/tests/{fixed_arity_hot_subrs.rs => fixed_arity_hot_subrs_test.rs} (100%)
 rename crates/neovm-core/src/emacs_core/lisp/native/builtins/tests/{fringe_bitmap.rs => fringe_bitmap_test.rs} (100%)
 rename crates/neovm-core/src/emacs_core/lisp/native/builtins/tests/{from_value.rs => from_value_test.rs} (100%)
 rename crates/neovm-core/src/emacs_core/lisp/native/builtins/tests/{gc_tls_collections.rs => gc_tls_collections_test.rs} (100%)
 rename crates/neovm-core/src/emacs_core/lisp/native/builtins/tests/{gc_tls_window_configuration.rs => gc_tls_window_configuration_test.rs} (100%)
 rename crates/neovm-core/src/emacs_core/lisp/native/builtins/tests/{gdn_equality.rs => gdn_equality_test.rs} (100%)
 rename crates/neovm-core/src/emacs_core/lisp/native/builtins/tests/{higher_order_callback_policy.rs => higher_order_callback_policy_test.rs} (100%)
 rename crates/neovm-core/src/emacs_core/lisp/native/builtins/tests/{higher_order_capture.rs => higher_order_capture_test.rs} (100%)
 rename crates/neovm-core/src/emacs_core/lisp/native/builtins/tests/{keymaps.rs => keymaps_test.rs} (100%)
 rename crates/neovm-core/src/emacs_core/lisp/native/builtins/tests/{lisp_only_misc_names.rs => lisp_only_misc_names_test.rs} (100%)
 rename crates/neovm-core/src/emacs_core/lisp/native/builtins/tests/{lisp_only_predicates_and_aliases.rs => lisp_only_predicates_and_aliases_test.rs} (100%)
 rename crates/neovm-core/src/emacs_core/lisp/native/builtins/tests/{lisp_only_undo_commands.rs => lisp_only_undo_commands_test.rs} (100%)
 rename crates/neovm-core/src/emacs_core/lisp/native/builtins/tests/{lisp_only_window_frame_names.rs => lisp_only_window_frame_names_test.rs} (100%)
 rename crates/neovm-core/src/emacs_core/lisp/native/builtins/tests/{make_byte_code_literals.rs => make_byte_code_literals_test.rs} (100%)
 rename crates/neovm-core/src/emacs_core/lisp/native/builtins/tests/{make_closure_instance.rs => make_closure_instance_test.rs} (100%)
 rename crates/neovm-core/src/emacs_core/lisp/native/builtins/tests/{map_resume_capture.rs => map_resume_capture_test.rs} (100%)
 rename crates/neovm-core/src/emacs_core/lisp/native/builtins/tests/{map_resume.rs => map_resume_test.rs} (100%)
 rename crates/neovm-core/src/emacs_core/lisp/native/builtins/tests/{mapcar_activation.rs => mapcar_activation_test.rs} (100%)
 rename crates/neovm-core/src/emacs_core/lisp/native/builtins/tests/{obarray_growth.rs => obarray_growth_test.rs} (100%)
 rename crates/neovm-core/src/emacs_core/lisp/native/builtins/tests/{obarray_order.rs => obarray_order_test.rs} (100%)
 rename crates/neovm-core/src/emacs_core/lisp/native/builtins/tests/{predicate_walk_gc.rs => predicate_walk_gc_test.rs} (100%)
 rename crates/neovm-core/src/emacs_core/lisp/native/builtins/tests/{process_launchers_are_lisp_only.rs => process_launchers_are_lisp_only_test.rs} (100%)
 rename crates/neovm-core/src/emacs_core/lisp/native/builtins/tests/{replace_region_contents.rs => replace_region_contents_test.rs} (100%)
 rename crates/neovm-core/src/emacs_core/lisp/native/builtins/tests/{rust_subrs_shadowed_by_lisp.rs => rust_subrs_shadowed_by_lisp_test.rs} (100%)
 rename crates/neovm-core/src/emacs_core/lisp/native/builtins/tests/{search_frontend.rs => search_frontend_test.rs} (100%)
 rename crates/neovm-core/src/emacs_core/lisp/native/builtins/tests/{search.rs => search_test.rs} (100%)
 rename crates/neovm-core/src/emacs_core/lisp/native/builtins/tests/{sort_capture.rs => sort_capture_test.rs} (100%)
 rename crates/neovm-core/src/emacs_core/lisp/native/builtins/tests/{strings.rs => strings_test.rs} (100%)
 rename crates/neovm-core/src/emacs_core/lisp/native/builtins/tests/{treesit_freshness.rs => treesit_freshness_test.rs} (100%)
 rename crates/neovm-core/src/emacs_core/lisp/native/builtins_extra/tests/{mod.rs => builtins_extra_test.rs} (100%)
 rename crates/neovm-core/src/emacs_core/lisp/native/floatfns/tests/{mod.rs => floatfns_test.rs} (100%)
 rename crates/neovm-core/src/emacs_core/lisp/native/fns/tests/{compare_case_table.rs => compare_case_table_test.rs} (100%)
 rename crates/neovm-core/src/emacs_core/lisp/native/fns/tests/{compare_position_cache.rs => compare_position_cache_test.rs} (100%)
 rename crates/neovm-core/src/emacs_core/lisp/native/fns/tests/{mod.rs => fns_test.rs} (99%)
 rename crates/neovm-core/src/emacs_core/lisp/native/misc/tests/{mod.rs => misc_test.rs} (100%)
 rename crates/neovm-core/src/emacs_core/lisp/native/subr/tests/{info.rs => info_test.rs} (100%)
 rename crates/neovm-core/src/emacs_core/lisp/native/subr/tests/{leaf_contract.rs => leaf_contract_test.rs} (100%)
 rename crates/neovm-core/src/emacs_core/lisp/native/subr/tests/{mod.rs => subr_test.rs} (99%)
 rename crates/neovm-core/src/emacs_core/lisp/print/tests/{mod.rs => print_test.rs} (100%)
 rename crates/neovm-core/src/emacs_core/lisp/provide_coupled_vars/tests/{runtime_surface.rs => runtime_surface_test.rs} (100%)
 rename crates/neovm-core/src/emacs_core/lisp/reader/tests/{minibuffer_teardown.rs => minibuffer_teardown_test.rs} (100%)
 rename crates/neovm-core/src/emacs_core/lisp/reader/tests/{minibuffer_unwind_order.rs => minibuffer_unwind_order_test.rs} (100%)
 rename crates/neovm-core/src/emacs_core/lisp/reader/tests/{raw_bytes.rs => raw_bytes_test.rs} (100%)
 rename crates/neovm-core/src/emacs_core/lisp/reader/tests/{mod.rs => reader_test.rs} (100%)
 rename crates/neovm-core/src/emacs_core/runtime/alloc/tests/{mod.rs => alloc_test.rs} (100%)
 rename crates/neovm-core/src/emacs_core/runtime/bytecode/tests/{arith_integer_fast_path.rs => arith_integer_fast_path_test.rs} (100%)
 rename crates/neovm-core/src/emacs_core/runtime/bytecode/tests/{arith_kind.rs => arith_kind_test.rs} (100%)
 rename crates/neovm-core/src/emacs_core/runtime/bytecode/tests/{builtin_result_return.rs => builtin_result_return_test.rs} (100%)
 rename crates/neovm-core/src/emacs_core/runtime/bytecode/tests/{chunk.rs => chunk_test.rs} (100%)
 rename crates/neovm-core/src/emacs_core/runtime/bytecode/tests/{collection_capture.rs => collection_capture_test.rs} (100%)
 rename crates/neovm-core/src/emacs_core/runtime/bytecode/tests/{decode.rs => decode_test.rs} (100%)
 rename crates/neovm-core/src/emacs_core/runtime/bytecode/tests/{opcode.rs => opcode_test.rs} (100%)
 rename crates/neovm-core/src/emacs_core/runtime/bytecode/tests/{osr_chain.rs => osr_chain_test.rs} (100%)
 rename crates/neovm-core/src/emacs_core/runtime/bytecode/tests/{primitive_opcode_cells.rs => primitive_opcode_cells_test.rs} (100%)
 rename crates/neovm-core/src/emacs_core/runtime/bytecode/tests/{resumed_chain.rs => resumed_chain_test.rs} (100%)
 rename crates/neovm-core/src/emacs_core/runtime/bytecode/tests/{stack_pool.rs => stack_pool_test.rs} (100%)
 rename crates/neovm-core/src/emacs_core/runtime/bytecode/tests/{vm_leaf.rs => vm_leaf_test.rs} (100%)
 rename crates/neovm-core/src/emacs_core/runtime/bytecode/tests/{vm.rs => vm_test.rs} (99%)
 rename crates/neovm-core/src/emacs_core/runtime/data/tests/{mod.rs => data_test.rs} (100%)
 rename crates/neovm-core/src/emacs_core/runtime/debug/tests/{mod.rs => debug_test.rs} (100%)
 rename crates/neovm-core/src/emacs_core/runtime/debug_on_call/tests/{mod.rs => debug_on_call_test.rs} (100%)
 rename crates/neovm-core/src/emacs_core/runtime/error/tests/{mod.rs => error_test.rs} (100%)
 rename crates/neovm-core/src/emacs_core/runtime/error/tests/{flow_kind.rs => flow_kind_test.rs} (100%)
 rename crates/neovm-core/src/emacs_core/runtime/error/tests/{flow_word_gc.rs => flow_word_gc_test.rs} (100%)
 rename crates/neovm-core/src/emacs_core/runtime/error/tests/{flow_word.rs => flow_word_test.rs} (100%)
 rename crates/neovm-core/src/emacs_core/runtime/error/tests/{gc_tls_ownership.rs => gc_tls_ownership_test.rs} (100%)
 rename crates/neovm-core/src/emacs_core/runtime/errors/tests/{mod.rs => errors_test.rs} (100%)
 rename crates/neovm-core/src/emacs_core/runtime/eval/redisplay_hooks/tests/{echo_message.rs => echo_message_test.rs} (100%)
 rename crates/neovm-core/src/emacs_core/runtime/eval/redisplay_hooks/tests/{mode_line_flow.rs => mode_line_flow_test.rs} (100%)
 rename crates/neovm-core/src/emacs_core/runtime/eval/tests/{apply1_bytecode.rs => apply1_bytecode_test.rs} (100%)
 rename crates/neovm-core/src/emacs_core/runtime/eval/tests/{apply2_bytecode.rs => apply2_bytecode_test.rs} (100%)
 rename crates/neovm-core/src/emacs_core/runtime/eval/tests/{attention.rs => attention_test.rs} (100%)
 rename crates/neovm-core/src/emacs_core/runtime/eval/tests/{builtin_vars.rs => builtin_vars_test.rs} (100%)
 rename crates/neovm-core/src/emacs_core/runtime/eval/tests/{cconv_memo.rs => cconv_memo_test.rs} (100%)
 rename crates/neovm-core/src/emacs_core/runtime/eval/tests/{chrome_transitions.rs => chrome_transitions_test.rs} (100%)
 rename crates/neovm-core/src/emacs_core/runtime/eval/tests/{circular_lists.rs => circular_lists_test.rs} (100%)
 rename crates/neovm-core/src/emacs_core/runtime/eval/tests/{mod.rs => eval_test.rs} (99%)
 rename crates/neovm-core/src/emacs_core/runtime/eval/tests/{gc_forced_first_cycle.rs => gc_forced_first_cycle_test.rs} (100%)
 rename crates/neovm-core/src/emacs_core/runtime/eval/tests/{gc_generational_major.rs => gc_generational_major_test.rs} (100%)
 rename crates/neovm-core/src/emacs_core/runtime/eval/tests/{gc_generational_pacing.rs => gc_generational_pacing_test.rs} (100%)
 rename crates/neovm-core/src/emacs_core/runtime/eval/tests/{gc_generational.rs => gc_generational_test.rs} (100%)
 rename crates/neovm-core/src/emacs_core/runtime/eval/tests/{gc_heap_mut_closure.rs => gc_heap_mut_closure_test.rs} (100%)
 rename crates/neovm-core/src/emacs_core/runtime/eval/tests/{gc_root_ownership.rs => gc_root_ownership_test.rs} (100%)
 rename crates/neovm-core/src/emacs_core/runtime/eval/tests/{gc_sweep_cap.rs => gc_sweep_cap_test.rs} (100%)
 rename crates/neovm-core/src/emacs_core/runtime/eval/tests/{gc_tls_migration_proofs.rs => gc_tls_migration_proofs_test.rs} (100%)
 rename crates/neovm-core/src/emacs_core/runtime/eval/tests/{gc_tls_ownership.rs => gc_tls_ownership_test.rs} (100%)
 rename crates/neovm-core/src/emacs_core/runtime/eval/tests/{idle_redisplay.rs => idle_redisplay_test.rs} (100%)
 rename crates/neovm-core/src/emacs_core/runtime/eval/tests/{jit_crash_repro.rs => jit_crash_repro_test.rs} (100%)
 rename crates/neovm-core/src/emacs_core/runtime/eval/tests/{jit_flonum_nbody.rs => jit_flonum_nbody_test.rs} (100%)
 rename crates/neovm-core/src/emacs_core/runtime/eval/tests/{jit_known_fixnum_float.rs => jit_known_fixnum_float_test.rs} (100%)
 rename crates/neovm-core/src/emacs_core/runtime/eval/tests/{jit_leaf_slot.rs => jit_leaf_slot_test.rs} (100%)
 rename crates/neovm-core/src/emacs_core/runtime/eval/tests/{jit_mir_known_fixnum_float.rs => jit_mir_known_fixnum_float_test.rs} (100%)
 rename crates/neovm-core/src/emacs_core/runtime/eval/tests/{leaf_guard.rs => leaf_guard_test.rs} (100%)
 rename crates/neovm-core/src/emacs_core/runtime/eval/tests/{native_callback_cache.rs => native_callback_cache_test.rs} (100%)
 rename crates/neovm-core/src/emacs_core/runtime/eval/tests/{native_stack.rs => native_stack_test.rs} (100%)
 rename crates/neovm-core/src/emacs_core/runtime/eval/tests/{quit_regression.rs => quit_regression_test.rs} (100%)
 rename crates/neovm-core/src/emacs_core/runtime/eval/tests/{quit_request.rs => quit_request_test.rs} (100%)
 rename crates/neovm-core/src/emacs_core/runtime/eval/tests/{redisplay_hook_ownership.rs => redisplay_hook_ownership_test.rs} (100%)
 rename crates/neovm-core/src/emacs_core/runtime/eval/tests/{redisplay_mini_only.rs => redisplay_mini_only_test.rs} (100%)
 rename crates/neovm-core/src/emacs_core/runtime/eval/tests/{redisplay_mini_preparer_context.rs => redisplay_mini_preparer_context_test.rs} (100%)
 rename crates/neovm-core/src/emacs_core/runtime/eval/tests/{redisplay_mini_source_eligibility.rs => redisplay_mini_source_eligibility_test.rs} (100%)
 rename crates/neovm-core/src/emacs_core/runtime/eval/tests/{redisplay_mode_line_flow.rs => redisplay_mode_line_flow_test.rs} (100%)
 rename crates/neovm-core/src/emacs_core/runtime/eval/tests/{redisplay_transaction_owner.rs => redisplay_transaction_owner_test.rs} (100%)
 rename crates/neovm-core/src/emacs_core/runtime/eval/tests/{var_fast.rs => var_fast_test.rs} (100%)
 rename crates/neovm-core/src/emacs_core/runtime/eval/tests/{varset_plain_fast_path.rs => varset_plain_fast_path_test.rs} (100%)
 rename crates/neovm-core/src/emacs_core/runtime/eval/tier_i/tests/{analyzer.rs => analyzer_test.rs} (100%)
 rename crates/neovm-core/src/emacs_core/runtime/eval/tier_i/tests/{census.rs => census_test.rs} (100%)
 rename crates/neovm-core/src/emacs_core/runtime/eval/tier_i/tests/{differential.rs => differential_test.rs} (100%)
 rename crates/neovm-core/src/emacs_core/runtime/eval/tier_i/tests/{knobs.rs => knobs_test.rs} (100%)
 rename crates/neovm-core/src/emacs_core/runtime/eval/tier_i/tests/{list_bindings.rs => list_bindings_test.rs} (100%)
 rename crates/neovm-core/src/emacs_core/runtime/eval/tier_i/tests/{soak.rs => soak_test.rs} (100%)
 rename crates/neovm-core/src/emacs_core/runtime/forward/tests/{mod.rs => forward_module_test.rs} (100%)
 rename crates/neovm-core/src/emacs_core/runtime/hashtab/tests/{bignum_sxhash.rs => bignum_sxhash_test.rs} (100%)
 rename crates/neovm-core/src/emacs_core/runtime/hashtab/tests/{mod.rs => hashtab_test.rs} (100%)
 rename crates/neovm-core/src/emacs_core/runtime/hashtab/tests/{user_test_guard.rs => user_test_guard_test.rs} (100%)
 rename crates/neovm-core/src/emacs_core/runtime/heap_registry/tests/{ownership.rs => ownership_test.rs} (100%)
 rename crates/neovm-core/src/emacs_core/runtime/intern/tests/{gc_tls_ownership.rs => gc_tls_ownership_test.rs} (100%)
 rename crates/neovm-core/src/emacs_core/runtime/intern/tests/{mod.rs => intern_test.rs} (100%)
 rename crates/neovm-core/src/emacs_core/runtime/intern/tests/{seed_prefix.rs => seed_prefix_test.rs} (100%)
 rename crates/neovm-core/src/emacs_core/runtime/jit/cache/tests/{gc_tls_ownership.rs => gc_tls_ownership_test.rs} (100%)
 rename crates/neovm-core/src/emacs_core/runtime/jit/cache/tests/{hof_regalloc.rs => hof_regalloc_test.rs} (100%)
 rename crates/neovm-core/src/emacs_core/runtime/jit/cache/tests/{osr_inline.rs => osr_inline_test.rs} (100%)
 rename crates/neovm-core/src/emacs_core/runtime/jit/compile/inline_entry_cache/tests/{admission.rs => admission_test.rs} (100%)
 rename crates/neovm-core/src/emacs_core/runtime/jit/compile/jit_layout/tests/{golden.rs => golden_test.rs} (100%)
 rename crates/neovm-core/src/emacs_core/runtime/jit/compile/jit_layout/tests/{runtime_prefix.rs => runtime_prefix_test.rs} (100%)
 rename crates/neovm-core/src/emacs_core/runtime/jit/compile/shared/tests/{collection_journal.rs => collection_journal_test.rs} (100%)
 rename crates/neovm-core/src/emacs_core/runtime/jit/compile/tests/{array_projection_capture.rs => array_projection_capture_test.rs} (100%)
 rename crates/neovm-core/src/emacs_core/runtime/jit/compile/tests/{chain_entry.rs => chain_entry_test.rs} (100%)
 rename crates/neovm-core/src/emacs_core/runtime/jit/compile/tests/{chain_framestate.rs => chain_framestate_test.rs} (100%)
 rename crates/neovm-core/src/emacs_core/runtime/jit/compile/tests/{opt_admission.rs => opt_admission_test.rs} (100%)
 rename crates/neovm-core/src/emacs_core/runtime/jit/compile/tests/{opt_array_profile.rs => opt_array_profile_test.rs} (100%)
 rename crates/neovm-core/src/emacs_core/runtime/jit/compile/tests/{opt_arrays.rs => opt_arrays_test.rs} (100%)
 rename crates/neovm-core/src/emacs_core/runtime/jit/compile/tests/{opt_bool_numeric.rs => opt_bool_numeric_test.rs} (100%)
 rename crates/neovm-core/src/emacs_core/runtime/jit/compile/tests/{opt_bool.rs => opt_bool_test.rs} (100%)
 rename crates/neovm-core/src/emacs_core/runtime/jit/compile/tests/{opt_census.rs => opt_census_test.rs} (100%)
 rename crates/neovm-core/src/emacs_core/runtime/jit/compile/tests/{opt_fold_select.rs => opt_fold_select_test.rs} (100%)
 rename crates/neovm-core/src/emacs_core/runtime/jit/compile/tests/{opt_ir_lower.rs => opt_ir_lower_test.rs} (100%)
 rename crates/neovm-core/src/emacs_core/runtime/jit/compile/tests/{opt_licm_positive.rs => opt_licm_positive_test.rs} (100%)
 rename crates/neovm-core/src/emacs_core/runtime/jit/compile/tests/{opt_opcode_transport_effects.rs => opt_opcode_transport_effects_test.rs} (100%)
 rename crates/neovm-core/src/emacs_core/runtime/jit/compile/tests/{opt_passes.rs => opt_passes_test.rs} (100%)
 rename crates/neovm-core/src/emacs_core/runtime/jit/compile/tests/{opt_range_licm.rs => opt_range_licm_test.rs} (100%)
 rename crates/neovm-core/src/emacs_core/runtime/jit/compile/tests/{opt_regalloc.rs => opt_regalloc_test.rs} (100%)
 rename crates/neovm-core/src/emacs_core/runtime/jit/compile/tests/{opt_reps.rs => opt_reps_test.rs} (99%)
 rename crates/neovm-core/src/emacs_core/runtime/jit/compile/tests/{opt_rootwin_counts.rs => opt_rootwin_counts_test.rs} (100%)
 rename crates/neovm-core/src/emacs_core/runtime/jit/compile/tests/{opt_sink_alloc_probe.rs => opt_sink_alloc_probe_test.rs} (100%)
 rename crates/neovm-core/src/emacs_core/runtime/jit/compile/tests/{opt_sink_cold_demand.rs => opt_sink_cold_demand_test.rs} (100%)
 rename crates/neovm-core/src/emacs_core/runtime/jit/compile/tests/{opt_sink_identity.rs => opt_sink_identity_test.rs} (100%)
 rename crates/neovm-core/src/emacs_core/runtime/jit/compile/tests/{opt_sink_native_verification.rs => opt_sink_native_verification_test.rs} (100%)
 rename crates/neovm-core/src/emacs_core/runtime/jit/compile/tests/{opt_sink_numeric_cold.rs => opt_sink_numeric_cold_test.rs} (100%)
 rename crates/neovm-core/src/emacs_core/runtime/jit/compile/tests/{opt_sink_numeric_infallible.rs => opt_sink_numeric_infallible_test.rs} (100%)
 rename crates/neovm-core/src/emacs_core/runtime/jit/compile/tests/{opt_sink_numeric_ready.rs => opt_sink_numeric_ready_test.rs} (100%)
 rename crates/neovm-core/src/emacs_core/runtime/jit/compile/tests/{opt_sink_numeric_resolved.rs => opt_sink_numeric_resolved_test.rs} (100%)
 rename crates/neovm-core/src/emacs_core/runtime/jit/compile/tests/{opt_sink_numeric_sqrt_contagion.rs => opt_sink_numeric_sqrt_contagion_test.rs} (100%)
 rename crates/neovm-core/src/emacs_core/runtime/jit/compile/tests/{opt_sink_numeric_static_contagion.rs => opt_sink_numeric_static_contagion_test.rs} (100%)
 rename crates/neovm-core/src/emacs_core/runtime/jit/compile/tests/{opt_sink_sqrt.rs => opt_sink_sqrt_test.rs} (100%)
 rename crates/neovm-core/src/emacs_core/runtime/jit/compile/tests/{opt_sqrt_binding.rs => opt_sqrt_binding_test.rs} (100%)
 rename crates/neovm-core/src/emacs_core/runtime/jit/compile/tests/{opt_sqrt_snapshot.rs => opt_sqrt_snapshot_test.rs} (100%)
 rename crates/neovm-core/src/emacs_core/runtime/jit/compile/tests/{regalloc_small.rs => regalloc_small_test.rs} (100%)
 rename crates/neovm-core/src/emacs_core/runtime/jit/opt/passes/tests/{array_reads.rs => array_reads_test.rs} (100%)
 rename crates/neovm-core/src/emacs_core/runtime/jit/opt/passes/tests/{bools_reference.rs => bools_reference_test.rs} (100%)
 rename crates/neovm-core/src/emacs_core/runtime/jit/opt/passes/tests/{bools.rs => bools_test.rs} (100%)
 rename crates/neovm-core/src/emacs_core/runtime/jit/opt/passes/tests/{cfg.rs => cfg_test.rs} (100%)
 rename crates/neovm-core/src/emacs_core/runtime/jit/opt/passes/tests/{fold.rs => fold_test.rs} (100%)
 rename crates/neovm-core/src/emacs_core/runtime/jit/opt/passes/tests/{reps_lift.rs => reps_lift_test.rs} (100%)
 rename crates/neovm-core/src/emacs_core/runtime/jit/opt/passes/tests/{reps.rs => reps_test.rs} (100%)
 rename crates/neovm-core/src/emacs_core/runtime/jit/opt/sink_recipes/tests/{verify.rs => verify_test.rs} (100%)
 rename crates/neovm-core/src/emacs_core/runtime/jit/opt/tests/{build_ssa.rs => build_ssa_test.rs} (100%)
 rename crates/neovm-core/src/emacs_core/runtime/jit/opt/tests/{eval.rs => eval_test.rs} (100%)
 rename crates/neovm-core/src/emacs_core/runtime/jit/opt/tests/{ir_verify.rs => ir_verify_test.rs} (100%)
 rename crates/neovm-core/src/emacs_core/runtime/jit/opt/tests/{primitive_effects.rs => primitive_effects_test.rs} (100%)
 rename crates/neovm-core/src/emacs_core/runtime/jit/opt/tests/{range_licm_eval.rs => range_licm_eval_test.rs} (100%)
 rename crates/neovm-core/src/emacs_core/runtime/jit/opt/tests/{types.rs => types_test.rs} (100%)
 rename crates/neovm-core/src/emacs_core/runtime/jit/reopt/tests/{end_to_end.rs => end_to_end_test.rs} (100%)
 rename crates/neovm-core/src/emacs_core/runtime/jit/tests/{arith_generic_integer.rs => arith_generic_integer_test.rs} (100%)
 rename crates/neovm-core/src/emacs_core/runtime/jit/tests/{array_shims.rs => array_shims_test.rs} (100%)
 rename crates/neovm-core/src/emacs_core/runtime/jit/tests/{call_feedback.rs => call_feedback_test.rs} (100%)
 rename crates/neovm-core/src/emacs_core/runtime/jit/tests/{cold_exits.rs => cold_exits_test.rs} (100%)
 rename crates/neovm-core/src/emacs_core/runtime/jit/tests/{compile_pipeline.rs => compile_pipeline_test.rs} (100%)
 rename crates/neovm-core/src/emacs_core/runtime/jit/tests/{compile.rs => compile_test.rs} (100%)
 rename crates/neovm-core/src/emacs_core/runtime/jit/tests/{direct_call_framed.rs => direct_call_framed_test.rs} (100%)
 rename crates/neovm-core/src/emacs_core/runtime/jit/tests/{direct_call_memory.rs => direct_call_memory_test.rs} (100%)
 rename crates/neovm-core/src/emacs_core/runtime/jit/tests/{direct_call_shape_edges.rs => direct_call_shape_edges_test.rs} (100%)
 rename crates/neovm-core/src/emacs_core/runtime/jit/tests/{direct_call_shape_parity.rs => direct_call_shape_parity_test.rs} (99%)
 rename crates/neovm-core/src/emacs_core/runtime/jit/tests/{direct_call_shapes.rs => direct_call_shapes_test.rs} (100%)
 rename crates/neovm-core/src/emacs_core/runtime/jit/tests/{direct_call.rs => direct_call_test.rs} (99%)
 rename crates/neovm-core/src/emacs_core/runtime/jit/tests/{direct_self_heat.rs => direct_self_heat_test.rs} (100%)
 rename crates/neovm-core/src/emacs_core/runtime/jit/tests/{direct_self_kernel.rs => direct_self_kernel_test.rs} (100%)
 rename crates/neovm-core/src/emacs_core/runtime/jit/tests/{direct_self.rs => direct_self_test.rs} (99%)
 rename crates/neovm-core/src/emacs_core/runtime/jit/tests/{eq_swp_prefilter.rs => eq_swp_prefilter_test.rs} (100%)
 rename crates/neovm-core/src/emacs_core/runtime/jit/tests/{fixnum_comparisons.rs => fixnum_comparisons_test.rs} (100%)
 rename crates/neovm-core/src/emacs_core/runtime/jit/tests/{fixnum_ranges.rs => fixnum_ranges_test.rs} (100%)
 rename crates/neovm-core/src/emacs_core/runtime/jit/tests/{flonum_slots.rs => flonum_slots_test.rs} (100%)
 rename crates/neovm-core/src/emacs_core/runtime/jit/tests/{gen0_observed_blv_cold_capture.rs => gen0_observed_blv_cold_capture_test.rs} (100%)
 rename crates/neovm-core/src/emacs_core/runtime/jit/tests/{gen0_observed_collection_revision.rs => gen0_observed_collection_revision_test.rs} (100%)
 rename crates/neovm-core/src/emacs_core/runtime/jit/tests/{gen0_observed_multi_unbind.rs => gen0_observed_multi_unbind_test.rs} (100%)
 rename crates/neovm-core/src/emacs_core/runtime/jit/tests/{gen0_tracked_collection_revision.rs => gen0_tracked_collection_revision_test.rs} (100%)
 rename crates/neovm-core/src/emacs_core/runtime/jit/tests/{inline_chain_deopt.rs => inline_chain_deopt_test.rs} (100%)
 rename crates/neovm-core/src/emacs_core/runtime/jit/tests/{inline_closure.rs => inline_closure_test.rs} (100%)
 rename crates/neovm-core/src/emacs_core/runtime/jit/tests/{inline_entry_cache.rs => inline_entry_cache_test.rs} (100%)
 rename crates/neovm-core/src/emacs_core/runtime/jit/tests/{inline_heap_collection_revision.rs => inline_heap_collection_revision_test.rs} (100%)
 rename crates/neovm-core/src/emacs_core/runtime/jit/tests/{inline_heap_gen0_collection_revision.rs => inline_heap_gen0_collection_revision_test.rs} (100%)
 rename crates/neovm-core/src/emacs_core/runtime/jit/tests/{inline_heap_generational.rs => inline_heap_generational_test.rs} (98%)
 rename crates/neovm-core/src/emacs_core/runtime/jit/tests/{inline_heap_ops.rs => inline_heap_ops_test.rs} (100%)
 rename crates/neovm-core/src/emacs_core/runtime/jit/tests/{inline_hof_captures.rs => inline_hof_captures_test.rs} (100%)
 rename crates/neovm-core/src/emacs_core/runtime/jit/tests/{inline_hof_headers.rs => inline_hof_headers_test.rs} (100%)
 rename crates/neovm-core/src/emacs_core/runtime/jit/tests/{inline_hof_heap_policy.rs => inline_hof_heap_policy_test.rs} (100%)
 rename crates/neovm-core/src/emacs_core/runtime/jit/tests/{inline_hof_length.rs => inline_hof_length_test.rs} (100%)
 rename crates/neovm-core/src/emacs_core/runtime/jit/tests/{inline_hof_runtime.rs => inline_hof_runtime_test.rs} (100%)
 rename crates/neovm-core/src/emacs_core/runtime/jit/tests/{inline_named_front.rs => inline_named_front_test.rs} (100%)
 rename crates/neovm-core/src/emacs_core/runtime/jit/tests/{inline_named_runtime.rs => inline_named_runtime_test.rs} (100%)
 rename crates/neovm-core/src/emacs_core/runtime/jit/tests/{inline_regalloc.rs => inline_regalloc_test.rs} (100%)
 rename crates/neovm-core/src/emacs_core/runtime/jit/tests/{inline.rs => inline_test.rs} (100%)
 rename crates/neovm-core/src/emacs_core/runtime/jit/tests/{inline_v2_closure.rs => inline_v2_closure_test.rs} (100%)
 rename crates/neovm-core/src/emacs_core/runtime/jit/tests/{inline_v2_hof.rs => inline_v2_hof_test.rs} (100%)
 rename crates/neovm-core/src/emacs_core/runtime/jit/tests/{inline_v2.rs => inline_v2_test.rs} (100%)
 rename crates/neovm-core/src/emacs_core/runtime/jit/tests/{inline_vars.rs => inline_vars_test.rs} (100%)
 rename crates/neovm-core/src/emacs_core/runtime/jit/tests/{intrinsics.rs => intrinsics_test.rs} (100%)
 rename crates/neovm-core/src/emacs_core/runtime/jit/tests/{leaf_calls.rs => leaf_calls_test.rs} (100%)
 rename crates/neovm-core/src/emacs_core/runtime/jit/tests/{mir_calls.rs => mir_calls_test.rs} (100%)
 rename crates/neovm-core/src/emacs_core/runtime/jit/tests/{mir_cons_deopt.rs => mir_cons_deopt_test.rs} (100%)
 rename crates/neovm-core/src/emacs_core/runtime/jit/tests/{mir_inline_guards.rs => mir_inline_guards_test.rs} (100%)
 rename crates/neovm-core/src/emacs_core/runtime/jit/tests/{mir_leaf_effects.rs => mir_leaf_effects_test.rs} (100%)
 rename crates/neovm-core/src/emacs_core/runtime/jit/tests/{mir_named_calls.rs => mir_named_calls_test.rs} (100%)
 rename crates/neovm-core/src/emacs_core/runtime/jit/tests/{mir_reach_dead.rs => mir_reach_dead_test.rs} (100%)
 rename crates/neovm-core/src/emacs_core/runtime/jit/tests/{native_frame_detach.rs => native_frame_detach_test.rs} (100%)
 rename crates/neovm-core/src/emacs_core/runtime/jit/tests/{observability.rs => observability_test.rs} (100%)
 rename crates/neovm-core/src/emacs_core/runtime/jit/tests/{opt_lower.rs => opt_lower_test.rs} (100%)
 rename crates/neovm-core/src/emacs_core/runtime/jit/tests/{osr_bindings.rs => osr_bindings_test.rs} (100%)
 rename crates/neovm-core/src/emacs_core/runtime/jit/tests/{osr_entry_guards.rs => osr_entry_guards_test.rs} (100%)
 rename crates/neovm-core/src/emacs_core/runtime/jit/tests/{osr_poll.rs => osr_poll_test.rs} (100%)
 rename crates/neovm-core/src/emacs_core/runtime/jit/tests/{osr_raw.rs => osr_raw_test.rs} (100%)
 rename crates/neovm-core/src/emacs_core/runtime/jit/tests/{predicate_branches.rs => predicate_branches_test.rs} (100%)
 rename crates/neovm-core/src/emacs_core/runtime/jit/tests/{shared_module.rs => shared_module_test.rs} (100%)
 rename crates/neovm-core/src/emacs_core/runtime/jit/tests/{source_slots.rs => source_slots_test.rs} (100%)
 rename crates/neovm-core/src/emacs_core/runtime/jit/tests/{spec_frames.rs => spec_frames_test.rs} (100%)
 rename crates/neovm-core/src/emacs_core/runtime/jit/tests/{spec_gate.rs => spec_gate_test.rs} (100%)
 rename crates/neovm-core/src/emacs_core/runtime/jit/tests/{spec_rest_calls.rs => spec_rest_calls_test.rs} (100%)
 rename crates/neovm-core/src/emacs_core/runtime/jit/tests/{stack_guard.rs => stack_guard_test.rs} (100%)
 rename crates/neovm-core/src/emacs_core/runtime/jit/tests/{string_observed_capacity.rs => string_observed_capacity_test.rs} (100%)
 rename crates/neovm-core/src/emacs_core/runtime/jit/tests/{switch_dispatch.rs => switch_dispatch_test.rs} (100%)
 rename crates/neovm-core/src/emacs_core/runtime/jit/tests/{switch_inline.rs => switch_inline_test.rs} (100%)
 rename crates/neovm-core/src/emacs_core/runtime/jit/tests/{tail_calls.rs => tail_calls_test.rs} (100%)
 rename crates/neovm-core/src/emacs_core/runtime/jit/tests/{varref_inline.rs => varref_inline_test.rs} (100%)
 create mode 100644 crates/neovm-core/src/emacs_core/runtime/owned_roots/tests/owned_roots_test.rs
 rename crates/neovm-core/src/emacs_core/runtime/pdump/charset_image/tests/{mule_order.rs => mule_order_test.rs} (100%)
 rename crates/neovm-core/src/emacs_core/runtime/pdump/tests/{bool_vectors.rs => bool_vectors_test.rs} (100%)
 rename crates/neovm-core/src/emacs_core/runtime/pdump/tests/{bytecode_slot_objects.rs => bytecode_slot_objects_test.rs} (100%)
 rename crates/neovm-core/src/emacs_core/runtime/pdump/tests/{decode_hardening.rs => decode_hardening_test.rs} (100%)
 rename crates/neovm-core/src/emacs_core/runtime/pdump/tests/{mod.rs => pdump_test.rs} (99%)
 rename crates/neovm-core/src/emacs_core/runtime/plist/tests/{collection_capture.rs => collection_capture_test.rs} (100%)
 rename crates/neovm-core/src/emacs_core/runtime/runtime_identity/tests/{mod.rs => runtime_identity_test.rs} (100%)
 rename crates/neovm-core/src/emacs_core/runtime/symbol/tests/{buffer_local_global_read.rs => buffer_local_global_read_test.rs} (100%)
 rename crates/neovm-core/src/emacs_core/runtime/symbol/tests/{fn_stamps.rs => fn_stamps_test.rs} (100%)
 rename crates/neovm-core/src/emacs_core/runtime/symbol/tests/{function_regression.rs => function_regression_test.rs} (100%)
 rename crates/neovm-core/src/emacs_core/runtime/symbol/tests/{jit_layout.rs => jit_layout_test.rs} (100%)
 rename crates/neovm-core/src/emacs_core/runtime/symbol/tests/{plist_regression.rs => plist_regression_test.rs} (100%)
 rename crates/neovm-core/src/emacs_core/runtime/symbol/tests/{redirect_regression.rs => redirect_regression_test.rs} (100%)
 rename crates/neovm-core/src/emacs_core/runtime/symbol/tests/{mod.rs => symbol_test.rs} (100%)
 rename crates/neovm-core/src/emacs_core/runtime/threads/tests/{mod.rs => threads_test.rs} (100%)
 rename crates/neovm-core/src/emacs_core/runtime/value/tests/{bytecode_capture.rs => bytecode_capture_test.rs} (100%)
 rename crates/neovm-core/src/emacs_core/runtime/value/tests/{equal_lookup_gnu.rs => equal_lookup_gnu_test.rs} (100%)
 rename crates/neovm-core/src/emacs_core/runtime/value/tests/{gc_generational_hydration.rs => gc_generational_hydration_test.rs} (100%)
 rename crates/neovm-core/src/emacs_core/runtime/value/tests/{hash_probe.rs => hash_probe_test.rs} (100%)
 rename crates/neovm-core/src/emacs_core/runtime/value/tests/{heap_mut_closure_guard.rs => heap_mut_closure_guard_test.rs} (100%)
 rename crates/neovm-core/src/emacs_core/runtime/value/tests/{jump_table_lookup.rs => jump_table_lookup_test.rs} (100%)
 rename crates/neovm-core/src/emacs_core/runtime/value/tests/{metadata_capture.rs => metadata_capture_test.rs} (100%)
 rename crates/neovm-core/src/emacs_core/runtime/value/tests/{mod.rs => value_test.rs} (99%)
 rename crates/neovm-core/src/emacs_core/runtime/value_reader/tests/{mod.rs => value_reader_test.rs} (100%)
 rename crates/neovm-core/src/emacs_core/system/callproc/tests/{raw_bytes.rs => raw_bytes_test.rs} (100%)
 rename crates/neovm-core/src/emacs_core/system/callproc/tests/{read_coding.rs => read_coding_test.rs} (100%)
 rename crates/neovm-core/src/emacs_core/system/callproc/tests/{spawn.rs => spawn_test.rs} (100%)
 rename crates/neovm-core/src/emacs_core/system/callproc/tests/{working_dir_infile.rs => working_dir_infile_test.rs} (100%)
 rename crates/neovm-core/src/emacs_core/system/dbusbind/tests/{call.rs => call_test.rs} (91%)
 rename crates/neovm-core/src/emacs_core/system/dbusbind/tests/{connection.rs => connection_test.rs} (97%)
 rename crates/neovm-core/src/emacs_core/system/dbusbind/tests/{signal.rs => signal_test.rs} (98%)
 rename crates/neovm-core/src/emacs_core/system/dbusbind/tests/{surface.rs => surface_test.rs} (100%)
 rename crates/neovm-core/src/emacs_core/system/dbusbind/tests/{types.rs => types_test.rs} (81%)
 rename crates/neovm-core/src/emacs_core/system/dynamic_module/tests/{gc_tls_ownership.rs => gc_tls_ownership_test.rs} (100%)
 rename crates/neovm-core/src/emacs_core/system/fileio/tests/{mod.rs => fileio_test.rs} (99%)
 rename crates/neovm-core/src/emacs_core/system/fileio/tests/{fix8.rs => fix8_test.rs} (100%)
 rename crates/neovm-core/src/emacs_core/system/filelock/tests/{mod.rs => filelock_test.rs} (100%)
 rename crates/neovm-core/src/emacs_core/system/network/tests/{mod.rs => network_test.rs} (100%)
 rename crates/neovm-core/src/emacs_core/system/os_signal/tests/{mod.rs => os_signal_test.rs} (100%)
 rename crates/neovm-core/src/emacs_core/system/path_exec/tests/{mod.rs => path_exec_test.rs} (100%)
 rename crates/neovm-core/src/emacs_core/system/platform/c_features/tests/{surface.rs => surface_test.rs} (100%)
 rename crates/neovm-core/src/emacs_core/system/post_image_init/tests/{mod.rs => post_image_init_test.rs} (100%)
 rename crates/neovm-core/src/emacs_core/system/process/tests/{mod.rs => process_test.rs} (100%)
 rename crates/neovm-core/src/emacs_core/system/process/tests/{raw_bytes.rs => raw_bytes_test.rs} (100%)
 rename crates/neovm-core/src/emacs_core/system/shell_file_name/tests/{mod.rs => shell_file_name_test.rs} (100%)
 rename crates/neovm-core/src/emacs_core/system/sqlite/tests/{disabled.rs => disabled_test.rs} (100%)
 rename crates/neovm-core/src/emacs_core/system/sqlite/tests/{enabled.rs => enabled_test.rs} (100%)
 rename crates/neovm-core/src/emacs_core/system/timefns/tests/{mod.rs => timefns_test.rs} (100%)
 rename crates/neovm-core/src/emacs_core/system/timer/tests/{mod.rs => timer_test.rs} (100%)
 rename crates/neovm-core/src/emacs_core/system/tls/tests/{runtime.rs => runtime_test.rs} (100%)
 rename crates/neovm-core/src/emacs_core/tests/architecture/{layout.rs => layout_test.rs} (100%)
 rename crates/neovm-core/src/emacs_core/tests/architecture/{runtime_string_guard.rs => runtime_string_guard_test.rs} (100%)
 rename crates/neovm-core/src/emacs_core/tests/architecture/{symbol_id_guard.rs => symbol_id_guard_test.rs} (100%)
 rename crates/neovm-core/src/emacs_core/tests/architecture/{transmute_guard.rs => transmute_guard_test.rs} (100%)
 rename crates/neovm-core/src/emacs_core/tests/build_support/{compile_main_rule.rs => compile_main_rule_test.rs} (100%)
 rename crates/neovm-core/src/emacs_core/tests/build_support/{generated_lisp.rs => generated_lisp_test.rs} (100%)
 rename crates/neovm-core/src/emacs_core/tests/compat_regressions/tests/{mod.rs => compat_regressions_test.rs} (100%)
 rename crates/neovm-core/src/emacs_core/tests/gnu_surface/{defvar_special.rs => defvar_special_test.rs} (100%)
 rename crates/neovm-core/src/emacs_core/tests/gnu_surface/{subr.rs => subr_test.rs} (100%)
 rename crates/neovm-core/src/emacs_core/text/boolvec/tests/{mod.rs => boolvec_test.rs} (100%)
 rename crates/neovm-core/src/emacs_core/text/casefiddle/tests/{mod.rs => casefiddle_test.rs} (100%)
 rename crates/neovm-core/src/emacs_core/text/casetab/tests/{mod.rs => casetab_test.rs} (100%)
 rename crates/neovm-core/src/emacs_core/text/casetab/tests/{gc_tls_ownership.rs => gc_tls_ownership_test.rs} (100%)
 rename crates/neovm-core/src/emacs_core/text/category/tests/{mod.rs => category_test.rs} (100%)
 rename crates/neovm-core/src/emacs_core/text/category/tests/{gc_tls_ownership.rs => gc_tls_ownership_test.rs} (100%)
 rename crates/neovm-core/src/emacs_core/text/ccl/tests/{mod.rs => ccl_test.rs} (100%)
 rename crates/neovm-core/src/emacs_core/text/ccl/tests/{gc_tls_ownership.rs => gc_tls_ownership_test.rs} (100%)
 rename crates/neovm-core/src/emacs_core/text/charset/tests/{mod.rs => charset_test.rs} (99%)
 rename crates/neovm-core/src/emacs_core/text/charset/tests/{gc_tls_ownership.rs => gc_tls_ownership_test.rs} (100%)
 rename crates/neovm-core/src/emacs_core/text/charset/tests/{mule_identity.rs => mule_identity_test.rs} (100%)
 rename crates/neovm-core/src/emacs_core/text/charset/tests/{prepared_mule.rs => prepared_mule_test.rs} (100%)
 rename crates/neovm-core/src/emacs_core/text/chartable/tests/{mod.rs => chartable_test.rs} (100%)
 rename crates/neovm-core/src/emacs_core/text/chartable/tests/{collection_lookup_capture.rs => collection_lookup_capture_test.rs} (100%)
 rename crates/neovm-core/src/emacs_core/text/coding/tests/{mod.rs => coding_test.rs} (100%)
 rename crates/neovm-core/src/emacs_core/text/composite/tests/{mod.rs => composite_test.rs} (100%)
 rename crates/neovm-core/src/emacs_core/text/emacs_char/tests/{mod.rs => emacs_char_test.rs} (99%)
 rename crates/neovm-core/src/emacs_core/text/emacs_char/tests/{str_as_multibyte_gnu.rs => str_as_multibyte_gnu_test.rs} (100%)
 rename crates/neovm-core/src/emacs_core/text/format/tests/{mod.rs => format_test.rs} (100%)
 rename crates/neovm-core/src/emacs_core/text/json/tests/{mod.rs => json_test.rs} (100%)
 rename crates/neovm-core/src/emacs_core/text/regex/tests/{casefold_scan.rs => casefold_scan_test.rs} (100%)
 rename crates/neovm-core/src/emacs_core/text/regex/tests/{dfa.rs => dfa_test.rs} (100%)
 rename crates/neovm-core/src/emacs_core/text/regex/tests/{emacs.rs => emacs_test.rs} (100%)
 rename crates/neovm-core/src/emacs_core/text/regex/tests/{fail_stack_parity.rs => fail_stack_parity_test.rs} (100%)
 rename crates/neovm-core/src/emacs_core/text/regex/tests/{gc_collection_epoch_minor.rs => gc_collection_epoch_minor_test.rs} (100%)
 rename crates/neovm-core/src/emacs_core/text/regex/tests/{gc_collection_epoch.rs => gc_collection_epoch_test.rs} (100%)
 rename crates/neovm-core/src/emacs_core/text/regex/tests/{gc_literal_epoch.rs => gc_literal_epoch_test.rs} (100%)
 rename crates/neovm-core/src/emacs_core/text/regex/tests/{gc_tls_ownership.rs => gc_tls_ownership_test.rs} (100%)
 rename crates/neovm-core/src/emacs_core/text/regex/tests/{opcode_decode.rs => opcode_decode_test.rs} (100%)
 rename crates/neovm-core/src/emacs_core/text/regex/tests/{mod.rs => regex_test.rs} (100%)
 rename crates/neovm-core/src/emacs_core/text/regex/tests/{short_literal.rs => short_literal_test.rs} (100%)
 rename crates/neovm-core/src/emacs_core/text/regex/tests/{start_anchor.rs => start_anchor_test.rs} (100%)
 rename crates/neovm-core/src/emacs_core/text/regex/tests/{suffix_literal.rs => suffix_literal_test.rs} (100%)
 rename crates/neovm-core/src/emacs_core/text/search/tests/{mod.rs => search_test.rs} (100%)
 rename crates/neovm-core/src/emacs_core/text/string_escape/tests/{mod.rs => string_escape_test.rs} (100%)
 rename crates/neovm-core/src/emacs_core/text/string_pos_cache/tests/{gc_collection_epoch_minor.rs => gc_collection_epoch_minor_test.rs} (100%)
 rename crates/neovm-core/src/emacs_core/text/string_pos_cache/tests/{gc_collection_epoch.rs => gc_collection_epoch_test.rs} (100%)
 rename crates/neovm-core/src/emacs_core/text/string_pos_cache/tests/{gc_tls_ownership.rs => gc_tls_ownership_test.rs} (100%)
 rename crates/neovm-core/src/emacs_core/text/string_pos_cache/tests/{mod.rs => string_pos_cache_test.rs} (100%)
 rename crates/neovm-core/src/emacs_core/text/syntax/tests/{back_comment_canonical.rs => back_comment_canonical_test.rs} (100%)
 rename crates/neovm-core/src/emacs_core/text/syntax/tests/{back_comment_safe_positions.rs => back_comment_safe_positions_test.rs} (100%)
 rename crates/neovm-core/src/emacs_core/text/syntax/tests/{category_property.rs => category_property_test.rs} (100%)
 rename crates/neovm-core/src/emacs_core/text/syntax/tests/{gc_tls_ownership.rs => gc_tls_ownership_test.rs} (100%)
 rename crates/neovm-core/src/emacs_core/text/syntax/tests/{gdn_word_motion.rs => gdn_word_motion_test.rs} (100%)
 rename crates/neovm-core/src/emacs_core/text/syntax/tests/{gnu_parity_regression.rs => gnu_parity_regression_test.rs} (100%)
 rename crates/neovm-core/src/emacs_core/text/syntax/tests/{parse_cache_invalidation.rs => parse_cache_invalidation_test.rs} (100%)
 rename crates/neovm-core/src/emacs_core/text/syntax/tests/{parse_cache.rs => parse_cache_test.rs} (100%)
 rename crates/neovm-core/src/emacs_core/text/syntax/tests/{parse_loop_resume.rs => parse_loop_resume_test.rs} (100%)
 rename crates/neovm-core/src/emacs_core/text/syntax/tests/{parse_state_divergence_gnu.rs => parse_state_divergence_gnu_test.rs} (100%)
 rename crates/neovm-core/src/emacs_core/text/syntax/tests/{pps_propertize_gnu.rs => pps_propertize_gnu_test.rs} (100%)
 rename crates/neovm-core/src/emacs_core/text/syntax/tests/{pps_propertize_knob.rs => pps_propertize_knob_test.rs} (100%)
 rename crates/neovm-core/src/emacs_core/text/syntax/tests/{scan_error_data_gnu.rs => scan_error_data_gnu_test.rs} (100%)
 rename crates/neovm-core/src/emacs_core/text/syntax/tests/{skip_syntax_classes.rs => skip_syntax_classes_test.rs} (100%)
 rename crates/neovm-core/src/emacs_core/text/syntax/tests/{syntax_prop_byte_run.rs => syntax_prop_byte_run_test.rs} (100%)
 rename crates/neovm-core/src/emacs_core/text/syntax/tests/{mod.rs => syntax_test.rs} (99%)
 rename crates/neovm-core/src/emacs_core/text/textprop/tests/{mod.rs => textprop_test.rs} (100%)
 rename crates/neovm-core/src/emacs_core/text/treesit/tests/{mod.rs => treesit_test.rs} (100%)
 rename crates/neovm-core/src/emacs_core/text/xml/tests/{mod.rs => xml_test.rs} (100%)
 rename crates/neovm-core/src/encoding/tests/{mod.rs => encoding_test.rs} (99%)
 rename crates/neovm-core/src/encoding/tests/{prepared_mule.rs => prepared_mule_test.rs} (100%)
 rename crates/neovm-core/src/face/tests/{mod.rs => face_test.rs} (100%)
 rename crates/neovm-core/src/image_identity/tests/{mod.rs => image_identity_test.rs} (100%)
 create mode 100644 crates/neovm-core/src/keyboard/tests/display_service_test.rs
 rename crates/neovm-core/src/keyboard/tests/{mod.rs => keyboard_test.rs} (100%)
 rename crates/neovm-core/src/tagged/collection_reads/{tests.rs => tests/collection_reads_test.rs} (99%)
 rename crates/neovm-core/src/tagged/collection_reads/tests/{fast_paths.rs => fast_paths_test.rs} (100%)
 rename crates/neovm-core/src/tagged/collection_reads/tests/{lazy_window.rs => lazy_window_test.rs} (100%)
 rename crates/neovm-core/src/tagged/collection_reads/tests/{observed_collisions.rs => observed_collisions_test.rs} (100%)
 rename crates/neovm-core/src/tagged/collection_reads/tests/{observed_epoch.rs => observed_epoch_test.rs} (100%)
 rename crates/neovm-core/src/tagged/collection_reads/tests/{observed_gap.rs => observed_gap_test.rs} (100%)
 rename crates/neovm-core/src/tagged/gc/tests/{alloc_region_tests.rs => alloc_region_test.rs} (100%)
 rename crates/neovm-core/src/tagged/gc/tests/{arena_minor_tests.rs => arena_minor_test.rs} (100%)
 rename crates/neovm-core/src/tagged/gc/tests/{arena_promotion_tests.rs => arena_promotion_test.rs} (100%)
 rename crates/neovm-core/src/tagged/gc/tests/{barrier_window_generational_tests.rs => barrier_window_generational_test.rs} (100%)
 rename crates/neovm-core/src/tagged/gc/tests/{barrier_window_tests.rs => barrier_window_test.rs} (100%)
 rename crates/neovm-core/src/tagged/gc/tests/{bignum_arena_tests.rs => bignum_arena_test.rs} (100%)
 rename crates/neovm-core/src/tagged/gc/tests/{birth_logs_tests.rs => birth_logs_test.rs} (100%)
 rename crates/neovm-core/src/tagged/gc/tests/{bytecode_arena_tests.rs => bytecode_arena_test.rs} (100%)
 rename crates/neovm-core/src/tagged/gc/tests/{census_tests.rs => census_test.rs} (100%)
 rename crates/neovm-core/src/tagged/gc/tests/{chunk_entry_decode_tests.rs => chunk_entry_decode_test.rs} (100%)
 rename crates/neovm-core/src/tagged/gc/tests/{chunk_map_tests.rs => chunk_map_test.rs} (100%)
 rename crates/neovm-core/src/tagged/gc/tests/{collection_observed_registry_tests.rs => collection_observed_registry_test.rs} (100%)
 rename crates/neovm-core/src/tagged/gc/tests/{collection_observed_tests.rs => collection_observed_test.rs} (100%)
 rename crates/neovm-core/src/tagged/gc/tests/{concurrent_major_worker_tests.rs => concurrent_major_worker_test.rs} (100%)
 rename crates/neovm-core/src/tagged/gc/tests/{cons_alloc_tests.rs => cons_alloc_test.rs} (100%)
 rename crates/neovm-core/src/tagged/gc/tests/{cons_minor_tests.rs => cons_minor_test.rs} (100%)
 rename crates/neovm-core/src/tagged/gc/tests/{cons_trailer_tests.rs => cons_trailer_test.rs} (100%)
 rename crates/neovm-core/src/tagged/gc/tests/{float_arena_tests.rs => float_arena_test.rs} (100%)
 rename crates/neovm-core/src/tagged/gc/tests/{generation_tests.rs => generation_test.rs} (100%)
 rename crates/neovm-core/src/tagged/gc/tests/{generational_major_tests.rs => generational_major_test.rs} (100%)
 rename crates/neovm-core/src/tagged/gc/tests/{generational_pacing_tests.rs => generational_pacing_test.rs} (100%)
 rename crates/neovm-core/src/tagged/gc/tests/{generational_tests.rs => generational_test.rs} (100%)
 rename crates/neovm-core/src/tagged/gc/tests/{generational_verifier_tests.rs => generational_verifier_test.rs} (100%)
 rename crates/neovm-core/src/tagged/gc/tests/{heap_mut_closure_tests.rs => heap_mut_closure_test.rs} (100%)
 rename crates/neovm-core/src/tagged/gc/tests/{lambda_macro_arena_tests.rs => lambda_macro_arena_test.rs} (100%)
 rename crates/neovm-core/src/tagged/gc/tests/{layout_stats_tests.rs => layout_stats_test.rs} (100%)
 rename crates/neovm-core/src/tagged/gc/tests/{major_symbol_preimage_tests.rs => major_symbol_preimage_test.rs} (100%)
 rename crates/neovm-core/src/tagged/gc/tests/{marker_arena_tests.rs => marker_arena_test.rs} (100%)
 rename crates/neovm-core/src/tagged/gc/tests/{memory_inventory_tests.rs => memory_inventory_test.rs} (100%)
 rename crates/neovm-core/src/tagged/gc/tests/{memory_telemetry_tests.rs => memory_telemetry_test.rs} (100%)
 rename crates/neovm-core/src/tagged/gc/tests/{ownership_tests.rs => ownership_test.rs} (100%)
 rename crates/neovm-core/src/tagged/gc/tests/{pacer_tests.rs => pacer_test.rs} (100%)
 rename crates/neovm-core/src/tagged/gc/tests/{record_arena_tests.rs => record_arena_test.rs} (100%)
 rename crates/neovm-core/src/tagged/gc/tests/{slot_store_tests.rs => slot_store_test.rs} (100%)
 rename crates/neovm-core/src/tagged/gc/tests/{symbol_barrier_tests.rs => symbol_barrier_test.rs} (100%)
 rename crates/neovm-core/src/tagged/gc/tests/{symbol_with_pos_arena_tests.rs => symbol_with_pos_arena_test.rs} (100%)
 rename crates/neovm-core/src/tagged/gc/tests/{thread_local_ownership.rs => thread_local_ownership_test.rs} (100%)
 rename crates/neovm-core/src/tagged/gc/tests/{vec_scan_tests.rs => vec_scan_test.rs} (100%)
 rename crates/neovm-core/src/tagged/symbol_marks/tests/{mod.rs => symbol_marks_test.rs} (100%)
 rename crates/neovm-core/src/tagged/{tests.rs => tests/tagged_test.rs} (99%)
 rename crates/neovm-core/src/tagged/tests/{write_fusion.rs => write_fusion_test.rs} (100%)
 rename crates/neovm-core/src/tagged/value/tests/{gc_tls_ownership.rs => gc_tls_ownership_test.rs} (100%)
 rename crates/neovm-core/src/tests/{test_utils.rs => test_utils_test.rs} (100%)
 rename crates/neovm-core/src/window/frame_alpha/tests/{mod.rs => frame_alpha_test.rs} (100%)
 rename crates/neovm-core/src/window/tests/{split_hook_epoch.rs => split_hook_epoch_test.rs} (100%)
 rename crates/neovm-core/src/window/tests/{mod.rs => window_test.rs} (99%)
 create mode 100644 crates/xtask/src/tests/window_icon_test.rs

diff --git a/crates/neomacs-diagnostics/src/flamegraph.rs b/crates/neomacs-diagnostics/src/flamegraph.rs
index 30c7d2b44c..16173885fb 100644
--- a/crates/neomacs-diagnostics/src/flamegraph.rs
+++ b/crates/neomacs-diagnostics/src/flamegraph.rs
@@ -30,4 +30,5 @@ fn empty_svg(title: &str) -> String {
 }
 
 #[cfg(test)]
+#[path = "flamegraph/tests/flamegraph_test.rs"]
 mod tests;
diff --git a/crates/neomacs-diagnostics/src/flamegraph/tests/mod.rs b/crates/neomacs-diagnostics/src/flamegraph/tests/flamegraph_test.rs
similarity index 100%
rename from crates/neomacs-diagnostics/src/flamegraph/tests/mod.rs
rename to crates/neomacs-diagnostics/src/flamegraph/tests/flamegraph_test.rs
diff --git a/crates/neomacs-diagnostics/src/metrics.rs b/crates/neomacs-diagnostics/src/metrics.rs
index 9c4df2f54f..14b663166c 100644
--- a/crates/neomacs-diagnostics/src/metrics.rs
+++ b/crates/neomacs-diagnostics/src/metrics.rs
@@ -114,4 +114,5 @@ pub struct GcMetrics {
 }
 
 #[cfg(test)]
+#[path = "metrics/tests/metrics_test.rs"]
 mod tests;
diff --git a/crates/neomacs-diagnostics/src/metrics/tests/mod.rs b/crates/neomacs-diagnostics/src/metrics/tests/metrics_test.rs
similarity index 100%
rename from crates/neomacs-diagnostics/src/metrics/tests/mod.rs
rename to crates/neomacs-diagnostics/src/metrics/tests/metrics_test.rs
diff --git a/crates/neomacs-diagnostics/src/pprof.rs b/crates/neomacs-diagnostics/src/pprof.rs
index f93bee36c0..d06b4641a7 100644
--- a/crates/neomacs-diagnostics/src/pprof.rs
+++ b/crates/neomacs-diagnostics/src/pprof.rs
@@ -188,4 +188,5 @@ pub fn folded_to_pprof(folded: &str) -> Vec<u8> {
 }
 
 #[cfg(test)]
+#[path = "pprof/tests/pprof_test.rs"]
 mod tests;
diff --git a/crates/neomacs-diagnostics/src/pprof/tests/mod.rs b/crates/neomacs-diagnostics/src/pprof/tests/pprof_test.rs
similarity index 100%
rename from crates/neomacs-diagnostics/src/pprof/tests/mod.rs
rename to crates/neomacs-diagnostics/src/pprof/tests/pprof_test.rs
diff --git a/crates/neomacs-diagnostics/src/report.rs b/crates/neomacs-diagnostics/src/report.rs
index c0bfebce0c..32f5a9e5d7 100644
--- a/crates/neomacs-diagnostics/src/report.rs
+++ b/crates/neomacs-diagnostics/src/report.rs
@@ -290,4 +290,5 @@ fn sort_edges(map: HashMap<&str, u64>) -> Vec<CallEdge> {
 }
 
 #[cfg(test)]
+#[path = "report/tests/report_test.rs"]
 mod tests;
diff --git a/crates/neomacs-diagnostics/src/report/tests/mod.rs b/crates/neomacs-diagnostics/src/report/tests/report_test.rs
similarity index 100%
rename from crates/neomacs-diagnostics/src/report/tests/mod.rs
rename to crates/neomacs-diagnostics/src/report/tests/report_test.rs
diff --git a/crates/neomacs-diagnostics/src/server.rs b/crates/neomacs-diagnostics/src/server.rs
index aa670df139..242220ebc6 100644
--- a/crates/neomacs-diagnostics/src/server.rs
+++ b/crates/neomacs-diagnostics/src/server.rs
@@ -470,4 +470,5 @@ pub fn spawn(
 }
 
 #[cfg(test)]
+#[path = "server/tests/server_test.rs"]
 mod tests;
diff --git a/crates/neomacs-diagnostics/src/server/tests/mod.rs b/crates/neomacs-diagnostics/src/server/tests/server_test.rs
similarity index 100%
rename from crates/neomacs-diagnostics/src/server/tests/mod.rs
rename to crates/neomacs-diagnostics/src/server/tests/server_test.rs
diff --git a/crates/neomacs-display-protocol/src/child_frame_animation.rs b/crates/neomacs-display-protocol/src/child_frame_animation.rs
index d09c087ba1..e030bc14a6 100644
--- a/crates/neomacs-display-protocol/src/child_frame_animation.rs
+++ b/crates/neomacs-display-protocol/src/child_frame_animation.rs
@@ -235,6 +235,7 @@ pub fn default_child_frame_resize() -> ChildFrameAnimation {
 }
 
 #[cfg(test)]
+#[path = "child_frame_animation/tests/child_frame_animation_test.rs"]
 mod tests;
 
 crate::effect_schema!(ChildFrameAnimation {
diff --git a/crates/neomacs-display-protocol/src/child_frame_animation/tests/mod.rs b/crates/neomacs-display-protocol/src/child_frame_animation/tests/child_frame_animation_test.rs
similarity index 100%
rename from crates/neomacs-display-protocol/src/child_frame_animation/tests/mod.rs
rename to crates/neomacs-display-protocol/src/child_frame_animation/tests/child_frame_animation_test.rs
diff --git a/crates/neomacs-display-protocol/src/display_identity.rs b/crates/neomacs-display-protocol/src/display_identity.rs
index b418eb8fff..5dbe4cc7f7 100644
--- a/crates/neomacs-display-protocol/src/display_identity.rs
+++ b/crates/neomacs-display-protocol/src/display_identity.rs
@@ -93,4 +93,5 @@ impl GraphicalDisplayIdentity {
 }
 
 #[cfg(test)]
+#[path = "display_identity/tests/display_identity_test.rs"]
 mod tests;
diff --git a/crates/neomacs-display-protocol/src/display_identity/tests/mod.rs b/crates/neomacs-display-protocol/src/display_identity/tests/display_identity_test.rs
similarity index 100%
rename from crates/neomacs-display-protocol/src/display_identity/tests/mod.rs
rename to crates/neomacs-display-protocol/src/display_identity/tests/display_identity_test.rs
diff --git a/crates/neomacs-display-protocol/src/effect_config.rs b/crates/neomacs-display-protocol/src/effect_config.rs
index 4ecdb2d9ce..b12ad9636c 100644
--- a/crates/neomacs-display-protocol/src/effect_config.rs
+++ b/crates/neomacs-display-protocol/src/effect_config.rs
@@ -1769,6 +1769,7 @@ effect_config!(
 );
 
 #[cfg(test)]
+#[path = "effect_config/tests/effect_config_test.rs"]
 mod tests;
 
 /// Container for all visual effect configurations.
diff --git a/crates/neomacs-display-protocol/src/effect_config/tests/mod.rs b/crates/neomacs-display-protocol/src/effect_config/tests/effect_config_test.rs
similarity index 100%
rename from crates/neomacs-display-protocol/src/effect_config/tests/mod.rs
rename to crates/neomacs-display-protocol/src/effect_config/tests/effect_config_test.rs
diff --git a/crates/neomacs-display-protocol/src/face.rs b/crates/neomacs-display-protocol/src/face.rs
index 16dab27233..bb7b070353 100644
--- a/crates/neomacs-display-protocol/src/face.rs
+++ b/crates/neomacs-display-protocol/src/face.rs
@@ -979,4 +979,5 @@ impl FaceCache {
 }
 
 #[cfg(test)]
+#[path = "face/tests/face_test.rs"]
 mod tests;
diff --git a/crates/neomacs-display-protocol/src/face/tests/mod.rs b/crates/neomacs-display-protocol/src/face/tests/face_test.rs
similarity index 100%
rename from crates/neomacs-display-protocol/src/face/tests/mod.rs
rename to crates/neomacs-display-protocol/src/face/tests/face_test.rs
diff --git a/crates/neomacs-display-protocol/src/font.rs b/crates/neomacs-display-protocol/src/font.rs
index afa78cf88a..3fd6b366e4 100644
--- a/crates/neomacs-display-protocol/src/font.rs
+++ b/crates/neomacs-display-protocol/src/font.rs
@@ -913,4 +913,5 @@ pub struct FrameFontBindings<'a> {
 }
 
 #[cfg(test)]
+#[path = "font/tests/font_test.rs"]
 mod tests;
diff --git a/crates/neomacs-display-protocol/src/font/tests/mod.rs b/crates/neomacs-display-protocol/src/font/tests/font_test.rs
similarity index 100%
rename from crates/neomacs-display-protocol/src/font/tests/mod.rs
rename to crates/neomacs-display-protocol/src/font/tests/font_test.rs
diff --git a/crates/neomacs-display-protocol/src/frame_chrome.rs b/crates/neomacs-display-protocol/src/frame_chrome.rs
index cfa08705f3..4fb54a380c 100644
--- a/crates/neomacs-display-protocol/src/frame_chrome.rs
+++ b/crates/neomacs-display-protocol/src/frame_chrome.rs
@@ -773,4 +773,5 @@ pub enum ChromeLayoutError {
 }
 
 #[cfg(test)]
+#[path = "frame_chrome/tests/frame_chrome_test.rs"]
 mod tests;
diff --git a/crates/neomacs-display-protocol/src/frame_chrome/tests/mod.rs b/crates/neomacs-display-protocol/src/frame_chrome/tests/frame_chrome_test.rs
similarity index 100%
rename from crates/neomacs-display-protocol/src/frame_chrome/tests/mod.rs
rename to crates/neomacs-display-protocol/src/frame_chrome/tests/frame_chrome_test.rs
diff --git a/crates/neomacs-display-protocol/src/frame_glyphs.rs b/crates/neomacs-display-protocol/src/frame_glyphs.rs
index 7270b60bca..ca34a3f530 100644
--- a/crates/neomacs-display-protocol/src/frame_glyphs.rs
+++ b/crates/neomacs-display-protocol/src/frame_glyphs.rs
@@ -2551,4 +2551,5 @@ impl FrameGlyphBuffer {
 }
 
 #[cfg(test)]
+#[path = "frame_glyphs/tests/frame_glyphs_test.rs"]
 mod tests;
diff --git a/crates/neomacs-display-protocol/src/frame_glyphs/tests/mod.rs b/crates/neomacs-display-protocol/src/frame_glyphs/tests/frame_glyphs_test.rs
similarity index 100%
rename from crates/neomacs-display-protocol/src/frame_glyphs/tests/mod.rs
rename to crates/neomacs-display-protocol/src/frame_glyphs/tests/frame_glyphs_test.rs
diff --git a/crates/neomacs-display-protocol/src/frame_time.rs b/crates/neomacs-display-protocol/src/frame_time.rs
index bdf99ee392..482004149c 100644
--- a/crates/neomacs-display-protocol/src/frame_time.rs
+++ b/crates/neomacs-display-protocol/src/frame_time.rs
@@ -174,4 +174,5 @@ impl FrameSample {
 }
 
 #[cfg(test)]
+#[path = "frame_time/tests/frame_time_test.rs"]
 mod tests;
diff --git a/crates/neomacs-display-protocol/src/frame_time/tests/mod.rs b/crates/neomacs-display-protocol/src/frame_time/tests/frame_time_test.rs
similarity index 100%
rename from crates/neomacs-display-protocol/src/frame_time/tests/mod.rs
rename to crates/neomacs-display-protocol/src/frame_time/tests/frame_time_test.rs
diff --git a/crates/neomacs-display-protocol/src/geometry.rs b/crates/neomacs-display-protocol/src/geometry.rs
index 10d302a7af..435a9c1ba9 100644
--- a/crates/neomacs-display-protocol/src/geometry.rs
+++ b/crates/neomacs-display-protocol/src/geometry.rs
@@ -609,4 +609,5 @@ impl DeviceScale {
 }
 
 #[cfg(test)]
+#[path = "geometry/tests/geometry_test.rs"]
 mod tests;
diff --git a/crates/neomacs-display-protocol/src/geometry/tests/mod.rs b/crates/neomacs-display-protocol/src/geometry/tests/geometry_test.rs
similarity index 100%
rename from crates/neomacs-display-protocol/src/geometry/tests/mod.rs
rename to crates/neomacs-display-protocol/src/geometry/tests/geometry_test.rs
diff --git a/crates/neomacs-display-protocol/src/glyph_matrix.rs b/crates/neomacs-display-protocol/src/glyph_matrix.rs
index 3dba579477..30a5b59ef2 100644
--- a/crates/neomacs-display-protocol/src/glyph_matrix.rs
+++ b/crates/neomacs-display-protocol/src/glyph_matrix.rs
@@ -3731,6 +3731,7 @@ pub trait RedisplayInterface {
 }
 
 #[cfg(test)]
+#[path = "glyph_matrix/tests/glyph_matrix_test.rs"]
 mod tests;
 
 #[cfg(test)]
diff --git a/crates/neomacs-display-protocol/src/glyph_matrix/tests/mod.rs b/crates/neomacs-display-protocol/src/glyph_matrix/tests/glyph_matrix_test.rs
similarity index 99%
rename from crates/neomacs-display-protocol/src/glyph_matrix/tests/mod.rs
rename to crates/neomacs-display-protocol/src/glyph_matrix/tests/glyph_matrix_test.rs
index fe2c0a0e88..90e08d2e01 100644
--- a/crates/neomacs-display-protocol/src/glyph_matrix/tests/mod.rs
+++ b/crates/neomacs-display-protocol/src/glyph_matrix/tests/glyph_matrix_test.rs
@@ -37,6 +37,7 @@ fn gnu_frame_alpha_survives_display_snapshot_materialization() {
 }
 use crate::DisplayFrameId;
 
+#[path = "row_appearance_test.rs"]
 mod row_appearance_test;
 use crate::face::Face;
 use crate::frame_chrome::PresentationId;
diff --git a/crates/neomacs-display-protocol/src/glyph_matrix/text_geometry.rs b/crates/neomacs-display-protocol/src/glyph_matrix/text_geometry.rs
index 20d24e91e8..f4ccb33d7f 100644
--- a/crates/neomacs-display-protocol/src/glyph_matrix/text_geometry.rs
+++ b/crates/neomacs-display-protocol/src/glyph_matrix/text_geometry.rs
@@ -90,4 +90,5 @@ impl<'row> TextRowGeometry<'row> {
 }
 
 #[cfg(test)]
+#[path = "text_geometry/tests/text_geometry_test.rs"]
 mod tests;
diff --git a/crates/neomacs-display-protocol/src/glyph_matrix/text_geometry/tests/mod.rs b/crates/neomacs-display-protocol/src/glyph_matrix/text_geometry/tests/text_geometry_test.rs
similarity index 100%
rename from crates/neomacs-display-protocol/src/glyph_matrix/text_geometry/tests/mod.rs
rename to crates/neomacs-display-protocol/src/glyph_matrix/text_geometry/tests/text_geometry_test.rs
diff --git a/crates/neomacs-display-protocol/src/input_latency.rs b/crates/neomacs-display-protocol/src/input_latency.rs
index 82b7d881c3..4553d7ce75 100644
--- a/crates/neomacs-display-protocol/src/input_latency.rs
+++ b/crates/neomacs-display-protocol/src/input_latency.rs
@@ -399,199 +399,5 @@ pub fn observed(
 }
 
 #[cfg(test)]
-mod tests {
-    use super::*;
-    fn viewport(start: usize) -> Vec<ScrollViewport> {
-        vec![ScrollViewport {
-            window: 1,
-            buffer: 1,
-            start,
-            hscroll: 0,
-            vscroll: 0,
-        }]
-    }
-    fn time(nanoseconds: u64) -> PlatformTimestamp {
-        PlatformTimestamp {
-            clock_id: 1,
-            nanoseconds,
-        }
-    }
-    #[test]
-    fn output_confirmation_preserves_its_measurement_kind_and_uncertainty() {
-        let mut measurements = Measurements::default();
-        let token = measurements.receive(7, "precise", time(100));
-        let kind = PresentationObservation::FirstPixelOutput { uncertainty_ns: 70 };
-        measurements.start(&[token], |_| viewport(1));
-        measurements.projected_requested(&[token], 7, 41);
-        measurements.projected_observed(7, 41, time(150), kind);
-        measurements.seal(7, PresentationId::new(2), &viewport(2));
-        let samples = measurements.observed(PresentationId::new(2), time(300), kind);
-        assert_eq!(samples[0]["observation"], "native-first-pixel-output");
-        assert_eq!(
-            samples[0]["projected_observation"],
-            "native-first-pixel-output"
-        );
-        assert_eq!(samples[0]["timestamp_uncertainty_ns"], 70);
-        assert_eq!(samples[0]["projected_timestamp_uncertainty_ns"], 70);
-        assert_eq!(samples[0]["input_to_present_ns"], 200);
-    }
-
-    #[test]
-    fn projected_latency_requires_exact_native_submission_and_keeps_authoritative_completion() {
-        let mut measurements = Measurements::default();
-        let token = measurements.receive(7, "precise", time(100));
-        measurements.projected_requested(&[token], 7, 41);
-        measurements.projected_confirmed(8, 41, time(110));
-        measurements.projected_confirmed(7, 40, time(120));
-        measurements.projected_confirmed(
-            7,
-            41,
-            PlatformTimestamp {
-                clock_id: 2,
-                nanoseconds: 130,
-            },
-        );
-        assert!(measurements.pending[0].projected.is_none());
-        measurements.projected_confirmed(7, 41, time(150));
-        measurements.projected_confirmed(7, 41, time(160));
-        assert!(
-            measurements
-                .confirmed(PresentationId::new(1), time(170))
-                .is_empty()
-        );
-        measurements.start(&[token], |_| viewport(1));
-        measurements.seal(7, PresentationId::new(2), &viewport(2));
-        let samples = measurements.confirmed(PresentationId::new(2), time(300));
-        assert_eq!(samples.len(), 1);
-        assert_eq!(samples[0]["input_to_projected_present_ns"], 50);
-        assert_eq!(samples[0]["projected_submission"], 41);
-        assert_eq!(samples[0]["input_to_present_ns"], 200);
-        assert!(measurements.pending.is_empty());
-    }
-
-    #[test]
-    fn queued_input_and_other_frames_cannot_complete_a_latency_sample() {
-        let mut measurements = Measurements::default();
-        let token = measurements.receive(7, "wheel", time(100));
-        measurements.seal(7, PresentationId::new(1), &viewport(2));
-        assert!(
-            measurements
-                .confirmed(PresentationId::new(1), time(200))
-                .is_empty()
-        );
-        measurements.start(&[token], |_| viewport(1));
-        measurements.seal(8, PresentationId::new(2), &viewport(2));
-        assert!(
-            measurements
-                .confirmed(PresentationId::new(2), time(300))
-                .is_empty()
-        );
-        measurements.seal(7, PresentationId::new(3), &viewport(2));
-        let samples = measurements.confirmed(PresentationId::new(3), time(400));
-        assert_eq!(samples[0]["input_to_present_ns"], 300);
-        assert!(
-            measurements
-                .confirmed(PresentationId::new(3), time(500))
-                .is_empty()
-        );
-    }
-    #[test]
-    fn superseded_layout_keeps_original_input_time_and_bounds_memory() {
-        let mut measurements = Measurements::default();
-        for _ in 0..MAX_PENDING + 1 {
-            measurements.receive(7, "precise", time(100));
-        }
-        assert_eq!(measurements.pending.len(), MAX_PENDING);
-        assert_eq!(measurements.dropped, 1);
-        let token = measurements.pending.back().unwrap().token;
-        measurements.start(&[token], |_| viewport(1));
-        for id in 1..=20 {
-            measurements.seal(7, PresentationId::new(id), &viewport(2));
-        }
-        assert_eq!(
-            measurements.pending.back().unwrap().layouts.len(),
-            MAX_PRESENTATIONS
-        );
-        assert!(
-            measurements
-                .confirmed(PresentationId::new(1), time(200))
-                .is_empty()
-        );
-        let samples = measurements.confirmed(PresentationId::new(20), time(500));
-        assert_eq!(samples[0]["input_to_present_ns"], 400);
-        assert_eq!(samples[0]["evicted_inputs"], 1);
-    }
-    #[test]
-    fn command_preflight_cannot_ack_before_the_viewport_changes() {
-        let mut measurements = Measurements::default();
-        let token = measurements.receive(7, "precise", time(100));
-        measurements.start(&[token], |_| viewport(1));
-        measurements.seal(7, PresentationId::new(1), &viewport(1));
-        assert!(
-            measurements
-                .confirmed(PresentationId::new(1), time(200))
-                .is_empty()
-        );
-        measurements.seal(7, PresentationId::new(2), &viewport(2));
-        assert_eq!(
-            measurements
-                .confirmed(PresentationId::new(2), time(300))
-                .len(),
-            1
-        );
-        let token = measurements.receive(7, "page", time(400));
-        measurements.start(&[token], |_| viewport(2));
-        measurements.cancel(&[token]);
-        measurements.seal(7, PresentationId::new(3), &viewport(3));
-        assert!(
-            measurements
-                .confirmed(PresentationId::new(3), time(500))
-                .is_empty()
-        );
-    }
-
-    #[test]
-    fn completed_no_op_cannot_be_credited_to_a_later_command() {
-        let mut measurements = Measurements::default();
-        let token = measurements.receive(7, "page", time(100));
-        measurements.start(&[token], |_| viewport(1));
-        measurements.finish(&[token], |_| viewport(1));
-        measurements.seal(7, PresentationId::new(2), &viewport(2));
-        assert!(
-            measurements
-                .confirmed(PresentationId::new(2), time(300))
-                .is_empty()
-        );
-    }
-
-    #[test]
-    fn completed_scrolls_can_be_coalesced_back_to_the_original_viewport() {
-        let mut measurements = Measurements::default();
-        let token = measurements.receive(7, "precise", time(100));
-        measurements.start(&[token], |_| viewport(1));
-        measurements.finish(&[token], |_| viewport(2));
-        measurements.seal(7, PresentationId::new(2), &viewport(1));
-        assert_eq!(
-            measurements
-                .confirmed(PresentationId::new(2), time(300))
-                .len(),
-            1
-        );
-    }
-
-    #[test]
-    fn unrelated_clock_cannot_fabricate_latency() {
-        let mut measurements = Measurements::default();
-        let token = measurements.receive(7, "page", time(100));
-        measurements.start(&[token], |_| viewport(1));
-        measurements.seal(7, PresentationId::new(1), &viewport(2));
-        let samples = measurements.confirmed(
-            PresentationId::new(1),
-            PlatformTimestamp {
-                clock_id: 2,
-                nanoseconds: 200,
-            },
-        );
-        assert!(samples[0]["input_to_present_ns"].is_null());
-    }
-}
+#[path = "tests/input_latency_test.rs"]
+mod tests;
diff --git a/crates/neomacs-display-protocol/src/input_progress.rs b/crates/neomacs-display-protocol/src/input_progress.rs
index 24792ce4ce..05086a9618 100644
--- a/crates/neomacs-display-protocol/src/input_progress.rs
+++ b/crates/neomacs-display-protocol/src/input_progress.rs
@@ -246,108 +246,5 @@ impl Drop for CommandInputs {
 }
 
 #[cfg(test)]
-mod tests {
-    use super::*;
-
-    #[test]
-    fn preview_observation_belongs_only_to_innermost_command() {
-        let stream = InputStream::default();
-        let outer_input = stream.issue().unwrap();
-        let receipt = outer_input.receipt();
-        let mut progress = InputProgress::default();
-        progress.consumed(outer_input);
-        assert!(progress.current_command_receipts().is_empty());
-        let outer = progress.begin_command();
-        assert!(progress.current_command_receipts()[0].same_input(&receipt));
-        let inner = progress.begin_command();
-        assert!(progress.current_command_receipts().is_empty());
-        drop(inner);
-        assert_eq!(progress.current_command_receipts().len(), 1);
-        drop(outer);
-        assert!(progress.current_command_receipts().is_empty());
-        assert!(receipt.acknowledged_by(&progress.checkpoint()));
-    }
-
-    #[test]
-    fn old_frame_cannot_acknowledge_a_later_command_completion() {
-        let stream = InputStream::default();
-        let receipt = stream.issue().unwrap();
-        let mut progress = InputProgress::default();
-        progress.consumed(receipt.clone());
-        let command = progress.begin_command();
-        let old_frame = progress.checkpoint();
-        assert!(!receipt.acknowledged_by(&old_frame));
-        drop(command);
-        assert!(!receipt.acknowledged_by(&old_frame));
-        assert!(receipt.acknowledged_by(&progress.checkpoint()));
-    }
-
-    #[test]
-    fn nested_completion_waits_for_the_outer_command() {
-        let stream = InputStream::default();
-        let outer = stream.issue().unwrap();
-        let inner = stream.issue().unwrap();
-        let mut progress = InputProgress::default();
-        progress.consumed(outer.clone());
-        let outer_command = progress.begin_command();
-        let inner_command = progress.begin_command();
-        progress.consumed(inner.clone());
-        drop(inner_command);
-        assert!(!inner.acknowledged_by(&progress.checkpoint()));
-        drop(outer_command);
-        assert!(inner.acknowledged_by(&progress.checkpoint()));
-    }
-
-    #[test]
-    fn completion_on_unwind_and_stream_identity_are_independent() {
-        let stream = InputStream::default();
-        let receipt = stream.issue().unwrap();
-        let foreign = InputStream::default().issue().unwrap();
-        let mut progress = InputProgress::default();
-        progress.consumed(receipt.clone());
-        let _ = std::panic::catch_unwind(std::panic::AssertUnwindSafe(|| {
-            let _command = progress.begin_command();
-            panic!("command aborted");
-        }));
-        assert!(receipt.acknowledged_by(&progress.checkpoint()));
-        assert!(!foreign.acknowledged_by(&progress.checkpoint()));
-    }
-
-    #[test]
-    fn discarding_delivery_cancels_even_while_the_compositor_keeps_a_receipt() {
-        let stream = InputStream::default();
-        let delivery = stream.issue().unwrap();
-        let observer = delivery.receipt();
-        let queued_copy = delivery.clone();
-        drop(delivery);
-        assert!(!observer.cancelled());
-        drop(queued_copy);
-        assert!(observer.cancelled());
-        assert!(observer.acknowledged_by(&[stream.checkpoint()]));
-    }
-
-    #[test]
-    fn completed_delivery_does_not_later_turn_into_cancellation() {
-        let stream = InputStream::default();
-        let delivery = stream.issue().unwrap();
-        let observer = delivery.receipt();
-        let mut progress = InputProgress::default();
-        let command = progress.begin_command();
-        progress.consumed(delivery);
-        assert!(!observer.acknowledged_by(&progress.checkpoint()));
-        drop(command);
-        assert!(observer.acknowledged_by(&progress.checkpoint()));
-        assert!(!observer.cancelled());
-    }
-
-    #[test]
-    fn pending_receipts_are_bounded_and_capacity_returns_after_completion() {
-        let stream = InputStream::default();
-        let receipts: Vec<_> = (0..MAX_PENDING).map(|_| stream.issue().unwrap()).collect();
-        assert!(stream.issue().is_none());
-        for receipt in receipts {
-            receipt.complete();
-        }
-        assert!(stream.issue().is_some());
-    }
-}
+#[path = "tests/input_progress_test.rs"]
+mod tests;
diff --git a/crates/neomacs-display-protocol/src/interaction_projection.rs b/crates/neomacs-display-protocol/src/interaction_projection.rs
index 2b1466be20..a2b10301a6 100644
--- a/crates/neomacs-display-protocol/src/interaction_projection.rs
+++ b/crates/neomacs-display-protocol/src/interaction_projection.rs
@@ -222,4 +222,5 @@ impl InteractionProjection {
 }
 
 #[cfg(test)]
+#[path = "interaction_projection/tests/interaction_projection_test.rs"]
 mod tests;
diff --git a/crates/neomacs-display-protocol/src/interaction_projection/tests/mod.rs b/crates/neomacs-display-protocol/src/interaction_projection/tests/interaction_projection_test.rs
similarity index 100%
rename from crates/neomacs-display-protocol/src/interaction_projection/tests/mod.rs
rename to crates/neomacs-display-protocol/src/interaction_projection/tests/interaction_projection_test.rs
diff --git a/crates/neomacs-display-protocol/src/motion_spec.rs b/crates/neomacs-display-protocol/src/motion_spec.rs
index 4906f76553..be9fd2a614 100644
--- a/crates/neomacs-display-protocol/src/motion_spec.rs
+++ b/crates/neomacs-display-protocol/src/motion_spec.rs
@@ -413,4 +413,5 @@ impl MotionSpec {
 }
 
 #[cfg(test)]
+#[path = "motion_spec/tests/motion_spec_test.rs"]
 mod tests;
diff --git a/crates/neomacs-display-protocol/src/motion_spec/tests/mod.rs b/crates/neomacs-display-protocol/src/motion_spec/tests/motion_spec_test.rs
similarity index 100%
rename from crates/neomacs-display-protocol/src/motion_spec/tests/mod.rs
rename to crates/neomacs-display-protocol/src/motion_spec/tests/motion_spec_test.rs
diff --git a/crates/neomacs-display-protocol/src/popup_placement.rs b/crates/neomacs-display-protocol/src/popup_placement.rs
index f89d8d6de0..d34ca712d3 100644
--- a/crates/neomacs-display-protocol/src/popup_placement.rs
+++ b/crates/neomacs-display-protocol/src/popup_placement.rs
@@ -185,4 +185,5 @@ fn shift_into_viewport(origin: Point, popup: Size, viewport: Rect, padding: f32)
 }
 
 #[cfg(test)]
+#[path = "popup_placement/tests/popup_placement_test.rs"]
 mod tests;
diff --git a/crates/neomacs-display-protocol/src/popup_placement/tests/mod.rs b/crates/neomacs-display-protocol/src/popup_placement/tests/popup_placement_test.rs
similarity index 100%
rename from crates/neomacs-display-protocol/src/popup_placement/tests/mod.rs
rename to crates/neomacs-display-protocol/src/popup_placement/tests/popup_placement_test.rs
diff --git a/crates/neomacs-display-protocol/src/present_mapping.rs b/crates/neomacs-display-protocol/src/present_mapping.rs
index 91858299b9..e90b5ffa40 100644
--- a/crates/neomacs-display-protocol/src/present_mapping.rs
+++ b/crates/neomacs-display-protocol/src/present_mapping.rs
@@ -354,4 +354,5 @@ impl PresentMapping {
 }
 
 #[cfg(test)]
+#[path = "present_mapping/tests/present_mapping_test.rs"]
 mod tests;
diff --git a/crates/neomacs-display-protocol/src/present_mapping/tests/mod.rs b/crates/neomacs-display-protocol/src/present_mapping/tests/present_mapping_test.rs
similarity index 100%
rename from crates/neomacs-display-protocol/src/present_mapping/tests/mod.rs
rename to crates/neomacs-display-protocol/src/present_mapping/tests/present_mapping_test.rs
diff --git a/crates/neomacs-display-protocol/src/presentation_origin.rs b/crates/neomacs-display-protocol/src/presentation_origin.rs
index 08adee05b8..1702398542 100644
--- a/crates/neomacs-display-protocol/src/presentation_origin.rs
+++ b/crates/neomacs-display-protocol/src/presentation_origin.rs
@@ -151,4 +151,5 @@ impl PresentationOrigin {
 }
 
 #[cfg(test)]
+#[path = "presentation_origin/tests/presentation_origin_test.rs"]
 mod tests;
diff --git a/crates/neomacs-display-protocol/src/presentation_origin/tests/mod.rs b/crates/neomacs-display-protocol/src/presentation_origin/tests/presentation_origin_test.rs
similarity index 100%
rename from crates/neomacs-display-protocol/src/presentation_origin/tests/mod.rs
rename to crates/neomacs-display-protocol/src/presentation_origin/tests/presentation_origin_test.rs
diff --git a/crates/neomacs-display-protocol/src/presented_frame.rs b/crates/neomacs-display-protocol/src/presented_frame.rs
index 3c0a5b71d2..9ffc0a0300 100644
--- a/crates/neomacs-display-protocol/src/presented_frame.rs
+++ b/crates/neomacs-display-protocol/src/presented_frame.rs
@@ -257,4 +257,5 @@ impl PresentedFrameScene {
 }
 
 #[cfg(test)]
+#[path = "presented_frame/tests/presented_frame_test.rs"]
 mod tests;
diff --git a/crates/neomacs-display-protocol/src/presented_frame/tests/mod.rs b/crates/neomacs-display-protocol/src/presented_frame/tests/presented_frame_test.rs
similarity index 100%
rename from crates/neomacs-display-protocol/src/presented_frame/tests/mod.rs
rename to crates/neomacs-display-protocol/src/presented_frame/tests/presented_frame_test.rs
diff --git a/crates/neomacs-display-protocol/src/presented_pointer.rs b/crates/neomacs-display-protocol/src/presented_pointer.rs
index e78561ce81..0ec342c8e3 100644
--- a/crates/neomacs-display-protocol/src/presented_pointer.rs
+++ b/crates/neomacs-display-protocol/src/presented_pointer.rs
@@ -2617,6 +2617,7 @@ fn rect_has_valid_geometry(rect: FrameRect) -> bool {
 mod scroll;
 
 #[cfg(test)]
+#[path = "presented_pointer/tests/presented_pointer_test.rs"]
 mod tests;
 
 #[cfg(test)]
diff --git a/crates/neomacs-display-protocol/src/presented_pointer/scroll.rs b/crates/neomacs-display-protocol/src/presented_pointer/scroll.rs
index 5fdcfc9539..a0c521bad8 100644
--- a/crates/neomacs-display-protocol/src/presented_pointer/scroll.rs
+++ b/crates/neomacs-display-protocol/src/presented_pointer/scroll.rs
@@ -135,78 +135,5 @@ impl PresentedPointerSourceMap {
 }
 
 #[cfg(test)]
-mod tests {
-    use super::*;
-    fn source(window: i64, y: f32) -> PresentedPointerSourceMap {
-        let window = DisplayWindowId::new(window);
-        let bounds = FrameRect::new(10.0, y, 20.0, 10.0).unwrap();
-        let mode = PointerDrawMode::Face(FaceId::new(1));
-        PresentedPointerSourceMap::new(
-            vec![PresentedPointerRegion::new_owned(
-                PresentedRegionId::new(Some(window), PresentedRegionKind::TextBody),
-                bounds,
-                None,
-                Some(PointerAppearanceId::try_from(0usize).unwrap()),
-            )],
-            vec![PresentedPointerSourceAppearance::new(
-                vec![PresentedSourcePaintSpan::new(
-                    PresentedPrimitiveKind::Glyph,
-                    crate::GlyphRowRole::Text,
-                    DisplaySlotId {
-                        window_id: window,
-                        row: 1,
-                        col: 0,
-                    },
-                    bounds,
-                )],
-                mode,
-                mode,
-            )],
-        )
-    }
-
-    #[test]
-    fn scroll_pointer_replacement_preserves_other_panes_without_accumulating_history() {
-        let window = DisplayWindowId::new(1);
-        let mut original = source(1, 10.0);
-        let other = source(2, 30.0);
-        original.append(other.clone()).unwrap();
-        let coverage = source(1, 20.0);
-        let viewport = Rect::new(10.0, 10.0, 30.0, 20.0);
-        let mut projected = original;
-        for offset in [15.5, 10.0, 0.0, 15.5].into_iter().cycle().take(100) {
-            projected = projected
-                .replace_scrolled_body(window, &coverage, viewport, offset)
-                .unwrap();
-            assert_eq!(projected.regions.len(), 2);
-            assert_eq!(projected.appearances.len(), 2);
-            let unchanged = &projected.regions[0];
-            assert_eq!(unchanged.owner, other.regions[0].owner);
-            assert_eq!(unchanged.bounds, other.regions[0].bounds);
-            assert_eq!(projected.appearances[0], other.appearances[0]);
-            let moved = &projected.regions[1];
-            assert_eq!(moved.bounds.y(), (20.0 - offset).max(10.0));
-            assert_eq!(moved.bounds.bottom(), (30.0 - offset).min(30.0));
-            assert_eq!(projected.appearances[1].paint_spans[0].clip, moved.bounds);
-        }
-    }
-
-    #[test]
-    fn scroll_pointer_transport_rejects_foreign_or_evaluator_owned_regions() {
-        let bounds = FrameRect::new(0.0, 0.0, 100.0, 100.0).unwrap();
-        let mut map = source(1, 10.0);
-        assert!(
-            map.validate_scroll_source(DisplayWindowId::new(1), bounds)
-                .is_ok()
-        );
-        assert!(
-            map.validate_scroll_source(DisplayWindowId::new(2), bounds)
-                .is_err()
-        );
-        map.regions[0].interaction = Some(InteractionId::new(1));
-        assert!(
-            map.validate_scroll_source(DisplayWindowId::new(1), bounds)
-                .is_err()
-        );
-    }
-}
+#[path = "tests/scroll_test.rs"]
+mod tests;
diff --git a/crates/neomacs-display-protocol/src/presented_pointer/tests/mod.rs b/crates/neomacs-display-protocol/src/presented_pointer/tests/presented_pointer_test.rs
similarity index 100%
rename from crates/neomacs-display-protocol/src/presented_pointer/tests/mod.rs
rename to crates/neomacs-display-protocol/src/presented_pointer/tests/presented_pointer_test.rs
diff --git a/crates/neomacs-display-protocol/src/presented_pointer/tests/scroll_test.rs b/crates/neomacs-display-protocol/src/presented_pointer/tests/scroll_test.rs
new file mode 100644
index 0000000000..f4360577a1
--- /dev/null
+++ b/crates/neomacs-display-protocol/src/presented_pointer/tests/scroll_test.rs
@@ -0,0 +1,73 @@
+use super::*;
+fn source(window: i64, y: f32) -> PresentedPointerSourceMap {
+    let window = DisplayWindowId::new(window);
+    let bounds = FrameRect::new(10.0, y, 20.0, 10.0).unwrap();
+    let mode = PointerDrawMode::Face(FaceId::new(1));
+    PresentedPointerSourceMap::new(
+        vec![PresentedPointerRegion::new_owned(
+            PresentedRegionId::new(Some(window), PresentedRegionKind::TextBody),
+            bounds,
+            None,
+            Some(PointerAppearanceId::try_from(0usize).unwrap()),
+        )],
+        vec![PresentedPointerSourceAppearance::new(
+            vec![PresentedSourcePaintSpan::new(
+                PresentedPrimitiveKind::Glyph,
+                crate::GlyphRowRole::Text,
+                DisplaySlotId {
+                    window_id: window,
+                    row: 1,
+                    col: 0,
+                },
+                bounds,
+            )],
+            mode,
+            mode,
+        )],
+    )
+}
+
+#[test]
+fn scroll_pointer_replacement_preserves_other_panes_without_accumulating_history() {
+    let window = DisplayWindowId::new(1);
+    let mut original = source(1, 10.0);
+    let other = source(2, 30.0);
+    original.append(other.clone()).unwrap();
+    let coverage = source(1, 20.0);
+    let viewport = Rect::new(10.0, 10.0, 30.0, 20.0);
+    let mut projected = original;
+    for offset in [15.5, 10.0, 0.0, 15.5].into_iter().cycle().take(100) {
+        projected = projected
+            .replace_scrolled_body(window, &coverage, viewport, offset)
+            .unwrap();
+        assert_eq!(projected.regions.len(), 2);
+        assert_eq!(projected.appearances.len(), 2);
+        let unchanged = &projected.regions[0];
+        assert_eq!(unchanged.owner, other.regions[0].owner);
+        assert_eq!(unchanged.bounds, other.regions[0].bounds);
+        assert_eq!(projected.appearances[0], other.appearances[0]);
+        let moved = &projected.regions[1];
+        assert_eq!(moved.bounds.y(), (20.0 - offset).max(10.0));
+        assert_eq!(moved.bounds.bottom(), (30.0 - offset).min(30.0));
+        assert_eq!(projected.appearances[1].paint_spans[0].clip, moved.bounds);
+    }
+}
+
+#[test]
+fn scroll_pointer_transport_rejects_foreign_or_evaluator_owned_regions() {
+    let bounds = FrameRect::new(0.0, 0.0, 100.0, 100.0).unwrap();
+    let mut map = source(1, 10.0);
+    assert!(
+        map.validate_scroll_source(DisplayWindowId::new(1), bounds)
+            .is_ok()
+    );
+    assert!(
+        map.validate_scroll_source(DisplayWindowId::new(2), bounds)
+            .is_err()
+    );
+    map.regions[0].interaction = Some(InteractionId::new(1));
+    assert!(
+        map.validate_scroll_source(DisplayWindowId::new(1), bounds)
+            .is_err()
+    );
+}
diff --git a/crates/neomacs-display-protocol/src/scene.rs b/crates/neomacs-display-protocol/src/scene.rs
index 3f27be4117..9575fb21e8 100644
--- a/crates/neomacs-display-protocol/src/scene.rs
+++ b/crates/neomacs-display-protocol/src/scene.rs
@@ -473,4 +473,5 @@ impl Scene {
 }
 
 #[cfg(test)]
+#[path = "scene/tests/scene_test.rs"]
 mod tests;
diff --git a/crates/neomacs-display-protocol/src/scene/tests/mod.rs b/crates/neomacs-display-protocol/src/scene/tests/scene_test.rs
similarity index 100%
rename from crates/neomacs-display-protocol/src/scene/tests/mod.rs
rename to crates/neomacs-display-protocol/src/scene/tests/scene_test.rs
diff --git a/crates/neomacs-display-protocol/src/scroll_animation.rs b/crates/neomacs-display-protocol/src/scroll_animation.rs
index 026f93923b..058d46f458 100644
--- a/crates/neomacs-display-protocol/src/scroll_animation.rs
+++ b/crates/neomacs-display-protocol/src/scroll_animation.rs
@@ -356,4 +356,5 @@ impl TransitionEasing {
 // ─── Tests ──────────────────────────────────────────────────────────────
 
 #[cfg(test)]
+#[path = "scroll_animation/tests/scroll_animation_test.rs"]
 mod tests;
diff --git a/crates/neomacs-display-protocol/src/scroll_animation/tests/mod.rs b/crates/neomacs-display-protocol/src/scroll_animation/tests/scroll_animation_test.rs
similarity index 100%
rename from crates/neomacs-display-protocol/src/scroll_animation/tests/mod.rs
rename to crates/neomacs-display-protocol/src/scroll_animation/tests/scroll_animation_test.rs
diff --git a/crates/neomacs-display-protocol/src/sealed_frame_presentation.rs b/crates/neomacs-display-protocol/src/sealed_frame_presentation.rs
index d46dfde936..5140fbe050 100644
--- a/crates/neomacs-display-protocol/src/sealed_frame_presentation.rs
+++ b/crates/neomacs-display-protocol/src/sealed_frame_presentation.rs
@@ -107,4 +107,5 @@ impl Deref for SealedFramePresentation {
 }
 
 #[cfg(test)]
+#[path = "sealed_frame_presentation/tests/sealed_frame_presentation_test.rs"]
 mod tests;
diff --git a/crates/neomacs-display-protocol/src/sealed_frame_presentation/tests/mod.rs b/crates/neomacs-display-protocol/src/sealed_frame_presentation/tests/sealed_frame_presentation_test.rs
similarity index 100%
rename from crates/neomacs-display-protocol/src/sealed_frame_presentation/tests/mod.rs
rename to crates/neomacs-display-protocol/src/sealed_frame_presentation/tests/sealed_frame_presentation_test.rs
diff --git a/crates/neomacs-display-protocol/src/snapshot_text.rs b/crates/neomacs-display-protocol/src/snapshot_text.rs
index 3f4abf787c..560e967add 100644
--- a/crates/neomacs-display-protocol/src/snapshot_text.rs
+++ b/crates/neomacs-display-protocol/src/snapshot_text.rs
@@ -290,4 +290,5 @@ fn hex(color: Color) -> String {
 }
 
 #[cfg(test)]
+#[path = "snapshot_text/tests/snapshot_text_test.rs"]
 mod tests;
diff --git a/crates/neomacs-display-protocol/src/snapshot_text/tests/mod.rs b/crates/neomacs-display-protocol/src/snapshot_text/tests/snapshot_text_test.rs
similarity index 100%
rename from crates/neomacs-display-protocol/src/snapshot_text/tests/mod.rs
rename to crates/neomacs-display-protocol/src/snapshot_text/tests/snapshot_text_test.rs
diff --git a/crates/neomacs-display-protocol/src/terminal_color.rs b/crates/neomacs-display-protocol/src/terminal_color.rs
index b6e9583f63..5aff9db0dd 100644
--- a/crates/neomacs-display-protocol/src/terminal_color.rs
+++ b/crates/neomacs-display-protocol/src/terminal_color.rs
@@ -93,4 +93,5 @@ impl TerminalColor {
 }
 
 #[cfg(test)]
+#[path = "terminal_color/tests/terminal_color_test.rs"]
 mod tests;
diff --git a/crates/neomacs-display-protocol/src/terminal_color/tests/mod.rs b/crates/neomacs-display-protocol/src/terminal_color/tests/terminal_color_test.rs
similarity index 100%
rename from crates/neomacs-display-protocol/src/terminal_color/tests/mod.rs
rename to crates/neomacs-display-protocol/src/terminal_color/tests/terminal_color_test.rs
diff --git a/crates/neomacs-display-protocol/src/tests/input_latency_test.rs b/crates/neomacs-display-protocol/src/tests/input_latency_test.rs
new file mode 100644
index 0000000000..c836e4237e
--- /dev/null
+++ b/crates/neomacs-display-protocol/src/tests/input_latency_test.rs
@@ -0,0 +1,194 @@
+use super::*;
+fn viewport(start: usize) -> Vec<ScrollViewport> {
+    vec![ScrollViewport {
+        window: 1,
+        buffer: 1,
+        start,
+        hscroll: 0,
+        vscroll: 0,
+    }]
+}
+fn time(nanoseconds: u64) -> PlatformTimestamp {
+    PlatformTimestamp {
+        clock_id: 1,
+        nanoseconds,
+    }
+}
+#[test]
+fn output_confirmation_preserves_its_measurement_kind_and_uncertainty() {
+    let mut measurements = Measurements::default();
+    let token = measurements.receive(7, "precise", time(100));
+    let kind = PresentationObservation::FirstPixelOutput { uncertainty_ns: 70 };
+    measurements.start(&[token], |_| viewport(1));
+    measurements.projected_requested(&[token], 7, 41);
+    measurements.projected_observed(7, 41, time(150), kind);
+    measurements.seal(7, PresentationId::new(2), &viewport(2));
+    let samples = measurements.observed(PresentationId::new(2), time(300), kind);
+    assert_eq!(samples[0]["observation"], "native-first-pixel-output");
+    assert_eq!(
+        samples[0]["projected_observation"],
+        "native-first-pixel-output"
+    );
+    assert_eq!(samples[0]["timestamp_uncertainty_ns"], 70);
+    assert_eq!(samples[0]["projected_timestamp_uncertainty_ns"], 70);
+    assert_eq!(samples[0]["input_to_present_ns"], 200);
+}
+
+#[test]
+fn projected_latency_requires_exact_native_submission_and_keeps_authoritative_completion() {
+    let mut measurements = Measurements::default();
+    let token = measurements.receive(7, "precise", time(100));
+    measurements.projected_requested(&[token], 7, 41);
+    measurements.projected_confirmed(8, 41, time(110));
+    measurements.projected_confirmed(7, 40, time(120));
+    measurements.projected_confirmed(
+        7,
+        41,
+        PlatformTimestamp {
+            clock_id: 2,
+            nanoseconds: 130,
+        },
+    );
+    assert!(measurements.pending[0].projected.is_none());
+    measurements.projected_confirmed(7, 41, time(150));
+    measurements.projected_confirmed(7, 41, time(160));
+    assert!(
+        measurements
+            .confirmed(PresentationId::new(1), time(170))
+            .is_empty()
+    );
+    measurements.start(&[token], |_| viewport(1));
+    measurements.seal(7, PresentationId::new(2), &viewport(2));
+    let samples = measurements.confirmed(PresentationId::new(2), time(300));
+    assert_eq!(samples.len(), 1);
+    assert_eq!(samples[0]["input_to_projected_present_ns"], 50);
+    assert_eq!(samples[0]["projected_submission"], 41);
+    assert_eq!(samples[0]["input_to_present_ns"], 200);
+    assert!(measurements.pending.is_empty());
+}
+
+#[test]
+fn queued_input_and_other_frames_cannot_complete_a_latency_sample() {
+    let mut measurements = Measurements::default();
+    let token = measurements.receive(7, "wheel", time(100));
+    measurements.seal(7, PresentationId::new(1), &viewport(2));
+    assert!(
+        measurements
+            .confirmed(PresentationId::new(1), time(200))
+            .is_empty()
+    );
+    measurements.start(&[token], |_| viewport(1));
+    measurements.seal(8, PresentationId::new(2), &viewport(2));
+    assert!(
+        measurements
+            .confirmed(PresentationId::new(2), time(300))
+            .is_empty()
+    );
+    measurements.seal(7, PresentationId::new(3), &viewport(2));
+    let samples = measurements.confirmed(PresentationId::new(3), time(400));
+    assert_eq!(samples[0]["input_to_present_ns"], 300);
+    assert!(
+        measurements
+            .confirmed(PresentationId::new(3), time(500))
+            .is_empty()
+    );
+}
+#[test]
+fn superseded_layout_keeps_original_input_time_and_bounds_memory() {
+    let mut measurements = Measurements::default();
+    for _ in 0..MAX_PENDING + 1 {
+        measurements.receive(7, "precise", time(100));
+    }
+    assert_eq!(measurements.pending.len(), MAX_PENDING);
+    assert_eq!(measurements.dropped, 1);
+    let token = measurements.pending.back().unwrap().token;
+    measurements.start(&[token], |_| viewport(1));
+    for id in 1..=20 {
+        measurements.seal(7, PresentationId::new(id), &viewport(2));
+    }
+    assert_eq!(
+        measurements.pending.back().unwrap().layouts.len(),
+        MAX_PRESENTATIONS
+    );
+    assert!(
+        measurements
+            .confirmed(PresentationId::new(1), time(200))
+            .is_empty()
+    );
+    let samples = measurements.confirmed(PresentationId::new(20), time(500));
+    assert_eq!(samples[0]["input_to_present_ns"], 400);
+    assert_eq!(samples[0]["evicted_inputs"], 1);
+}
+#[test]
+fn command_preflight_cannot_ack_before_the_viewport_changes() {
+    let mut measurements = Measurements::default();
+    let token = measurements.receive(7, "precise", time(100));
+    measurements.start(&[token], |_| viewport(1));
+    measurements.seal(7, PresentationId::new(1), &viewport(1));
+    assert!(
+        measurements
+            .confirmed(PresentationId::new(1), time(200))
+            .is_empty()
+    );
+    measurements.seal(7, PresentationId::new(2), &viewport(2));
+    assert_eq!(
+        measurements
+            .confirmed(PresentationId::new(2), time(300))
+            .len(),
+        1
+    );
+    let token = measurements.receive(7, "page", time(400));
+    measurements.start(&[token], |_| viewport(2));
+    measurements.cancel(&[token]);
+    measurements.seal(7, PresentationId::new(3), &viewport(3));
+    assert!(
+        measurements
+            .confirmed(PresentationId::new(3), time(500))
+            .is_empty()
+    );
+}
+
+#[test]
+fn completed_no_op_cannot_be_credited_to_a_later_command() {
+    let mut measurements = Measurements::default();
+    let token = measurements.receive(7, "page", time(100));
+    measurements.start(&[token], |_| viewport(1));
+    measurements.finish(&[token], |_| viewport(1));
+    measurements.seal(7, PresentationId::new(2), &viewport(2));
+    assert!(
+        measurements
+            .confirmed(PresentationId::new(2), time(300))
+            .is_empty()
+    );
+}
+
+#[test]
+fn completed_scrolls_can_be_coalesced_back_to_the_original_viewport() {
+    let mut measurements = Measurements::default();
+    let token = measurements.receive(7, "precise", time(100));
+    measurements.start(&[token], |_| viewport(1));
+    measurements.finish(&[token], |_| viewport(2));
+    measurements.seal(7, PresentationId::new(2), &viewport(1));
+    assert_eq!(
+        measurements
+            .confirmed(PresentationId::new(2), time(300))
+            .len(),
+        1
+    );
+}
+
+#[test]
+fn unrelated_clock_cannot_fabricate_latency() {
+    let mut measurements = Measurements::default();
+    let token = measurements.receive(7, "page", time(100));
+    measurements.start(&[token], |_| viewport(1));
+    measurements.seal(7, PresentationId::new(1), &viewport(2));
+    let samples = measurements.confirmed(
+        PresentationId::new(1),
+        PlatformTimestamp {
+            clock_id: 2,
+            nanoseconds: 200,
+        },
+    );
+    assert!(samples[0]["input_to_present_ns"].is_null());
+}
diff --git a/crates/neomacs-display-protocol/src/tests/input_progress_test.rs b/crates/neomacs-display-protocol/src/tests/input_progress_test.rs
new file mode 100644
index 0000000000..0ad219ebe1
--- /dev/null
+++ b/crates/neomacs-display-protocol/src/tests/input_progress_test.rs
@@ -0,0 +1,103 @@
+use super::*;
+
+#[test]
+fn preview_observation_belongs_only_to_innermost_command() {
+    let stream = InputStream::default();
+    let outer_input = stream.issue().unwrap();
+    let receipt = outer_input.receipt();
+    let mut progress = InputProgress::default();
+    progress.consumed(outer_input);
+    assert!(progress.current_command_receipts().is_empty());
+    let outer = progress.begin_command();
+    assert!(progress.current_command_receipts()[0].same_input(&receipt));
+    let inner = progress.begin_command();
+    assert!(progress.current_command_receipts().is_empty());
+    drop(inner);
+    assert_eq!(progress.current_command_receipts().len(), 1);
+    drop(outer);
+    assert!(progress.current_command_receipts().is_empty());
+    assert!(receipt.acknowledged_by(&progress.checkpoint()));
+}
+
+#[test]
+fn old_frame_cannot_acknowledge_a_later_command_completion() {
+    let stream = InputStream::default();
+    let receipt = stream.issue().unwrap();
+    let mut progress = InputProgress::default();
+    progress.consumed(receipt.clone());
+    let command = progress.begin_command();
+    let old_frame = progress.checkpoint();
+    assert!(!receipt.acknowledged_by(&old_frame));
+    drop(command);
+    assert!(!receipt.acknowledged_by(&old_frame));
+    assert!(receipt.acknowledged_by(&progress.checkpoint()));
+}
+
+#[test]
+fn nested_completion_waits_for_the_outer_command() {
+    let stream = InputStream::default();
+    let outer = stream.issue().unwrap();
+    let inner = stream.issue().unwrap();
+    let mut progress = InputProgress::default();
+    progress.consumed(outer.clone());
+    let outer_command = progress.begin_command();
+    let inner_command = progress.begin_command();
+    progress.consumed(inner.clone());
+    drop(inner_command);
+    assert!(!inner.acknowledged_by(&progress.checkpoint()));
+    drop(outer_command);
+    assert!(inner.acknowledged_by(&progress.checkpoint()));
+}
+
+#[test]
+fn completion_on_unwind_and_stream_identity_are_independent() {
+    let stream = InputStream::default();
+    let receipt = stream.issue().unwrap();
+    let foreign = InputStream::default().issue().unwrap();
+    let mut progress = InputProgress::default();
+    progress.consumed(receipt.clone());
+    let _ = std::panic::catch_unwind(std::panic::AssertUnwindSafe(|| {
+        let _command = progress.begin_command();
+        panic!("command aborted");
+    }));
+    assert!(receipt.acknowledged_by(&progress.checkpoint()));
+    assert!(!foreign.acknowledged_by(&progress.checkpoint()));
+}
+
+#[test]
+fn discarding_delivery_cancels_even_while_the_compositor_keeps_a_receipt() {
+    let stream = InputStream::default();
+    let delivery = stream.issue().unwrap();
+    let observer = delivery.receipt();
+    let queued_copy = delivery.clone();
+    drop(delivery);
+    assert!(!observer.cancelled());
+    drop(queued_copy);
+    assert!(observer.cancelled());
+    assert!(observer.acknowledged_by(&[stream.checkpoint()]));
+}
+
+#[test]
+fn completed_delivery_does_not_later_turn_into_cancellation() {
+    let stream = InputStream::default();
+    let delivery = stream.issue().unwrap();
+    let observer = delivery.receipt();
+    let mut progress = InputProgress::default();
+    let command = progress.begin_command();
+    progress.consumed(delivery);
+    assert!(!observer.acknowledged_by(&progress.checkpoint()));
+    drop(command);
+    assert!(observer.acknowledged_by(&progress.checkpoint()));
+    assert!(!observer.cancelled());
+}
+
+#[test]
+fn pending_receipts_are_bounded_and_capacity_returns_after_completion() {
+    let stream = InputStream::default();
+    let receipts: Vec<_> = (0..MAX_PENDING).map(|_| stream.issue().unwrap()).collect();
+    assert!(stream.issue().is_none());
+    for receipt in receipts {
+        receipt.complete();
+    }
+    assert!(stream.issue().is_some());
+}
diff --git a/crates/neomacs-display-protocol/src/toolbar_icon.rs b/crates/neomacs-display-protocol/src/toolbar_icon.rs
index c97bf7dc0f..f0ff04f66e 100644
--- a/crates/neomacs-display-protocol/src/toolbar_icon.rs
+++ b/crates/neomacs-display-protocol/src/toolbar_icon.rs
@@ -65,4 +65,5 @@ impl ToolBarIconKey {
 }
 
 #[cfg(test)]
+#[path = "toolbar_icon/tests/toolbar_icon_test.rs"]
 mod tests;
diff --git a/crates/neomacs-display-protocol/src/toolbar_icon/tests/mod.rs b/crates/neomacs-display-protocol/src/toolbar_icon/tests/toolbar_icon_test.rs
similarity index 100%
rename from crates/neomacs-display-protocol/src/toolbar_icon/tests/mod.rs
rename to crates/neomacs-display-protocol/src/toolbar_icon/tests/toolbar_icon_test.rs
diff --git a/crates/neomacs-display-protocol/src/tooltip/lifetime.rs b/crates/neomacs-display-protocol/src/tooltip/lifetime.rs
index f34d5b4291..321b4704de 100644
--- a/crates/neomacs-display-protocol/src/tooltip/lifetime.rs
+++ b/crates/neomacs-display-protocol/src/tooltip/lifetime.rs
@@ -115,4 +115,5 @@ impl TooltipClient {
 }
 
 #[cfg(test)]
+#[path = "lifetime/tests/lifetime_test.rs"]
 mod tests;
diff --git a/crates/neomacs-display-protocol/src/tooltip/lifetime/tests/mod.rs b/crates/neomacs-display-protocol/src/tooltip/lifetime/tests/lifetime_test.rs
similarity index 100%
rename from crates/neomacs-display-protocol/src/tooltip/lifetime/tests/mod.rs
rename to crates/neomacs-display-protocol/src/tooltip/lifetime/tests/lifetime_test.rs
diff --git a/crates/neomacs-display-protocol/src/transition_policy.rs b/crates/neomacs-display-protocol/src/transition_policy.rs
index 5a8bd94006..eb9c601bba 100644
--- a/crates/neomacs-display-protocol/src/transition_policy.rs
+++ b/crates/neomacs-display-protocol/src/transition_policy.rs
@@ -439,4 +439,5 @@ impl From<&VisualConfig> for TransitionPolicy {
 }
 
 #[cfg(test)]
+#[path = "transition_policy/tests/transition_policy_test.rs"]
 mod tests;
diff --git a/crates/neomacs-display-protocol/src/transition_policy/tests/mod.rs b/crates/neomacs-display-protocol/src/transition_policy/tests/transition_policy_test.rs
similarity index 100%
rename from crates/neomacs-display-protocol/src/transition_policy/tests/mod.rs
rename to crates/neomacs-display-protocol/src/transition_policy/tests/transition_policy_test.rs
diff --git a/crates/neomacs-display-protocol/src/tty_palette.rs b/crates/neomacs-display-protocol/src/tty_palette.rs
index 003871ada4..60b770c002 100644
--- a/crates/neomacs-display-protocol/src/tty_palette.rs
+++ b/crates/neomacs-display-protocol/src/tty_palette.rs
@@ -165,4 +165,5 @@ fn off_gray_diagonal(r: u8, g: u8, b: u8) -> f64 {
 }
 
 #[cfg(test)]
+#[path = "tty_palette/tests/tty_palette_test.rs"]
 mod tests;
diff --git a/crates/neomacs-display-protocol/src/tty_palette/tests/mod.rs b/crates/neomacs-display-protocol/src/tty_palette/tests/tty_palette_test.rs
similarity index 100%
rename from crates/neomacs-display-protocol/src/tty_palette/tests/mod.rs
rename to crates/neomacs-display-protocol/src/tty_palette/tests/tty_palette_test.rs
diff --git a/crates/neomacs-display-protocol/src/types.rs b/crates/neomacs-display-protocol/src/types.rs
index 76f4e6ff66..4bd418bf1b 100644
--- a/crates/neomacs-display-protocol/src/types.rs
+++ b/crates/neomacs-display-protocol/src/types.rs
@@ -837,4 +837,5 @@ impl Default for Transform {
 }
 
 #[cfg(test)]
+#[path = "types/tests/types_test.rs"]
 mod tests;
diff --git a/crates/neomacs-display-protocol/src/types/tests/mod.rs b/crates/neomacs-display-protocol/src/types/tests/types_test.rs
similarity index 100%
rename from crates/neomacs-display-protocol/src/types/tests/mod.rs
rename to crates/neomacs-display-protocol/src/types/tests/types_test.rs
diff --git a/crates/neomacs-display-protocol/src/window_animation.rs b/crates/neomacs-display-protocol/src/window_animation.rs
index 4816e17bef..0c4b7caaf9 100644
--- a/crates/neomacs-display-protocol/src/window_animation.rs
+++ b/crates/neomacs-display-protocol/src/window_animation.rs
@@ -283,6 +283,7 @@ pub fn default_window_movement() -> WindowAnimation {
 }
 
 #[cfg(test)]
+#[path = "window_animation/tests/window_animation_test.rs"]
 mod tests;
 
 crate::effect_schema!(WindowAnimation {
diff --git a/crates/neomacs-display-protocol/src/window_animation/tests/mod.rs b/crates/neomacs-display-protocol/src/window_animation/tests/window_animation_test.rs
similarity index 100%
rename from crates/neomacs-display-protocol/src/window_animation/tests/mod.rs
rename to crates/neomacs-display-protocol/src/window_animation/tests/window_animation_test.rs
diff --git a/crates/neomacs-display-protocol/src/window_chrome.rs b/crates/neomacs-display-protocol/src/window_chrome.rs
index 76210ba156..125fa09394 100644
--- a/crates/neomacs-display-protocol/src/window_chrome.rs
+++ b/crates/neomacs-display-protocol/src/window_chrome.rs
@@ -41,4 +41,5 @@ impl WindowChromePolicy {
 }
 
 #[cfg(test)]
+#[path = "window_chrome/tests/window_chrome_test.rs"]
 mod tests;
diff --git a/crates/neomacs-display-protocol/src/window_chrome/tests/mod.rs b/crates/neomacs-display-protocol/src/window_chrome/tests/window_chrome_test.rs
similarity index 100%
rename from crates/neomacs-display-protocol/src/window_chrome/tests/mod.rs
rename to crates/neomacs-display-protocol/src/window_chrome/tests/window_chrome_test.rs
diff --git a/crates/neomacs-display-protocol/src/xterm_palette.rs b/crates/neomacs-display-protocol/src/xterm_palette.rs
index 8e8f8a6b22..9fc834877c 100644
--- a/crates/neomacs-display-protocol/src/xterm_palette.rs
+++ b/crates/neomacs-display-protocol/src/xterm_palette.rs
@@ -45,4 +45,5 @@ pub const fn xterm_256_rgb(index: u8) -> (u8, u8, u8) {
 }
 
 #[cfg(test)]
+#[path = "xterm_palette/tests/xterm_palette_test.rs"]
 mod tests;
diff --git a/crates/neomacs-display-protocol/src/xterm_palette/tests/mod.rs b/crates/neomacs-display-protocol/src/xterm_palette/tests/xterm_palette_test.rs
similarity index 100%
rename from crates/neomacs-display-protocol/src/xterm_palette/tests/mod.rs
rename to crates/neomacs-display-protocol/src/xterm_palette/tests/xterm_palette_test.rs
diff --git a/crates/neomacs-display-protocol/src/xwidget_extent.rs b/crates/neomacs-display-protocol/src/xwidget_extent.rs
index d16f119f95..43923ef7f8 100644
--- a/crates/neomacs-display-protocol/src/xwidget_extent.rs
+++ b/crates/neomacs-display-protocol/src/xwidget_extent.rs
@@ -333,4 +333,5 @@ impl XwidgetTextureCoordinates {
 }
 
 #[cfg(test)]
+#[path = "xwidget_extent/tests/xwidget_extent_test.rs"]
 mod tests;
diff --git a/crates/neomacs-display-protocol/src/xwidget_extent/tests/mod.rs b/crates/neomacs-display-protocol/src/xwidget_extent/tests/xwidget_extent_test.rs
similarity index 100%
rename from crates/neomacs-display-protocol/src/xwidget_extent/tests/mod.rs
rename to crates/neomacs-display-protocol/src/xwidget_extent/tests/xwidget_extent_test.rs
diff --git a/crates/neomacs-display-runtime/src/backend/tty/rif.rs b/crates/neomacs-display-runtime/src/backend/tty/rif.rs
index a7e6710bae..cb1e09bdf5 100644
--- a/crates/neomacs-display-runtime/src/backend/tty/rif.rs
+++ b/crates/neomacs-display-runtime/src/backend/tty/rif.rs
@@ -3409,6 +3409,7 @@ fn surface_tty_placeholder(width_cols: usize) -> String {
 }
 
 #[cfg(test)]
+#[path = "rif/tests/rif_test.rs"]
 mod tests;
 
 impl TtyRif {
diff --git a/crates/neomacs-display-runtime/src/backend/tty/rif/tests/mod.rs b/crates/neomacs-display-runtime/src/backend/tty/rif/tests/rif_test.rs
similarity index 100%
rename from crates/neomacs-display-runtime/src/backend/tty/rif/tests/mod.rs
rename to crates/neomacs-display-runtime/src/backend/tty/rif/tests/rif_test.rs
diff --git a/crates/neomacs-display-runtime/src/backend/wgpu/animation.rs b/crates/neomacs-display-runtime/src/backend/wgpu/animation.rs
index 2938103fec..14a5468cba 100644
--- a/crates/neomacs-display-runtime/src/backend/wgpu/animation.rs
+++ b/crates/neomacs-display-runtime/src/backend/wgpu/animation.rs
@@ -222,4 +222,5 @@ impl Default for AnimationEngine {
 }
 
 #[cfg(test)]
+#[path = "animation/tests/animation_test.rs"]
 mod tests;
diff --git a/crates/neomacs-display-runtime/src/backend/wgpu/animation/tests/mod.rs b/crates/neomacs-display-runtime/src/backend/wgpu/animation/tests/animation_test.rs
similarity index 100%
rename from crates/neomacs-display-runtime/src/backend/wgpu/animation/tests/mod.rs
rename to crates/neomacs-display-runtime/src/backend/wgpu/animation/tests/animation_test.rs
diff --git a/crates/neomacs-display-runtime/src/backend/wgpu/drm_device.rs b/crates/neomacs-display-runtime/src/backend/wgpu/drm_device.rs
index 363995f6c6..7219fbb7a2 100644
--- a/crates/neomacs-display-runtime/src/backend/wgpu/drm_device.rs
+++ b/crates/neomacs-display-runtime/src/backend/wgpu/drm_device.rs
@@ -50,4 +50,5 @@ fn render_node_from_device_number_in(
 }
 
 #[cfg(test)]
+#[path = "drm_device/tests/drm_device_test.rs"]
 mod tests;
diff --git a/crates/neomacs-display-runtime/src/backend/wgpu/drm_device/tests/mod.rs b/crates/neomacs-display-runtime/src/backend/wgpu/drm_device/tests/drm_device_test.rs
similarity index 100%
rename from crates/neomacs-display-runtime/src/backend/wgpu/drm_device/tests/mod.rs
rename to crates/neomacs-display-runtime/src/backend/wgpu/drm_device/tests/drm_device_test.rs
diff --git a/crates/neomacs-display-runtime/src/backend/wgpu/events.rs b/crates/neomacs-display-runtime/src/backend/wgpu/events.rs
index b8a4bab6e2..13c545a589 100644
--- a/crates/neomacs-display-runtime/src/backend/wgpu/events.rs
+++ b/crates/neomacs-display-runtime/src/backend/wgpu/events.rs
@@ -108,4 +108,5 @@ impl Default for NeomacsInputEvent {
 }
 
 #[cfg(test)]
+#[path = "events/tests/events_test.rs"]
 mod tests;
diff --git a/crates/neomacs-display-runtime/src/backend/wgpu/events/tests/mod.rs b/crates/neomacs-display-runtime/src/backend/wgpu/events/tests/events_test.rs
similarity index 100%
rename from crates/neomacs-display-runtime/src/backend/wgpu/events/tests/mod.rs
rename to crates/neomacs-display-runtime/src/backend/wgpu/events/tests/events_test.rs
diff --git a/crates/neomacs-display-runtime/src/display_scale.rs b/crates/neomacs-display-runtime/src/display_scale.rs
index 12dbcd3e3c..879f6fca5b 100644
--- a/crates/neomacs-display-runtime/src/display_scale.rs
+++ b/crates/neomacs-display-runtime/src/display_scale.rs
@@ -232,4 +232,5 @@ fn query_x11_display() -> X11DisplayObservation {
 // Every test here drives the X11/Wayland probe, whose types exist only
 // on Linux; the module would not compile elsewhere.
 #[cfg(all(test, target_os = "linux"))]
+#[path = "display_scale/tests/display_scale_test.rs"]
 mod tests;
diff --git a/crates/neomacs-display-runtime/src/display_scale/tests/mod.rs b/crates/neomacs-display-runtime/src/display_scale/tests/display_scale_test.rs
similarity index 100%
rename from crates/neomacs-display-runtime/src/display_scale/tests/mod.rs
rename to crates/neomacs-display-runtime/src/display_scale/tests/display_scale_test.rs
diff --git a/crates/neomacs-display-runtime/src/macos_bundle_runtime.rs b/crates/neomacs-display-runtime/src/macos_bundle_runtime.rs
index a6562033d0..d7c2b79a2f 100644
--- a/crates/neomacs-display-runtime/src/macos_bundle_runtime.rs
+++ b/crates/neomacs-display-runtime/src/macos_bundle_runtime.rs
@@ -86,4 +86,5 @@ pub fn configure_before_threads() {
 pub fn configure_before_threads() {}
 
 #[cfg(test)]
+#[path = "macos_bundle_runtime/tests/macos_bundle_runtime_test.rs"]
 mod tests;
diff --git a/crates/neomacs-display-runtime/src/macos_bundle_runtime/tests/mod.rs b/crates/neomacs-display-runtime/src/macos_bundle_runtime/tests/macos_bundle_runtime_test.rs
similarity index 100%
rename from crates/neomacs-display-runtime/src/macos_bundle_runtime/tests/mod.rs
rename to crates/neomacs-display-runtime/src/macos_bundle_runtime/tests/macos_bundle_runtime_test.rs
diff --git a/crates/neomacs-display-runtime/src/menus/controller.rs b/crates/neomacs-display-runtime/src/menus/controller.rs
index d341614ee4..d5cf898044 100644
--- a/crates/neomacs-display-runtime/src/menus/controller.rs
+++ b/crates/neomacs-display-runtime/src/menus/controller.rs
@@ -602,4 +602,5 @@ impl Drop for MenuPresentation {
 }
 
 #[cfg(test)]
+#[path = "controller/tests/controller_test.rs"]
 mod tests;
diff --git a/crates/neomacs-display-runtime/src/menus/controller/tests/mod.rs b/crates/neomacs-display-runtime/src/menus/controller/tests/controller_test.rs
similarity index 100%
rename from crates/neomacs-display-runtime/src/menus/controller/tests/mod.rs
rename to crates/neomacs-display-runtime/src/menus/controller/tests/controller_test.rs
diff --git a/crates/neomacs-display-runtime/src/menus/help.rs b/crates/neomacs-display-runtime/src/menus/help.rs
index 3ef23a61a6..e0bc2c82f6 100644
--- a/crates/neomacs-display-runtime/src/menus/help.rs
+++ b/crates/neomacs-display-runtime/src/menus/help.rs
@@ -87,4 +87,5 @@ impl HoverHelp {
 }
 
 #[cfg(test)]
+#[path = "help/tests/help_test.rs"]
 mod tests;
diff --git a/crates/neomacs-display-runtime/src/menus/help/tests/mod.rs b/crates/neomacs-display-runtime/src/menus/help/tests/help_test.rs
similarity index 100%
rename from crates/neomacs-display-runtime/src/menus/help/tests/mod.rs
rename to crates/neomacs-display-runtime/src/menus/help/tests/help_test.rs
diff --git a/crates/neomacs-display-runtime/src/menus/session.rs b/crates/neomacs-display-runtime/src/menus/session.rs
index 1ec5897f5f..a5cd1fca0b 100644
--- a/crates/neomacs-display-runtime/src/menus/session.rs
+++ b/crates/neomacs-display-runtime/src/menus/session.rs
@@ -350,4 +350,5 @@ impl MenuSession {
 }
 
 #[cfg(test)]
+#[path = "session/tests/session_test.rs"]
 mod tests;
diff --git a/crates/neomacs-display-runtime/src/menus/session/tests/mod.rs b/crates/neomacs-display-runtime/src/menus/session/tests/session_test.rs
similarity index 100%
rename from crates/neomacs-display-runtime/src/menus/session/tests/mod.rs
rename to crates/neomacs-display-runtime/src/menus/session/tests/session_test.rs
diff --git a/crates/neomacs-display-runtime/src/presentation/pacing.rs b/crates/neomacs-display-runtime/src/presentation/pacing.rs
index c879d8f4cb..9c44e57fc4 100644
--- a/crates/neomacs-display-runtime/src/presentation/pacing.rs
+++ b/crates/neomacs-display-runtime/src/presentation/pacing.rs
@@ -12,13 +12,5 @@ pub(crate) fn present_mode(supported: &[wgpu::PresentMode]) -> wgpu::PresentMode
 }
 
 #[cfg(test)]
-mod tests {
-    use super::*;
-    #[test]
-    fn latest_frame_mode_is_selected_only_when_supported() {
-        use wgpu::PresentMode::*;
-        assert_eq!(present_mode(&[Fifo, Immediate, Mailbox]), Mailbox);
-        assert_eq!(present_mode(&[Fifo, Immediate]), Fifo);
-        assert_eq!(present_mode(&[Fifo]), Fifo);
-    }
-}
+#[path = "tests/pacing_test.rs"]
+mod tests;
diff --git a/crates/neomacs-display-runtime/src/presentation/retirement.rs b/crates/neomacs-display-runtime/src/presentation/retirement.rs
index 7a80366d0d..f12551e930 100644
--- a/crates/neomacs-display-runtime/src/presentation/retirement.rs
+++ b/crates/neomacs-display-runtime/src/presentation/retirement.rs
@@ -29,4 +29,5 @@ impl<T> Drop for Retirements<T> {
 }
 
 #[cfg(test)]
+#[path = "retirement/tests/retirement_test.rs"]
 mod tests;
diff --git a/crates/neomacs-display-runtime/src/presentation/retirement/tests/mod.rs b/crates/neomacs-display-runtime/src/presentation/retirement/tests/retirement_test.rs
similarity index 100%
rename from crates/neomacs-display-runtime/src/presentation/retirement/tests/mod.rs
rename to crates/neomacs-display-runtime/src/presentation/retirement/tests/retirement_test.rs
diff --git a/crates/neomacs-display-runtime/src/presentation/tests/pacing_test.rs b/crates/neomacs-display-runtime/src/presentation/tests/pacing_test.rs
new file mode 100644
index 0000000000..28b8be472c
--- /dev/null
+++ b/crates/neomacs-display-runtime/src/presentation/tests/pacing_test.rs
@@ -0,0 +1,8 @@
+use super::*;
+#[test]
+fn latest_frame_mode_is_selected_only_when_supported() {
+    use wgpu::PresentMode::*;
+    assert_eq!(present_mode(&[Fifo, Immediate, Mailbox]), Mailbox);
+    assert_eq!(present_mode(&[Fifo, Immediate]), Fifo);
+    assert_eq!(present_mode(&[Fifo]), Fifo);
+}
diff --git a/crates/neomacs-display-runtime/src/presentation_feedback/tests/wayland_test.rs b/crates/neomacs-display-runtime/src/presentation_feedback/tests/wayland_test.rs
new file mode 100644
index 0000000000..68668f9751
--- /dev/null
+++ b/crates/neomacs-display-runtime/src/presentation_feedback/tests/wayland_test.rs
@@ -0,0 +1,65 @@
+use super::*;
+use neomacs_display_protocol::PresentationId;
+
+fn submission(serial: u64, layout: u64) -> Submission {
+    Submission {
+        serial,
+        frame: 7,
+        layout: PresentationId::new(layout),
+        width: 800,
+        height: 600,
+        scale: 1.0,
+    }
+}
+
+#[test]
+fn pending_receipts_wake_without_new_input_and_stop_after_ack_or_timeout() {
+    let now = observe_platform_now();
+    let mut pending = PendingReceipts::default();
+    assert_eq!(pending.deadline(now), None);
+    pending.requested(1, now);
+    pending.requested(2, now);
+    assert_eq!(
+        pending.deadline(now),
+        Some(now.plus(Duration::from_millis(4)))
+    );
+    pending.received(2);
+    assert!(pending.deadline(now).is_some());
+    pending.received(1);
+    assert_eq!(pending.deadline(now), None);
+    pending.requested(3, now);
+    assert_eq!(pending.deadline(now.plus(Duration::from_secs(1))), None);
+}
+
+#[test]
+fn receipt_identifies_confirmed_layout_not_latest_requested_layout() {
+    let directory = tempfile::tempdir().unwrap();
+    let path = directory.path().join("receipt");
+    let mut receipts = Receipts {
+        path: path.clone(),
+        latest_presented: 0,
+        clock_id: Some(1),
+        pending: PendingReceipts::default(),
+    };
+    let confirmed = |submission| {
+        NativeFeedback::Presented(ConfirmedPresentation {
+            submission,
+            timestamp: CompositorTimestamp {
+                clock_id: 1,
+                seconds: 42,
+                nanoseconds: 123,
+            },
+        })
+    };
+    receipts.observe(NativeFeedback::Discarded(submission(2, 200)));
+    assert!(!path.exists());
+    receipts.observe(confirmed(submission(1, 100)));
+    let first = fs::read_to_string(&path).unwrap();
+    assert!(first.contains(":submission 1 :frame 7 :presentation 100 "));
+    receipts.observe(confirmed(submission(3, 300)));
+    let latest = fs::read_to_string(&path).unwrap();
+    assert!(latest.contains(":submission 3 :frame 7 :presentation 300 "));
+    receipts.observe(confirmed(submission(1, 100)));
+    receipts.observe(NativeFeedback::Discarded(submission(4, 400)));
+    assert_eq!(fs::read_to_string(&path).unwrap(), latest);
+}
diff --git a/crates/neomacs-display-runtime/src/presentation_feedback/wayland.rs b/crates/neomacs-display-runtime/src/presentation_feedback/wayland.rs
index 26996d5085..4590579b5b 100644
--- a/crates/neomacs-display-runtime/src/presentation_feedback/wayland.rs
+++ b/crates/neomacs-display-runtime/src/presentation_feedback/wayland.rs
@@ -392,70 +392,5 @@ impl Drop for PresentationObserver {
 }
 
 #[cfg(test)]
-mod tests {
-    use super::*;
-    use neomacs_display_protocol::PresentationId;
-
-    fn submission(serial: u64, layout: u64) -> Submission {
-        Submission {
-            serial,
-            frame: 7,
-            layout: PresentationId::new(layout),
-            width: 800,
-            height: 600,
-            scale: 1.0,
-        }
-    }
-
-    #[test]
-    fn pending_receipts_wake_without_new_input_and_stop_after_ack_or_timeout() {
-        let now = observe_platform_now();
-        let mut pending = PendingReceipts::default();
-        assert_eq!(pending.deadline(now), None);
-        pending.requested(1, now);
-        pending.requested(2, now);
-        assert_eq!(
-            pending.deadline(now),
-            Some(now.plus(Duration::from_millis(4)))
-        );
-        pending.received(2);
-        assert!(pending.deadline(now).is_some());
-        pending.received(1);
-        assert_eq!(pending.deadline(now), None);
-        pending.requested(3, now);
-        assert_eq!(pending.deadline(now.plus(Duration::from_secs(1))), None);
-    }
-
-    #[test]
-    fn receipt_identifies_confirmed_layout_not_latest_requested_layout() {
-        let directory = tempfile::tempdir().unwrap();
-        let path = directory.path().join("receipt");
-        let mut receipts = Receipts {
-            path: path.clone(),
-            latest_presented: 0,
-            clock_id: Some(1),
-            pending: PendingReceipts::default(),
-        };
-        let confirmed = |submission| {
-            NativeFeedback::Presented(ConfirmedPresentation {
-                submission,
-                timestamp: CompositorTimestamp {
-                    clock_id: 1,
-                    seconds: 42,
-                    nanoseconds: 123,
-                },
-            })
-        };
-        receipts.observe(NativeFeedback::Discarded(submission(2, 200)));
-        assert!(!path.exists());
-        receipts.observe(confirmed(submission(1, 100)));
-        let first = fs::read_to_string(&path).unwrap();
-        assert!(first.contains(":submission 1 :frame 7 :presentation 100 "));
-        receipts.observe(confirmed(submission(3, 300)));
-        let latest = fs::read_to_string(&path).unwrap();
-        assert!(latest.contains(":submission 3 :frame 7 :presentation 300 "));
-        receipts.observe(confirmed(submission(1, 100)));
-        receipts.observe(NativeFeedback::Discarded(submission(4, 400)));
-        assert_eq!(fs::read_to_string(&path).unwrap(), latest);
-    }
-}
+#[path = "tests/wayland_test.rs"]
+mod tests;
diff --git a/crates/neomacs-display-runtime/src/redisplay/maintenance.rs b/crates/neomacs-display-runtime/src/redisplay/maintenance.rs
index 7cd2f11259..50ba9a7d6c 100644
--- a/crates/neomacs-display-runtime/src/redisplay/maintenance.rs
+++ b/crates/neomacs-display-runtime/src/redisplay/maintenance.rs
@@ -23,58 +23,5 @@ pub(super) fn run_budgeted(
 }
 
 #[cfg(test)]
-mod tests {
-    use super::*;
-    use std::cell::Cell;
-
-    #[test]
-    fn ready_acquisition_uses_a_bounded_batch() {
-        let calls = Cell::new(0);
-        let result = run_budgeted(
-            || {
-                calls.set(calls.get() + 1);
-                (Some(ScrollCoverageProgress::Continue), false)
-            },
-            || Duration::ZERO,
-        );
-        assert_eq!(calls.get(), 4);
-        assert_eq!(result, (Some(ScrollCoverageProgress::Continue), false));
-    }
-
-    #[test]
-    fn acquisition_yields_on_elapsed_budget_publication_or_worker_wait() {
-        let calls = Cell::new(0);
-        run_budgeted(
-            || {
-                calls.set(calls.get() + 1);
-                (Some(ScrollCoverageProgress::Continue), false)
-            },
-            || {
-                if calls.get() < 2 {
-                    Duration::ZERO
-                } else {
-                    Duration::from_millis(1)
-                }
-            },
-        );
-        assert_eq!(calls.get(), 2);
-        for result in [
-            (Some(ScrollCoverageProgress::Continue), true),
-            (Some(ScrollCoverageProgress::WorkerPending), false),
-            (None, false),
-        ] {
-            calls.set(0);
-            assert_eq!(
-                run_budgeted(
-                    || {
-                        calls.set(calls.get() + 1);
-                        result
-                    },
-                    || Duration::ZERO
-                ),
-                result
-            );
-            assert_eq!(calls.get(), 1);
-        }
-    }
-}
+#[path = "tests/maintenance_test.rs"]
+mod tests;
diff --git a/crates/neomacs-display-runtime/src/redisplay/tests/maintenance_test.rs b/crates/neomacs-display-runtime/src/redisplay/tests/maintenance_test.rs
new file mode 100644
index 0000000000..01509d050c
--- /dev/null
+++ b/crates/neomacs-display-runtime/src/redisplay/tests/maintenance_test.rs
@@ -0,0 +1,53 @@
+use super::*;
+use std::cell::Cell;
+
+#[test]
+fn ready_acquisition_uses_a_bounded_batch() {
+    let calls = Cell::new(0);
+    let result = run_budgeted(
+        || {
+            calls.set(calls.get() + 1);
+            (Some(ScrollCoverageProgress::Continue), false)
+        },
+        || Duration::ZERO,
+    );
+    assert_eq!(calls.get(), 4);
+    assert_eq!(result, (Some(ScrollCoverageProgress::Continue), false));
+}
+
+#[test]
+fn acquisition_yields_on_elapsed_budget_publication_or_worker_wait() {
+    let calls = Cell::new(0);
+    run_budgeted(
+        || {
+            calls.set(calls.get() + 1);
+            (Some(ScrollCoverageProgress::Continue), false)
+        },
+        || {
+            if calls.get() < 2 {
+                Duration::ZERO
+            } else {
+                Duration::from_millis(1)
+            }
+        },
+    );
+    assert_eq!(calls.get(), 2);
+    for result in [
+        (Some(ScrollCoverageProgress::Continue), true),
+        (Some(ScrollCoverageProgress::WorkerPending), false),
+        (None, false),
+    ] {
+        calls.set(0);
+        assert_eq!(
+            run_budgeted(
+                || {
+                    calls.set(calls.get() + 1);
+                    result
+                },
+                || Duration::ZERO
+            ),
+            result
+        );
+        assert_eq!(calls.get(), 1);
+    }
+}
diff --git a/crates/neomacs-display-runtime/src/render_thread/child_frames.rs b/crates/neomacs-display-runtime/src/render_thread/child_frames.rs
index b9598f89e7..f24bacedfb 100644
--- a/crates/neomacs-display-runtime/src/render_thread/child_frames.rs
+++ b/crates/neomacs-display-runtime/src/render_thread/child_frames.rs
@@ -825,4 +825,5 @@ impl ChildFrameManager {
 }
 
 #[cfg(test)]
+#[path = "child_frames/tests/child_frames_test.rs"]
 mod tests;
diff --git a/crates/neomacs-display-runtime/src/render_thread/child_frames/tests/mod.rs b/crates/neomacs-display-runtime/src/render_thread/child_frames/tests/child_frames_test.rs
similarity index 100%
rename from crates/neomacs-display-runtime/src/render_thread/child_frames/tests/mod.rs
rename to crates/neomacs-display-runtime/src/render_thread/child_frames/tests/child_frames_test.rs
diff --git a/crates/neomacs-display-runtime/src/render_thread/cursor.rs b/crates/neomacs-display-runtime/src/render_thread/cursor.rs
index a1c165c339..c074e50c8b 100644
--- a/crates/neomacs-display-runtime/src/render_thread/cursor.rs
+++ b/crates/neomacs-display-runtime/src/render_thread/cursor.rs
@@ -683,4 +683,5 @@ impl CursorState {
 }
 
 #[cfg(test)]
+#[path = "cursor/tests/cursor_test.rs"]
 mod tests;
diff --git a/crates/neomacs-display-runtime/src/render_thread/cursor/tests/mod.rs b/crates/neomacs-display-runtime/src/render_thread/cursor/tests/cursor_test.rs
similarity index 100%
rename from crates/neomacs-display-runtime/src/render_thread/cursor/tests/mod.rs
rename to crates/neomacs-display-runtime/src/render_thread/cursor/tests/cursor_test.rs
diff --git a/crates/neomacs-display-runtime/src/render_thread/device_loss.rs b/crates/neomacs-display-runtime/src/render_thread/device_loss.rs
index 81822c4ad1..b391263fca 100644
--- a/crates/neomacs-display-runtime/src/render_thread/device_loss.rs
+++ b/crates/neomacs-display-runtime/src/render_thread/device_loss.rs
@@ -79,4 +79,5 @@ impl DeviceLossDetector {
 }
 
 #[cfg(test)]
+#[path = "device_loss/tests/device_loss_test.rs"]
 mod tests;
diff --git a/crates/neomacs-display-runtime/src/render_thread/device_loss/tests/mod.rs b/crates/neomacs-display-runtime/src/render_thread/device_loss/tests/device_loss_test.rs
similarity index 100%
rename from crates/neomacs-display-runtime/src/render_thread/device_loss/tests/mod.rs
rename to crates/neomacs-display-runtime/src/render_thread/device_loss/tests/device_loss_test.rs
diff --git a/crates/neomacs-display-runtime/src/render_thread/frame_compositor/continuity/pane_layout.rs b/crates/neomacs-display-runtime/src/render_thread/frame_compositor/continuity/pane_layout.rs
index 096c8579a3..0700921a74 100644
--- a/crates/neomacs-display-runtime/src/render_thread/frame_compositor/continuity/pane_layout.rs
+++ b/crates/neomacs-display-runtime/src/render_thread/frame_compositor/continuity/pane_layout.rs
@@ -1461,4 +1461,5 @@ impl LayoutSample {
 }
 
 #[cfg(test)]
+#[path = "pane_layout/tests/pane_layout_test.rs"]
 mod tests;
diff --git a/crates/neomacs-display-runtime/src/render_thread/frame_compositor/continuity/pane_layout/tests/mod.rs b/crates/neomacs-display-runtime/src/render_thread/frame_compositor/continuity/pane_layout/tests/pane_layout_test.rs
similarity index 100%
rename from crates/neomacs-display-runtime/src/render_thread/frame_compositor/continuity/pane_layout/tests/mod.rs
rename to crates/neomacs-display-runtime/src/render_thread/frame_compositor/continuity/pane_layout/tests/pane_layout_test.rs
diff --git a/crates/neomacs-display-runtime/src/render_thread/frame_compositor/continuity/reflow.rs b/crates/neomacs-display-runtime/src/render_thread/frame_compositor/continuity/reflow.rs
index 6a32ef9f98..35f8139686 100644
--- a/crates/neomacs-display-runtime/src/render_thread/frame_compositor/continuity/reflow.rs
+++ b/crates/neomacs-display-runtime/src/render_thread/frame_compositor/continuity/reflow.rs
@@ -289,4 +289,5 @@ pub(in crate::render_thread) fn imprints_by_window(
 }
 
 #[cfg(test)]
+#[path = "reflow/tests/reflow_test.rs"]
 mod tests;
diff --git a/crates/neomacs-display-runtime/src/render_thread/frame_compositor/continuity/reflow/tests/mod.rs b/crates/neomacs-display-runtime/src/render_thread/frame_compositor/continuity/reflow/tests/reflow_test.rs
similarity index 100%
rename from crates/neomacs-display-runtime/src/render_thread/frame_compositor/continuity/reflow/tests/mod.rs
rename to crates/neomacs-display-runtime/src/render_thread/frame_compositor/continuity/reflow/tests/reflow_test.rs
diff --git a/crates/neomacs-display-runtime/src/render_thread/frame_compositor/continuity/scroll.rs b/crates/neomacs-display-runtime/src/render_thread/frame_compositor/continuity/scroll.rs
index b3f6fec553..234ae7cdb0 100644
--- a/crates/neomacs-display-runtime/src/render_thread/frame_compositor/continuity/scroll.rs
+++ b/crates/neomacs-display-runtime/src/render_thread/frame_compositor/continuity/scroll.rs
@@ -289,4 +289,5 @@ pub(in crate::render_thread) fn anchors_by_window(
 }
 
 #[cfg(test)]
+#[path = "scroll/tests/scroll_test.rs"]
 mod tests;
diff --git a/crates/neomacs-display-runtime/src/render_thread/frame_compositor/continuity/scroll/tests/mod.rs b/crates/neomacs-display-runtime/src/render_thread/frame_compositor/continuity/scroll/tests/scroll_test.rs
similarity index 100%
rename from crates/neomacs-display-runtime/src/render_thread/frame_compositor/continuity/scroll/tests/mod.rs
rename to crates/neomacs-display-runtime/src/render_thread/frame_compositor/continuity/scroll/tests/scroll_test.rs
diff --git a/crates/neomacs-display-runtime/src/render_thread/frame_compositor/continuity/selection.rs b/crates/neomacs-display-runtime/src/render_thread/frame_compositor/continuity/selection.rs
index d62612fd8f..4d17c60fdd 100644
--- a/crates/neomacs-display-runtime/src/render_thread/frame_compositor/continuity/selection.rs
+++ b/crates/neomacs-display-runtime/src/render_thread/frame_compositor/continuity/selection.rs
@@ -44,4 +44,5 @@ pub(in crate::render_thread) fn observe_selection(
 }
 
 #[cfg(test)]
+#[path = "selection/tests/selection_test.rs"]
 mod tests;
diff --git a/crates/neomacs-display-runtime/src/render_thread/frame_compositor/continuity/selection/tests/mod.rs b/crates/neomacs-display-runtime/src/render_thread/frame_compositor/continuity/selection/tests/selection_test.rs
similarity index 100%
rename from crates/neomacs-display-runtime/src/render_thread/frame_compositor/continuity/selection/tests/mod.rs
rename to crates/neomacs-display-runtime/src/render_thread/frame_compositor/continuity/selection/tests/selection_test.rs
diff --git a/crates/neomacs-display-runtime/src/render_thread/frame_compositor/continuity/theme.rs b/crates/neomacs-display-runtime/src/render_thread/frame_compositor/continuity/theme.rs
index ad01d0bd9a..46c7ca4b0d 100644
--- a/crates/neomacs-display-runtime/src/render_thread/frame_compositor/continuity/theme.rs
+++ b/crates/neomacs-display-runtime/src/render_thread/frame_compositor/continuity/theme.rs
@@ -54,4 +54,5 @@ pub(in crate::render_thread) fn theme_change(
 }
 
 #[cfg(test)]
+#[path = "theme/tests/theme_test.rs"]
 mod tests;
diff --git a/crates/neomacs-display-runtime/src/render_thread/frame_compositor/continuity/theme/tests/mod.rs b/crates/neomacs-display-runtime/src/render_thread/frame_compositor/continuity/theme/tests/theme_test.rs
similarity index 100%
rename from crates/neomacs-display-runtime/src/render_thread/frame_compositor/continuity/theme/tests/mod.rs
rename to crates/neomacs-display-runtime/src/render_thread/frame_compositor/continuity/theme/tests/theme_test.rs
diff --git a/crates/neomacs-display-runtime/src/render_thread/frame_compositor/input_scroll.rs b/crates/neomacs-display-runtime/src/render_thread/frame_compositor/input_scroll.rs
index d833f300a9..de5f7e91c6 100644
--- a/crates/neomacs-display-runtime/src/render_thread/frame_compositor/input_scroll.rs
+++ b/crates/neomacs-display-runtime/src/render_thread/frame_compositor/input_scroll.rs
@@ -312,4 +312,5 @@ impl InputScroll {
 }
 
 #[cfg(test)]
+#[path = "input_scroll/tests/input_scroll_test.rs"]
 mod tests;
diff --git a/crates/neomacs-display-runtime/src/render_thread/frame_compositor/input_scroll/tests.rs b/crates/neomacs-display-runtime/src/render_thread/frame_compositor/input_scroll/tests/input_scroll_test.rs
similarity index 100%
rename from crates/neomacs-display-runtime/src/render_thread/frame_compositor/input_scroll/tests.rs
rename to crates/neomacs-display-runtime/src/render_thread/frame_compositor/input_scroll/tests/input_scroll_test.rs
diff --git a/crates/neomacs-display-runtime/src/render_thread/frame_compositor/layout_continuity.rs b/crates/neomacs-display-runtime/src/render_thread/frame_compositor/layout_continuity.rs
index ad5e5b2ee4..46d306120c 100644
--- a/crates/neomacs-display-runtime/src/render_thread/frame_compositor/layout_continuity.rs
+++ b/crates/neomacs-display-runtime/src/render_thread/frame_compositor/layout_continuity.rs
@@ -97,4 +97,5 @@ impl GuiFrameRenderState {
 }
 
 #[cfg(test)]
+#[path = "layout_continuity/tests/layout_continuity_test.rs"]
 mod tests;
diff --git a/crates/neomacs-display-runtime/src/render_thread/frame_compositor/layout_continuity/tests/mod.rs b/crates/neomacs-display-runtime/src/render_thread/frame_compositor/layout_continuity/tests/layout_continuity_test.rs
similarity index 100%
rename from crates/neomacs-display-runtime/src/render_thread/frame_compositor/layout_continuity/tests/mod.rs
rename to crates/neomacs-display-runtime/src/render_thread/frame_compositor/layout_continuity/tests/layout_continuity_test.rs
diff --git a/crates/neomacs-display-runtime/src/render_thread/frame_compositor/layout_driver.rs b/crates/neomacs-display-runtime/src/render_thread/frame_compositor/layout_driver.rs
index bc871072ae..2047255b5b 100644
--- a/crates/neomacs-display-runtime/src/render_thread/frame_compositor/layout_driver.rs
+++ b/crates/neomacs-display-runtime/src/render_thread/frame_compositor/layout_driver.rs
@@ -319,4 +319,5 @@ impl LayoutDriver {
 }
 
 #[cfg(test)]
+#[path = "layout_driver/tests/layout_driver_test.rs"]
 mod tests;
diff --git a/crates/neomacs-display-runtime/src/render_thread/frame_compositor/layout_driver/tests/mod.rs b/crates/neomacs-display-runtime/src/render_thread/frame_compositor/layout_driver/tests/layout_driver_test.rs
similarity index 100%
rename from crates/neomacs-display-runtime/src/render_thread/frame_compositor/layout_driver/tests/mod.rs
rename to crates/neomacs-display-runtime/src/render_thread/frame_compositor/layout_driver/tests/layout_driver_test.rs
diff --git a/crates/neomacs-display-runtime/src/render_thread/frame_compositor/motion.rs b/crates/neomacs-display-runtime/src/render_thread/frame_compositor/motion.rs
index 714838dc2e..5f2ec4be4f 100644
--- a/crates/neomacs-display-runtime/src/render_thread/frame_compositor/motion.rs
+++ b/crates/neomacs-display-runtime/src/render_thread/frame_compositor/motion.rs
@@ -310,4 +310,5 @@ fn spring_progress(omega: f32, zeta: f32, v0: f32, t: f32) -> f32 {
 }
 
 #[cfg(test)]
+#[path = "motion/tests/motion_test.rs"]
 mod tests;
diff --git a/crates/neomacs-display-runtime/src/render_thread/frame_compositor/motion/tests/mod.rs b/crates/neomacs-display-runtime/src/render_thread/frame_compositor/motion/tests/motion_test.rs
similarity index 100%
rename from crates/neomacs-display-runtime/src/render_thread/frame_compositor/motion/tests/mod.rs
rename to crates/neomacs-display-runtime/src/render_thread/frame_compositor/motion/tests/motion_test.rs
diff --git a/crates/neomacs-display-runtime/src/render_thread/frame_ingest.rs b/crates/neomacs-display-runtime/src/render_thread/frame_ingest.rs
index cb4a15bb62..2d110d0e7b 100644
--- a/crates/neomacs-display-runtime/src/render_thread/frame_ingest.rs
+++ b/crates/neomacs-display-runtime/src/render_thread/frame_ingest.rs
@@ -1276,4 +1276,5 @@ fn dump_frame_glyphs_resolved(frame: &crate::core::frame_glyphs::FrameGlyphBuffe
 }
 
 #[cfg(all(test, feature = "webview"))]
+#[path = "frame_ingest/tests/frame_ingest_test.rs"]
 mod tests;
diff --git a/crates/neomacs-display-runtime/src/render_thread/frame_ingest/tests/mod.rs b/crates/neomacs-display-runtime/src/render_thread/frame_ingest/tests/frame_ingest_test.rs
similarity index 100%
rename from crates/neomacs-display-runtime/src/render_thread/frame_ingest/tests/mod.rs
rename to crates/neomacs-display-runtime/src/render_thread/frame_ingest/tests/frame_ingest_test.rs
diff --git a/crates/neomacs-display-runtime/src/render_thread/frame_state.rs b/crates/neomacs-display-runtime/src/render_thread/frame_state.rs
index 3014434f8e..38af18144e 100644
--- a/crates/neomacs-display-runtime/src/render_thread/frame_state.rs
+++ b/crates/neomacs-display-runtime/src/render_thread/frame_state.rs
@@ -642,4 +642,5 @@ impl RenderApp {
 }
 
 #[cfg(test)]
+#[path = "frame_state/tests/frame_state_test.rs"]
 mod tests;
diff --git a/crates/neomacs-display-runtime/src/render_thread/frame_state/tests/mod.rs b/crates/neomacs-display-runtime/src/render_thread/frame_state/tests/frame_state_test.rs
similarity index 100%
rename from crates/neomacs-display-runtime/src/render_thread/frame_state/tests/mod.rs
rename to crates/neomacs-display-runtime/src/render_thread/frame_state/tests/frame_state_test.rs
diff --git a/crates/neomacs-display-runtime/src/render_thread/frame_windows.rs b/crates/neomacs-display-runtime/src/render_thread/frame_windows.rs
index dde9807be0..41e0233c2f 100644
--- a/crates/neomacs-display-runtime/src/render_thread/frame_windows.rs
+++ b/crates/neomacs-display-runtime/src/render_thread/frame_windows.rs
@@ -2762,4 +2762,5 @@ impl GuiFrameWindowManager {
 }
 
 #[cfg(test)]
+#[path = "frame_windows/tests/frame_windows_test.rs"]
 mod tests;
diff --git a/crates/neomacs-display-runtime/src/render_thread/frame_windows/tests/mod.rs b/crates/neomacs-display-runtime/src/render_thread/frame_windows/tests/frame_windows_test.rs
similarity index 100%
rename from crates/neomacs-display-runtime/src/render_thread/frame_windows/tests/mod.rs
rename to crates/neomacs-display-runtime/src/render_thread/frame_windows/tests/frame_windows_test.rs
diff --git a/crates/neomacs-display-runtime/src/render_thread/input.rs b/crates/neomacs-display-runtime/src/render_thread/input.rs
index e7fc58e571..16e38f6720 100644
--- a/crates/neomacs-display-runtime/src/render_thread/input.rs
+++ b/crates/neomacs-display-runtime/src/render_thread/input.rs
@@ -552,4 +552,5 @@ impl RenderApp {
 }
 
 #[cfg(test)]
+#[path = "input/tests/input_test.rs"]
 mod tests;
diff --git a/crates/neomacs-display-runtime/src/render_thread/input/tests/mod.rs b/crates/neomacs-display-runtime/src/render_thread/input/tests/input_test.rs
similarity index 100%
rename from crates/neomacs-display-runtime/src/render_thread/input/tests/mod.rs
rename to crates/neomacs-display-runtime/src/render_thread/input/tests/input_test.rs
diff --git a/crates/neomacs-display-runtime/src/render_thread/mod.rs b/crates/neomacs-display-runtime/src/render_thread/mod.rs
index 7535c82daf..d6123ce509 100644
--- a/crates/neomacs-display-runtime/src/render_thread/mod.rs
+++ b/crates/neomacs-display-runtime/src/render_thread/mod.rs
@@ -36,6 +36,7 @@ mod terminal_commands;
 #[cfg(feature = "neo-term")]
 mod terminal_expansion;
 #[cfg(test)]
+#[path = "tests/render_thread_test.rs"]
 mod tests;
 #[cfg(test)]
 #[path = "tests/texture_discipline_test.rs"]
diff --git a/crates/neomacs-display-runtime/src/render_thread/modifier_sides.rs b/crates/neomacs-display-runtime/src/render_thread/modifier_sides.rs
index 9224488c07..80259449df 100644
--- a/crates/neomacs-display-runtime/src/render_thread/modifier_sides.rs
+++ b/crates/neomacs-display-runtime/src/render_thread/modifier_sides.rs
@@ -110,4 +110,5 @@ impl ModifierSides {
 }
 
 #[cfg(test)]
+#[path = "modifier_sides/tests/modifier_sides_test.rs"]
 mod tests;
diff --git a/crates/neomacs-display-runtime/src/render_thread/modifier_sides/tests.rs b/crates/neomacs-display-runtime/src/render_thread/modifier_sides/tests/modifier_sides_test.rs
similarity index 100%
rename from crates/neomacs-display-runtime/src/render_thread/modifier_sides/tests.rs
rename to crates/neomacs-display-runtime/src/render_thread/modifier_sides/tests/modifier_sides_test.rs
diff --git a/crates/neomacs-display-runtime/src/render_thread/pointer_events.rs b/crates/neomacs-display-runtime/src/render_thread/pointer_events.rs
index ac12fbb6eb..a023ff69ff 100644
--- a/crates/neomacs-display-runtime/src/render_thread/pointer_events.rs
+++ b/crates/neomacs-display-runtime/src/render_thread/pointer_events.rs
@@ -75,126 +75,8 @@ pub(super) enum PointerOwner {
 }
 
 #[cfg(all(test, feature = "webview"))]
-mod webview_tests {
-    use super::*;
-
-    /// Where a pointer at surface `(x, y)` lands while nothing is moving.
-    ///
-    /// A settled projection is the identity, so a fixture built with this
-    /// reads exactly as it did when this hit test took two `f32`s — and,
-    /// unlike two `f32`s, it had to come from a projection to exist.
-    fn settled_frame_point(x: f32, y: f32) -> PresentationFramePoint {
-        neomacs_display_protocol::InteractionProjection::settled(
-            neomacs_display_protocol::PresentationId::new(1),
-        )
-        .map(
-            neomacs_display_protocol::GeometryPoint::<
-                neomacs_display_protocol::RootSurfaceSpace,
-                neomacs_display_protocol::LogicalPixels,
-            >::from_px(x, y)
-            .expect("a fixture's coordinates are finite"),
-        )
-        .expect("the identity of a finite point stays representable")
-    }
-
-    fn presentation(
-        x: f32,
-        y: f32,
-        content: neomacs_display_protocol::XwidgetContentExtent,
-        advance: f32,
-    ) -> neomacs_display_protocol::XwidgetPresentationGeometry<neomacs_display_protocol::FrameSpace>
-    {
-        neomacs_display_protocol::XwidgetPresentationGeometry::new(
-            neomacs_display_protocol::GeometryPoint::<
-                neomacs_display_protocol::FrameSpace,
-                neomacs_display_protocol::LogicalPixels,
-            >::from_px(x, y)
-            .expect("valid origin"),
-            content,
-            neomacs_display_protocol::XwidgetLayoutAdvance::new(neomacs_display_protocol::Px(
-                advance,
-            ))
-            .expect("valid advance"),
-            None,
-        )
-    }
-
-    #[test]
-    fn hit_testing_keeps_xwidget_and_webview_identities_distinct() {
-        let mut glyphs = neomacs_display_protocol::FrameGlyphBuffer::new();
-        let content =
-            neomacs_display_protocol::XwidgetContentExtent::new(320.0, 200.0).expect("extent");
-        glyphs.add_xwidget(
-            neomacs_display_protocol::XwidgetId::new(7),
-            neomacs_display_protocol::WebViewId::new(91),
-            presentation(10.0, 20.0, content, 320.0),
-        );
-
-        assert_eq!(
-            webview_glyph_hit_test(&glyphs.glyphs, settled_frame_point(42.5, 75.0)),
-            Some(WebViewPointerHit {
-                view: neomacs_display_protocol::WebViewId::new(91),
-                position: WebContentPoint::new(32.5, 55.0),
-            })
-        );
-    }
-
-    #[test]
-    fn hit_testing_rejects_the_clipped_part_of_an_xwidget() {
-        let mut glyphs = neomacs_display_protocol::FrameGlyphBuffer::new();
-        glyphs.set_draw_context(
-            neomacs_display_protocol::DisplayWindowId::new(1),
-            neomacs_display_protocol::GlyphRowRole::Text,
-            Some(neomacs_display_protocol::Rect::new(20.0, 30.0, 50.0, 40.0)),
-        );
-        let content =
-            neomacs_display_protocol::XwidgetContentExtent::new(100.0, 80.0).expect("extent");
-        glyphs.add_xwidget(
-            neomacs_display_protocol::XwidgetId::new(7),
-            neomacs_display_protocol::WebViewId::new(91),
-            presentation(10.0, 20.0, content, 100.0),
-        );
-
-        assert_eq!(
-            webview_glyph_hit_test(&glyphs.glyphs, settled_frame_point(15.0, 25.0)),
-            None
-        );
-        assert!(webview_glyph_hit_test(&glyphs.glyphs, settled_frame_point(25.0, 35.0)).is_some());
-    }
-
-    /// A slot cropped at the right edge does not shrink the pointer target:
-    /// the widget is still its own size behind the text-area clip, so a
-    /// point inside the clip but past the cropped slot still hits it.
-    #[test]
-    fn hit_testing_uses_the_widgets_own_extent_not_the_cropped_slot() {
-        let mut glyphs = neomacs_display_protocol::FrameGlyphBuffer::new();
-        glyphs.set_draw_context(
-            neomacs_display_protocol::DisplayWindowId::new(1),
-            neomacs_display_protocol::GlyphRowRole::Text,
-            Some(neomacs_display_protocol::Rect::new(0.0, 0.0, 400.0, 100.0)),
-        );
-        let content =
-            neomacs_display_protocol::XwidgetContentExtent::new(600.0, 40.0).expect("extent");
-        glyphs.add_xwidget(
-            neomacs_display_protocol::XwidgetId::new(7),
-            neomacs_display_protocol::WebViewId::new(91),
-            presentation(8.0, 10.0, content, 304.0),
-        );
-
-        assert_eq!(
-            webview_glyph_hit_test(&glyphs.glyphs, settled_frame_point(350.0, 20.0)),
-            Some(WebViewPointerHit {
-                view: neomacs_display_protocol::WebViewId::new(91),
-                position: WebContentPoint::new(342.0, 10.0),
-            })
-        );
-        assert_eq!(
-            webview_glyph_hit_test(&glyphs.glyphs, settled_frame_point(450.0, 20.0)),
-            None,
-            "past the clip nothing of the widget is visible"
-        );
-    }
-}
+#[path = "tests/pointer_events_webview_test.rs"]
+mod webview_tests;
 
 #[cfg(test)]
 #[path = "pointer_events/tests/shader_surface_test.rs"]
diff --git a/crates/neomacs-display-runtime/src/render_thread/render_pass/composition_targets.rs b/crates/neomacs-display-runtime/src/render_thread/render_pass/composition_targets.rs
index 86a680ec75..891e72588a 100644
--- a/crates/neomacs-display-runtime/src/render_thread/render_pass/composition_targets.rs
+++ b/crates/neomacs-display-runtime/src/render_thread/render_pass/composition_targets.rs
@@ -282,7 +282,7 @@ pub(super) fn mandatory_child_target(
 }
 
 #[cfg(test)]
-#[path = "composition_targets/tests/mod.rs"]
+#[path = "composition_targets/tests/composition_targets_test.rs"]
 mod tests;
 
 /// Preflight child composition before acquiring a surface or advancing any
diff --git a/crates/neomacs-display-runtime/src/render_thread/render_pass/composition_targets/tests/mod.rs b/crates/neomacs-display-runtime/src/render_thread/render_pass/composition_targets/tests/composition_targets_test.rs
similarity index 100%
rename from crates/neomacs-display-runtime/src/render_thread/render_pass/composition_targets/tests/mod.rs
rename to crates/neomacs-display-runtime/src/render_thread/render_pass/composition_targets/tests/composition_targets_test.rs
diff --git a/crates/neomacs-display-runtime/src/render_thread/render_pass/mod.rs b/crates/neomacs-display-runtime/src/render_thread/render_pass/mod.rs
index e4a5e5900e..720ca3a4b7 100644
--- a/crates/neomacs-display-runtime/src/render_thread/render_pass/mod.rs
+++ b/crates/neomacs-display-runtime/src/render_thread/render_pass/mod.rs
@@ -529,5 +529,5 @@ fn render_frame_window_contents_reserved(
 }
 
 #[cfg(test)]
-#[path = "tests/mod.rs"]
+#[path = "tests/render_pass_test.rs"]
 mod tests;
diff --git a/crates/neomacs-display-runtime/src/render_thread/render_pass/retained_scroll.rs b/crates/neomacs-display-runtime/src/render_thread/render_pass/retained_scroll.rs
index 656ae7af9e..fc16bf1654 100644
--- a/crates/neomacs-display-runtime/src/render_thread/render_pass/retained_scroll.rs
+++ b/crates/neomacs-display-runtime/src/render_thread/render_pass/retained_scroll.rs
@@ -405,18 +405,9 @@ pub(super) fn prepare(
 }
 
 #[cfg(test)]
+#[path = "retained_scroll/tests/retained_scroll_test.rs"]
 pub(super) mod tests;
 
 #[cfg(test)]
-mod geometry_tests {
-    use super::*;
-    #[test]
-    fn raster_extent_preserves_device_phase_and_rejects_oversized_coverage() {
-        let scale = DeviceScale::new(1.5).unwrap();
-        let (size, origin) =
-            raster_geometry(Rect::new(2.25, 3.75, 20.0, 40.0), scale, 1024).unwrap();
-        assert_eq!(origin, (2.0, 10.0 / 3.0));
-        assert_eq!((size.width(), size.height()), (31, 61));
-        assert!(raster_geometry(Rect::new(0.0, 0.0, 10.0, 10000.0), scale, 1024).is_none());
-    }
-}
+#[path = "tests/retained_scroll_geometry_test.rs"]
+mod geometry_tests;
diff --git a/crates/neomacs-display-runtime/src/render_thread/render_pass/retained_scroll/tests.rs b/crates/neomacs-display-runtime/src/render_thread/render_pass/retained_scroll/tests/retained_scroll_test.rs
similarity index 100%
rename from crates/neomacs-display-runtime/src/render_thread/render_pass/retained_scroll/tests.rs
rename to crates/neomacs-display-runtime/src/render_thread/render_pass/retained_scroll/tests/retained_scroll_test.rs
diff --git a/crates/neomacs-display-runtime/src/render_thread/render_pass/retained_static.rs b/crates/neomacs-display-runtime/src/render_thread/render_pass/retained_static.rs
index bb670d0ab4..b91b921ccb 100644
--- a/crates/neomacs-display-runtime/src/render_thread/render_pass/retained_static.rs
+++ b/crates/neomacs-display-runtime/src/render_thread/render_pass/retained_static.rs
@@ -325,4 +325,5 @@ pub(super) fn ensure_retained_static_texture(
 }
 
 #[cfg(test)]
+#[path = "retained_static/tests/retained_static_test.rs"]
 mod tests;
diff --git a/crates/neomacs-display-runtime/src/render_thread/render_pass/retained_static/tests/mod.rs b/crates/neomacs-display-runtime/src/render_thread/render_pass/retained_static/tests/retained_static_test.rs
similarity index 100%
rename from crates/neomacs-display-runtime/src/render_thread/render_pass/retained_static/tests/mod.rs
rename to crates/neomacs-display-runtime/src/render_thread/render_pass/retained_static/tests/retained_static_test.rs
diff --git a/crates/neomacs-display-runtime/src/render_thread/render_pass/scene.rs b/crates/neomacs-display-runtime/src/render_thread/render_pass/scene.rs
index f8f360044c..11ee2de542 100644
--- a/crates/neomacs-display-runtime/src/render_thread/render_pass/scene.rs
+++ b/crates/neomacs-display-runtime/src/render_thread/render_pass/scene.rs
@@ -20,7 +20,7 @@ use crate::render_thread::frame_stats;
 use crate::render_thread::frame_windows::GuiFrameRenderState;
 
 #[cfg(test)]
-#[path = "scene/tests.rs"]
+#[path = "scene/tests/scene_test.rs"]
 mod tests;
 use crate::render_thread::state::ChildFrameStyle;
 use neomacs_renderer_wgpu::{WgpuGlyphAtlas, WgpuRenderer};
diff --git a/crates/neomacs-display-runtime/src/render_thread/render_pass/scene/native_boundary_tests.rs b/crates/neomacs-display-runtime/src/render_thread/render_pass/scene/tests/native_boundary_test.rs
similarity index 100%
rename from crates/neomacs-display-runtime/src/render_thread/render_pass/scene/native_boundary_tests.rs
rename to crates/neomacs-display-runtime/src/render_thread/render_pass/scene/tests/native_boundary_test.rs
diff --git a/crates/neomacs-display-runtime/src/render_thread/render_pass/scene/pane_size_boundary_tests.rs b/crates/neomacs-display-runtime/src/render_thread/render_pass/scene/tests/pane_size_boundary_test.rs
similarity index 100%
rename from crates/neomacs-display-runtime/src/render_thread/render_pass/scene/pane_size_boundary_tests.rs
rename to crates/neomacs-display-runtime/src/render_thread/render_pass/scene/tests/pane_size_boundary_test.rs
diff --git a/crates/neomacs-display-runtime/src/render_thread/render_pass/scene/pinned_lifecycle_tests.rs b/crates/neomacs-display-runtime/src/render_thread/render_pass/scene/tests/pinned_lifecycle_test.rs
similarity index 100%
rename from crates/neomacs-display-runtime/src/render_thread/render_pass/scene/pinned_lifecycle_tests.rs
rename to crates/neomacs-display-runtime/src/render_thread/render_pass/scene/tests/pinned_lifecycle_test.rs
diff --git a/crates/neomacs-display-runtime/src/render_thread/render_pass/scene/retained_owner_tests.rs b/crates/neomacs-display-runtime/src/render_thread/render_pass/scene/tests/retained_owner_test.rs
similarity index 100%
rename from crates/neomacs-display-runtime/src/render_thread/render_pass/scene/retained_owner_tests.rs
rename to crates/neomacs-display-runtime/src/render_thread/render_pass/scene/tests/retained_owner_test.rs
diff --git a/crates/neomacs-display-runtime/src/render_thread/render_pass/scene/tests.rs b/crates/neomacs-display-runtime/src/render_thread/render_pass/scene/tests/scene_test.rs
similarity index 99%
rename from crates/neomacs-display-runtime/src/render_thread/render_pass/scene/tests.rs
rename to crates/neomacs-display-runtime/src/render_thread/render_pass/scene/tests/scene_test.rs
index 4f90e4b65d..cf182bd329 100644
--- a/crates/neomacs-display-runtime/src/render_thread/render_pass/scene/tests.rs
+++ b/crates/neomacs-display-runtime/src/render_thread/render_pass/scene/tests/scene_test.rs
@@ -1,12 +1,12 @@
 //! Real GPU regression through the runtime child-resize composition branch.
 
-#[path = "native_boundary_tests.rs"]
+#[path = "native_boundary_test.rs"]
 mod native_boundary;
-#[path = "pane_size_boundary_tests.rs"]
+#[path = "pane_size_boundary_test.rs"]
 mod pane_size_boundary;
-#[path = "pinned_lifecycle_tests.rs"]
+#[path = "pinned_lifecycle_test.rs"]
 mod pinned_lifecycle;
-#[path = "retained_owner_tests.rs"]
+#[path = "retained_owner_test.rs"]
 mod retained_owner;
 
 fn target(renderer: &WgpuRenderer) -> wgpu::Texture {
diff --git a/crates/neomacs-display-runtime/src/render_thread/render_pass/tests/mod.rs b/crates/neomacs-display-runtime/src/render_thread/render_pass/tests/render_pass_test.rs
similarity index 100%
rename from crates/neomacs-display-runtime/src/render_thread/render_pass/tests/mod.rs
rename to crates/neomacs-display-runtime/src/render_thread/render_pass/tests/render_pass_test.rs
diff --git a/crates/neomacs-display-runtime/src/render_thread/render_pass/tests/retained_scroll_geometry_test.rs b/crates/neomacs-display-runtime/src/render_thread/render_pass/tests/retained_scroll_geometry_test.rs
new file mode 100644
index 0000000000..6eaef34736
--- /dev/null
+++ b/crates/neomacs-display-runtime/src/render_thread/render_pass/tests/retained_scroll_geometry_test.rs
@@ -0,0 +1,9 @@
+use super::*;
+#[test]
+fn raster_extent_preserves_device_phase_and_rejects_oversized_coverage() {
+    let scale = DeviceScale::new(1.5).unwrap();
+    let (size, origin) = raster_geometry(Rect::new(2.25, 3.75, 20.0, 40.0), scale, 1024).unwrap();
+    assert_eq!(origin, (2.0, 10.0 / 3.0));
+    assert_eq!((size.width(), size.height()), (31, 61));
+    assert!(raster_geometry(Rect::new(0.0, 0.0, 10.0, 10000.0), scale, 1024).is_none());
+}
diff --git a/crates/neomacs-display-runtime/src/render_thread/state.rs b/crates/neomacs-display-runtime/src/render_thread/state.rs
index 8c2a5f7fe1..c9d6949d99 100644
--- a/crates/neomacs-display-runtime/src/render_thread/state.rs
+++ b/crates/neomacs-display-runtime/src/render_thread/state.rs
@@ -1204,4 +1204,5 @@ impl RenderApp {
 }
 
 #[cfg(test)]
+#[path = "state/tests/state_test.rs"]
 mod tests;
diff --git a/crates/neomacs-display-runtime/src/render_thread/state/tests/mod.rs b/crates/neomacs-display-runtime/src/render_thread/state/tests/state_test.rs
similarity index 100%
rename from crates/neomacs-display-runtime/src/render_thread/state/tests/mod.rs
rename to crates/neomacs-display-runtime/src/render_thread/state/tests/state_test.rs
diff --git a/crates/neomacs-display-runtime/src/render_thread/surface_readback.rs b/crates/neomacs-display-runtime/src/render_thread/surface_readback.rs
index a30306dfba..38319644b7 100644
--- a/crates/neomacs-display-runtime/src/render_thread/surface_readback.rs
+++ b/crates/neomacs-display-runtime/src/render_thread/surface_readback.rs
@@ -4,6 +4,7 @@ use neomacs_renderer_wgpu::WgpuRenderer;
 use std::path::Path;
 
 #[cfg(test)]
+#[path = "surface_readback/tests/surface_readback_test.rs"]
 mod tests;
 
 pub(crate) fn surface_usage_for_debug_readback(
diff --git a/crates/neomacs-display-runtime/src/render_thread/surface_readback/tests/mod.rs b/crates/neomacs-display-runtime/src/render_thread/surface_readback/tests/surface_readback_test.rs
similarity index 100%
rename from crates/neomacs-display-runtime/src/render_thread/surface_readback/tests/mod.rs
rename to crates/neomacs-display-runtime/src/render_thread/surface_readback/tests/surface_readback_test.rs
diff --git a/crates/neomacs-display-runtime/src/render_thread/terminal_commands.rs b/crates/neomacs-display-runtime/src/render_thread/terminal_commands.rs
index cfdba0ed21..c310f984e8 100644
--- a/crates/neomacs-display-runtime/src/render_thread/terminal_commands.rs
+++ b/crates/neomacs-display-runtime/src/render_thread/terminal_commands.rs
@@ -102,4 +102,5 @@ impl RenderApp {
 }
 
 #[cfg(all(test, feature = "neo-term"))]
+#[path = "terminal_commands/tests/terminal_commands_test.rs"]
 mod tests;
diff --git a/crates/neomacs-display-runtime/src/render_thread/terminal_commands/tests/mod.rs b/crates/neomacs-display-runtime/src/render_thread/terminal_commands/tests/terminal_commands_test.rs
similarity index 100%
rename from crates/neomacs-display-runtime/src/render_thread/terminal_commands/tests/mod.rs
rename to crates/neomacs-display-runtime/src/render_thread/terminal_commands/tests/terminal_commands_test.rs
diff --git a/crates/neomacs-display-runtime/src/render_thread/terminal_expansion.rs b/crates/neomacs-display-runtime/src/render_thread/terminal_expansion.rs
index c26158fc21..108944b6d1 100644
--- a/crates/neomacs-display-runtime/src/render_thread/terminal_expansion.rs
+++ b/crates/neomacs-display-runtime/src/render_thread/terminal_expansion.rs
@@ -118,4 +118,5 @@ pub(super) enum TerminalExpansionUpdate {
 }
 
 #[cfg(test)]
+#[path = "terminal_expansion/tests/terminal_expansion_test.rs"]
 mod tests;
diff --git a/crates/neomacs-display-runtime/src/render_thread/terminal_expansion/tests/mod.rs b/crates/neomacs-display-runtime/src/render_thread/terminal_expansion/tests/terminal_expansion_test.rs
similarity index 100%
rename from crates/neomacs-display-runtime/src/render_thread/terminal_expansion/tests/mod.rs
rename to crates/neomacs-display-runtime/src/render_thread/terminal_expansion/tests/terminal_expansion_test.rs
diff --git a/crates/neomacs-display-runtime/src/render_thread/tests/pointer_events_webview_test.rs b/crates/neomacs-display-runtime/src/render_thread/tests/pointer_events_webview_test.rs
new file mode 100644
index 0000000000..27017687ca
--- /dev/null
+++ b/crates/neomacs-display-runtime/src/render_thread/tests/pointer_events_webview_test.rs
@@ -0,0 +1,113 @@
+use super::*;
+
+/// Where a pointer at surface `(x, y)` lands while nothing is moving.
+///
+/// A settled projection is the identity, so a fixture built with this
+/// reads exactly as it did when this hit test took two `f32`s — and,
+/// unlike two `f32`s, it had to come from a projection to exist.
+fn settled_frame_point(x: f32, y: f32) -> PresentationFramePoint {
+    neomacs_display_protocol::InteractionProjection::settled(
+        neomacs_display_protocol::PresentationId::new(1),
+    )
+    .map(
+        neomacs_display_protocol::GeometryPoint::<
+            neomacs_display_protocol::RootSurfaceSpace,
+            neomacs_display_protocol::LogicalPixels,
+        >::from_px(x, y)
+        .expect("a fixture's coordinates are finite"),
+    )
+    .expect("the identity of a finite point stays representable")
+}
+
+fn presentation(
+    x: f32,
+    y: f32,
+    content: neomacs_display_protocol::XwidgetContentExtent,
+    advance: f32,
+) -> neomacs_display_protocol::XwidgetPresentationGeometry<neomacs_display_protocol::FrameSpace> {
+    neomacs_display_protocol::XwidgetPresentationGeometry::new(
+        neomacs_display_protocol::GeometryPoint::<
+            neomacs_display_protocol::FrameSpace,
+            neomacs_display_protocol::LogicalPixels,
+        >::from_px(x, y)
+        .expect("valid origin"),
+        content,
+        neomacs_display_protocol::XwidgetLayoutAdvance::new(neomacs_display_protocol::Px(advance))
+            .expect("valid advance"),
+        None,
+    )
+}
+
+#[test]
+fn hit_testing_keeps_xwidget_and_webview_identities_distinct() {
+    let mut glyphs = neomacs_display_protocol::FrameGlyphBuffer::new();
+    let content =
+        neomacs_display_protocol::XwidgetContentExtent::new(320.0, 200.0).expect("extent");
+    glyphs.add_xwidget(
+        neomacs_display_protocol::XwidgetId::new(7),
+        neomacs_display_protocol::WebViewId::new(91),
+        presentation(10.0, 20.0, content, 320.0),
+    );
+
+    assert_eq!(
+        webview_glyph_hit_test(&glyphs.glyphs, settled_frame_point(42.5, 75.0)),
+        Some(WebViewPointerHit {
+            view: neomacs_display_protocol::WebViewId::new(91),
+            position: WebContentPoint::new(32.5, 55.0),
+        })
+    );
+}
+
+#[test]
+fn hit_testing_rejects_the_clipped_part_of_an_xwidget() {
+    let mut glyphs = neomacs_display_protocol::FrameGlyphBuffer::new();
+    glyphs.set_draw_context(
+        neomacs_display_protocol::DisplayWindowId::new(1),
+        neomacs_display_protocol::GlyphRowRole::Text,
+        Some(neomacs_display_protocol::Rect::new(20.0, 30.0, 50.0, 40.0)),
+    );
+    let content = neomacs_display_protocol::XwidgetContentExtent::new(100.0, 80.0).expect("extent");
+    glyphs.add_xwidget(
+        neomacs_display_protocol::XwidgetId::new(7),
+        neomacs_display_protocol::WebViewId::new(91),
+        presentation(10.0, 20.0, content, 100.0),
+    );
+
+    assert_eq!(
+        webview_glyph_hit_test(&glyphs.glyphs, settled_frame_point(15.0, 25.0)),
+        None
+    );
+    assert!(webview_glyph_hit_test(&glyphs.glyphs, settled_frame_point(25.0, 35.0)).is_some());
+}
+
+/// A slot cropped at the right edge does not shrink the pointer target:
+/// the widget is still its own size behind the text-area clip, so a
+/// point inside the clip but past the cropped slot still hits it.
+#[test]
+fn hit_testing_uses_the_widgets_own_extent_not_the_cropped_slot() {
+    let mut glyphs = neomacs_display_protocol::FrameGlyphBuffer::new();
+    glyphs.set_draw_context(
+        neomacs_display_protocol::DisplayWindowId::new(1),
+        neomacs_display_protocol::GlyphRowRole::Text,
+        Some(neomacs_display_protocol::Rect::new(0.0, 0.0, 400.0, 100.0)),
+    );
+    let content = neomacs_display_protocol::XwidgetContentExtent::new(600.0, 40.0).expect("extent");
+    glyphs.add_xwidget(
+        neomacs_display_protocol::XwidgetId::new(7),
+        neomacs_display_protocol::WebViewId::new(91),
+        presentation(8.0, 10.0, content, 304.0),
+    );
+
+    assert_eq!(
+        webview_glyph_hit_test(&glyphs.glyphs, settled_frame_point(350.0, 20.0)),
+        Some(WebViewPointerHit {
+            view: neomacs_display_protocol::WebViewId::new(91),
+            position: WebContentPoint::new(342.0, 10.0),
+        })
+    );
+    assert_eq!(
+        webview_glyph_hit_test(&glyphs.glyphs, settled_frame_point(450.0, 20.0)),
+        None,
+        "past the clip nothing of the widget is visible"
+    );
+}
diff --git a/crates/neomacs-display-runtime/src/render_thread/tests.rs b/crates/neomacs-display-runtime/src/render_thread/tests/render_thread_test.rs
similarity index 100%
rename from crates/neomacs-display-runtime/src/render_thread/tests.rs
rename to crates/neomacs-display-runtime/src/render_thread/tests/render_thread_test.rs
diff --git a/crates/neomacs-display-runtime/src/render_thread/thread_handle.rs b/crates/neomacs-display-runtime/src/render_thread/thread_handle.rs
index 80b0ddfe90..b135c0aec5 100644
--- a/crates/neomacs-display-runtime/src/render_thread/thread_handle.rs
+++ b/crates/neomacs-display-runtime/src/render_thread/thread_handle.rs
@@ -162,4 +162,5 @@ impl RenderThread {
 }
 
 #[cfg(test)]
+#[path = "thread_handle/tests/thread_handle_test.rs"]
 mod tests;
diff --git a/crates/neomacs-display-runtime/src/render_thread/thread_handle/tests/mod.rs b/crates/neomacs-display-runtime/src/render_thread/thread_handle/tests/thread_handle_test.rs
similarity index 100%
rename from crates/neomacs-display-runtime/src/render_thread/thread_handle/tests/mod.rs
rename to crates/neomacs-display-runtime/src/render_thread/thread_handle/tests/thread_handle_test.rs
diff --git a/crates/neomacs-display-runtime/src/render_thread/toolbar.rs b/crates/neomacs-display-runtime/src/render_thread/toolbar.rs
index 623e70c09c..895c1900d1 100644
--- a/crates/neomacs-display-runtime/src/render_thread/toolbar.rs
+++ b/crates/neomacs-display-runtime/src/render_thread/toolbar.rs
@@ -108,4 +108,5 @@ impl RenderApp {
 }
 
 #[cfg(test)]
+#[path = "toolbar/tests/toolbar_test.rs"]
 mod tests;
diff --git a/crates/neomacs-display-runtime/src/render_thread/toolbar/tests/mod.rs b/crates/neomacs-display-runtime/src/render_thread/toolbar/tests/toolbar_test.rs
similarity index 100%
rename from crates/neomacs-display-runtime/src/render_thread/toolbar/tests/mod.rs
rename to crates/neomacs-display-runtime/src/render_thread/toolbar/tests/toolbar_test.rs
diff --git a/crates/neomacs-display-runtime/src/render_thread/transitions.rs b/crates/neomacs-display-runtime/src/render_thread/transitions.rs
index 2f6509b798..c2123e1a0e 100644
--- a/crates/neomacs-display-runtime/src/render_thread/transitions.rs
+++ b/crates/neomacs-display-runtime/src/render_thread/transitions.rs
@@ -566,4 +566,5 @@ pub(super) fn render_frame_transitions(
 // ==========================================================================
 
 #[cfg(test)]
+#[path = "transitions/tests/transitions_test.rs"]
 mod tests;
diff --git a/crates/neomacs-display-runtime/src/render_thread/transitions/tests/mod.rs b/crates/neomacs-display-runtime/src/render_thread/transitions/tests/transitions_test.rs
similarity index 100%
rename from crates/neomacs-display-runtime/src/render_thread/transitions/tests/mod.rs
rename to crates/neomacs-display-runtime/src/render_thread/transitions/tests/transitions_test.rs
diff --git a/crates/neomacs-display-runtime/src/terminal/colors.rs b/crates/neomacs-display-runtime/src/terminal/colors.rs
index 73d06fb571..be79634481 100644
--- a/crates/neomacs-display-runtime/src/terminal/colors.rs
+++ b/crates/neomacs-display-runtime/src/terminal/colors.rs
@@ -58,4 +58,5 @@ fn named_to_color(named: NamedColor, default_fg: &Color, default_bg: &Color) ->
 }
 
 #[cfg(test)]
+#[path = "colors/tests/colors_test.rs"]
 mod tests;
diff --git a/crates/neomacs-display-runtime/src/terminal/colors/tests/mod.rs b/crates/neomacs-display-runtime/src/terminal/colors/tests/colors_test.rs
similarity index 100%
rename from crates/neomacs-display-runtime/src/terminal/colors/tests/mod.rs
rename to crates/neomacs-display-runtime/src/terminal/colors/tests/colors_test.rs
diff --git a/crates/neomacs-display-runtime/src/terminal/content.rs b/crates/neomacs-display-runtime/src/terminal/content.rs
index f48293220f..b4d19f50ea 100644
--- a/crates/neomacs-display-runtime/src/terminal/content.rs
+++ b/crates/neomacs-display-runtime/src/terminal/content.rs
@@ -189,4 +189,5 @@ pub fn extract_text<T: EventListener>(
 }
 
 #[cfg(test)]
+#[path = "content/tests/content_test.rs"]
 mod tests;
diff --git a/crates/neomacs-display-runtime/src/terminal/content/tests/mod.rs b/crates/neomacs-display-runtime/src/terminal/content/tests/content_test.rs
similarity index 100%
rename from crates/neomacs-display-runtime/src/terminal/content/tests/mod.rs
rename to crates/neomacs-display-runtime/src/terminal/content/tests/content_test.rs
diff --git a/crates/neomacs-display-runtime/src/terminal/view.rs b/crates/neomacs-display-runtime/src/terminal/view.rs
index 72caa5640e..920fe97c40 100644
--- a/crates/neomacs-display-runtime/src/terminal/view.rs
+++ b/crates/neomacs-display-runtime/src/terminal/view.rs
@@ -501,4 +501,5 @@ impl Default for TerminalManager {
 }
 
 #[cfg(test)]
+#[path = "view/tests/view_test.rs"]
 mod tests;
diff --git a/crates/neomacs-display-runtime/src/terminal/view/tests/mod.rs b/crates/neomacs-display-runtime/src/terminal/view/tests/view_test.rs
similarity index 100%
rename from crates/neomacs-display-runtime/src/terminal/view/tests/mod.rs
rename to crates/neomacs-display-runtime/src/terminal/view/tests/view_test.rs
diff --git a/crates/neomacs-display-runtime/src/tests/window_icon_test.rs b/crates/neomacs-display-runtime/src/tests/window_icon_test.rs
new file mode 100644
index 0000000000..776a6fd66f
--- /dev/null
+++ b/crates/neomacs-display-runtime/src/tests/window_icon_test.rs
@@ -0,0 +1,43 @@
+use super::*;
+
+fn dark_pixel_count(
+    icon: &RasterizedWindowIcon,
+    x_range: std::ops::Range<u32>,
+    y_range: std::ops::Range<u32>,
+) -> usize {
+    y_range
+        .flat_map(|y| x_range.clone().map(move |x| (x, y)))
+        .filter(|&(x, y)| {
+            let offset = ((y * icon.width + x) * 4) as usize;
+            let [red, green, blue, alpha] = icon.premultiplied_rgba[offset..offset + 4] else {
+                unreachable!("each icon pixel has four channels")
+            };
+            alpha > 200 && red < 50 && green < 50 && blue < 50
+        })
+        .count()
+}
+
+#[test]
+fn canonical_icon_raster_keeps_both_lambda_marks_without_fonts() {
+    let icon = load_window_icon().expect("decode canonical SVG without a font database");
+
+    assert!(
+        dark_pixel_count(&icon, 125..200, 65..140) > 350,
+        "the purple lobe must retain its vector lambda mark"
+    );
+    assert!(
+        dark_pixel_count(&icon, 45..130, 130..200) > 350,
+        "the orange lobe must retain its vector lambda mark"
+    );
+}
+
+#[test]
+fn wayland_argb8888_preserves_premultiplied_color_in_native_byte_order() {
+    let icon = RasterizedWindowIcon {
+        width: 1,
+        height: 1,
+        premultiplied_rgba: vec![0x11, 0x22, 0x33, 0x44],
+    };
+
+    assert_eq!(icon.to_wayland_argb8888(), 0x4411_2233_u32.to_ne_bytes());
+}
diff --git a/crates/neomacs-display-runtime/src/tests/window_identity_test.rs b/crates/neomacs-display-runtime/src/tests/window_identity_test.rs
new file mode 100644
index 0000000000..2332142f87
--- /dev/null
+++ b/crates/neomacs-display-runtime/src/tests/window_identity_test.rs
@@ -0,0 +1,23 @@
+use super::*;
+
+#[test]
+fn packaged_desktop_entry_matches_typed_runtime_identity() {
+    let desktop_entry = include_str!("../../assets/neomacs.desktop");
+
+    assert_eq!(NEOMACS_APPLICATION.app_id().as_str(), "neomacs");
+    assert_eq!(
+        NEOMACS_APPLICATION.desktop_file_id().as_str(),
+        "neomacs.desktop"
+    );
+    assert_eq!(NEOMACS_APPLICATION.icon_name().as_str(), "neomacs");
+    assert!(desktop_entry.contains("\nIcon=neomacs\n"));
+    assert!(desktop_entry.contains("\nStartupWMClass=neomacs\n"));
+}
+
+#[test]
+fn linux_window_attributes_use_packaged_desktop_id() {
+    for wayland in [true, false] {
+        let attrs = linux_window_identity(WindowAttributes::default(), wayland);
+        assert!(format!("{attrs:?}").contains(NEOMACS_APPLICATION.app_id().as_str()));
+    }
+}
diff --git a/crates/neomacs-display-runtime/src/thread_comm.rs b/crates/neomacs-display-runtime/src/thread_comm.rs
index 4ae61bb468..736c2bb092 100644
--- a/crates/neomacs-display-runtime/src/thread_comm.rs
+++ b/crates/neomacs-display-runtime/src/thread_comm.rs
@@ -1271,6 +1271,7 @@ impl RenderComms {
 }
 
 #[cfg(test)]
+#[path = "thread_comm/tests/thread_comm_test.rs"]
 mod tests;
 
 #[cfg(test)]
diff --git a/crates/neomacs-display-runtime/src/thread_comm/frame_opacity.rs b/crates/neomacs-display-runtime/src/thread_comm/frame_opacity.rs
index e5397c3fff..1ca0e57cfe 100644
--- a/crates/neomacs-display-runtime/src/thread_comm/frame_opacity.rs
+++ b/crates/neomacs-display-runtime/src/thread_comm/frame_opacity.rs
@@ -113,5 +113,5 @@ impl FrameOpacityState {
 }
 
 #[cfg(test)]
-#[path = "frame_opacity/tests/mod.rs"]
+#[path = "frame_opacity/tests/frame_opacity_test.rs"]
 mod tests;
diff --git a/crates/neomacs-display-runtime/src/thread_comm/frame_opacity/tests/mod.rs b/crates/neomacs-display-runtime/src/thread_comm/frame_opacity/tests/frame_opacity_test.rs
similarity index 100%
rename from crates/neomacs-display-runtime/src/thread_comm/frame_opacity/tests/mod.rs
rename to crates/neomacs-display-runtime/src/thread_comm/frame_opacity/tests/frame_opacity_test.rs
diff --git a/crates/neomacs-display-runtime/src/thread_comm/tests/mod.rs b/crates/neomacs-display-runtime/src/thread_comm/tests/thread_comm_test.rs
similarity index 100%
rename from crates/neomacs-display-runtime/src/thread_comm/tests/mod.rs
rename to crates/neomacs-display-runtime/src/thread_comm/tests/thread_comm_test.rs
diff --git a/crates/neomacs-display-runtime/src/window_icon.rs b/crates/neomacs-display-runtime/src/window_icon.rs
index 34f0592e30..1ca05d575d 100644
--- a/crates/neomacs-display-runtime/src/window_icon.rs
+++ b/crates/neomacs-display-runtime/src/window_icon.rs
@@ -132,48 +132,5 @@ impl WindowIconService {
 }
 
 #[cfg(all(test, target_os = "linux"))]
-mod tests {
-    use super::*;
-
-    fn dark_pixel_count(
-        icon: &RasterizedWindowIcon,
-        x_range: std::ops::Range<u32>,
-        y_range: std::ops::Range<u32>,
-    ) -> usize {
-        y_range
-            .flat_map(|y| x_range.clone().map(move |x| (x, y)))
-            .filter(|&(x, y)| {
-                let offset = ((y * icon.width + x) * 4) as usize;
-                let [red, green, blue, alpha] = icon.premultiplied_rgba[offset..offset + 4] else {
-                    unreachable!("each icon pixel has four channels")
-                };
-                alpha > 200 && red < 50 && green < 50 && blue < 50
-            })
-            .count()
-    }
-
-    #[test]
-    fn canonical_icon_raster_keeps_both_lambda_marks_without_fonts() {
-        let icon = load_window_icon().expect("decode canonical SVG without a font database");
-
-        assert!(
-            dark_pixel_count(&icon, 125..200, 65..140) > 350,
-            "the purple lobe must retain its vector lambda mark"
-        );
-        assert!(
-            dark_pixel_count(&icon, 45..130, 130..200) > 350,
-            "the orange lobe must retain its vector lambda mark"
-        );
-    }
-
-    #[test]
-    fn wayland_argb8888_preserves_premultiplied_color_in_native_byte_order() {
-        let icon = RasterizedWindowIcon {
-            width: 1,
-            height: 1,
-            premultiplied_rgba: vec![0x11, 0x22, 0x33, 0x44],
-        };
-
-        assert_eq!(icon.to_wayland_argb8888(), 0x4411_2233_u32.to_ne_bytes());
-    }
-}
+#[path = "tests/window_icon_test.rs"]
+mod tests;
diff --git a/crates/neomacs-display-runtime/src/window_identity.rs b/crates/neomacs-display-runtime/src/window_identity.rs
index 68e429402f..67ad9ea200 100644
--- a/crates/neomacs-display-runtime/src/window_identity.rs
+++ b/crates/neomacs-display-runtime/src/window_identity.rs
@@ -118,28 +118,5 @@ pub(crate) fn apply_platform_window_identity(
 }
 
 #[cfg(all(test, target_os = "linux"))]
-mod tests {
-    use super::*;
-
-    #[test]
-    fn packaged_desktop_entry_matches_typed_runtime_identity() {
-        let desktop_entry = include_str!("../assets/neomacs.desktop");
-
-        assert_eq!(NEOMACS_APPLICATION.app_id().as_str(), "neomacs");
-        assert_eq!(
-            NEOMACS_APPLICATION.desktop_file_id().as_str(),
-            "neomacs.desktop"
-        );
-        assert_eq!(NEOMACS_APPLICATION.icon_name().as_str(), "neomacs");
-        assert!(desktop_entry.contains("\nIcon=neomacs\n"));
-        assert!(desktop_entry.contains("\nStartupWMClass=neomacs\n"));
-    }
-
-    #[test]
-    fn linux_window_attributes_use_packaged_desktop_id() {
-        for wayland in [true, false] {
-            let attrs = linux_window_identity(WindowAttributes::default(), wayland);
-            assert!(format!("{attrs:?}").contains(NEOMACS_APPLICATION.app_id().as_str()));
-        }
-    }
-}
+#[path = "tests/window_identity_test.rs"]
+mod tests;
diff --git a/crates/neomacs-font-materializer/src/fontdb.rs b/crates/neomacs-font-materializer/src/fontdb.rs
index 315fcb6424..94611daaaf 100644
--- a/crates/neomacs-font-materializer/src/fontdb.rs
+++ b/crates/neomacs-font-materializer/src/fontdb.rs
@@ -865,4 +865,5 @@ impl FontFileCache {
 }
 
 #[cfg(test)]
+#[path = "fontdb/tests/fontdb_test.rs"]
 mod tests;
diff --git a/crates/neomacs-font-materializer/src/fontdb/tests/mod.rs b/crates/neomacs-font-materializer/src/fontdb/tests/fontdb_test.rs
similarity index 100%
rename from crates/neomacs-font-materializer/src/fontdb/tests/mod.rs
rename to crates/neomacs-font-materializer/src/fontdb/tests/fontdb_test.rs
diff --git a/crates/neomacs-layout-engine/src/bidi/reorder.rs b/crates/neomacs-layout-engine/src/bidi/reorder.rs
index d2451f755b..ec24728c1b 100644
--- a/crates/neomacs-layout-engine/src/bidi/reorder.rs
+++ b/crates/neomacs-layout-engine/src/bidi/reorder.rs
@@ -89,4 +89,5 @@ pub fn reorder_line(chars: &[char], levels: &[u8]) -> Vec<char> {
 }
 
 #[cfg(test)]
+#[path = "reorder/tests/reorder_test.rs"]
 mod tests;
diff --git a/crates/neomacs-layout-engine/src/bidi/reorder/tests/mod.rs b/crates/neomacs-layout-engine/src/bidi/reorder/tests/reorder_test.rs
similarity index 100%
rename from crates/neomacs-layout-engine/src/bidi/reorder/tests/mod.rs
rename to crates/neomacs-layout-engine/src/bidi/reorder/tests/reorder_test.rs
diff --git a/crates/neomacs-layout-engine/src/bidi/resolver.rs b/crates/neomacs-layout-engine/src/bidi/resolver.rs
index 9f35d46f56..696b5ea1e0 100644
--- a/crates/neomacs-layout-engine/src/bidi/resolver.rs
+++ b/crates/neomacs-layout-engine/src/bidi/resolver.rs
@@ -827,4 +827,5 @@ fn least_even_greater_than(level: u8) -> u8 {
 }
 
 #[cfg(test)]
+#[path = "resolver/tests/resolver_test.rs"]
 mod tests;
diff --git a/crates/neomacs-layout-engine/src/bidi/resolver/tests/mod.rs b/crates/neomacs-layout-engine/src/bidi/resolver/tests/resolver_test.rs
similarity index 100%
rename from crates/neomacs-layout-engine/src/bidi/resolver/tests/mod.rs
rename to crates/neomacs-layout-engine/src/bidi/resolver/tests/resolver_test.rs
diff --git a/crates/neomacs-layout-engine/src/bidi/tables.rs b/crates/neomacs-layout-engine/src/bidi/tables.rs
index 905825501d..52e1c1a71c 100644
--- a/crates/neomacs-layout-engine/src/bidi/tables.rs
+++ b/crates/neomacs-layout-engine/src/bidi/tables.rs
@@ -846,4 +846,5 @@ pub fn canonical_bracket(ch: char) -> char {
 }
 
 #[cfg(test)]
+#[path = "tables/tests/tables_test.rs"]
 mod tests;
diff --git a/crates/neomacs-layout-engine/src/bidi/tables/tests/mod.rs b/crates/neomacs-layout-engine/src/bidi/tables/tests/tables_test.rs
similarity index 100%
rename from crates/neomacs-layout-engine/src/bidi/tables/tests/mod.rs
rename to crates/neomacs-layout-engine/src/bidi/tables/tests/tables_test.rs
diff --git a/crates/neomacs-layout-engine/src/bidi/types.rs b/crates/neomacs-layout-engine/src/bidi/types.rs
index d8dbf9f979..717743b8e5 100644
--- a/crates/neomacs-layout-engine/src/bidi/types.rs
+++ b/crates/neomacs-layout-engine/src/bidi/types.rs
@@ -211,4 +211,5 @@ pub const MAX_DEPTH: u8 = 125;
 pub const MAX_BPA_STACK: usize = 63;
 
 #[cfg(test)]
+#[path = "types/tests/types_test.rs"]
 mod tests;
diff --git a/crates/neomacs-layout-engine/src/bidi/types/tests/mod.rs b/crates/neomacs-layout-engine/src/bidi/types/tests/types_test.rs
similarity index 100%
rename from crates/neomacs-layout-engine/src/bidi/types/tests/mod.rs
rename to crates/neomacs-layout-engine/src/bidi/types/tests/types_test.rs
diff --git a/crates/neomacs-layout-engine/src/buffer_source/body_render.rs b/crates/neomacs-layout-engine/src/buffer_source/body_render.rs
index 4a34a268a2..255bc5399c 100644
--- a/crates/neomacs-layout-engine/src/buffer_source/body_render.rs
+++ b/crates/neomacs-layout-engine/src/buffer_source/body_render.rs
@@ -567,5 +567,5 @@ impl BufferSourceWalkSetup {
 }
 
 #[cfg(test)]
-#[path = "body_render/tests/mini_row_storage.rs"]
+#[path = "body_render/tests/mini_row_storage_test.rs"]
 mod mini_row_storage_tests;
diff --git a/crates/neomacs-layout-engine/src/buffer_source/body_render/tests/mini_row_storage.rs b/crates/neomacs-layout-engine/src/buffer_source/body_render/tests/mini_row_storage_test.rs
similarity index 100%
rename from crates/neomacs-layout-engine/src/buffer_source/body_render/tests/mini_row_storage.rs
rename to crates/neomacs-layout-engine/src/buffer_source/body_render/tests/mini_row_storage_test.rs
diff --git a/crates/neomacs-layout-engine/src/buffer_source/end_of_buffer_rows.rs b/crates/neomacs-layout-engine/src/buffer_source/end_of_buffer_rows.rs
index 5344d14601..0c690d50cb 100644
--- a/crates/neomacs-layout-engine/src/buffer_source/end_of_buffer_rows.rs
+++ b/crates/neomacs-layout-engine/src/buffer_source/end_of_buffer_rows.rs
@@ -363,4 +363,5 @@ enum EmptyLineFringeSide {
 }
 
 #[cfg(test)]
+#[path = "end_of_buffer_rows/tests/end_of_buffer_rows_test.rs"]
 mod tests;
diff --git a/crates/neomacs-layout-engine/src/buffer_source/end_of_buffer_rows/tests/mod.rs b/crates/neomacs-layout-engine/src/buffer_source/end_of_buffer_rows/tests/end_of_buffer_rows_test.rs
similarity index 100%
rename from crates/neomacs-layout-engine/src/buffer_source/end_of_buffer_rows/tests/mod.rs
rename to crates/neomacs-layout-engine/src/buffer_source/end_of_buffer_rows/tests/end_of_buffer_rows_test.rs
diff --git a/crates/neomacs-layout-engine/src/buffer_source/fringe_arrows.rs b/crates/neomacs-layout-engine/src/buffer_source/fringe_arrows.rs
index 7e82eb0d94..d3426a1851 100644
--- a/crates/neomacs-layout-engine/src/buffer_source/fringe_arrows.rs
+++ b/crates/neomacs-layout-engine/src/buffer_source/fringe_arrows.rs
@@ -335,4 +335,5 @@ impl DisplayWindowRowMutation for ResolvedFringeArrowRowMutation {
 }
 
 #[cfg(test)]
+#[path = "fringe_arrows/tests/fringe_arrows_test.rs"]
 mod tests;
diff --git a/crates/neomacs-layout-engine/src/buffer_source/fringe_arrows/tests/mod.rs b/crates/neomacs-layout-engine/src/buffer_source/fringe_arrows/tests/fringe_arrows_test.rs
similarity index 100%
rename from crates/neomacs-layout-engine/src/buffer_source/fringe_arrows/tests/mod.rs
rename to crates/neomacs-layout-engine/src/buffer_source/fringe_arrows/tests/fringe_arrows_test.rs
diff --git a/crates/neomacs-layout-engine/src/buffer_source/owned_capture.rs b/crates/neomacs-layout-engine/src/buffer_source/owned_capture.rs
index 5e033c5991..600b0535fb 100644
--- a/crates/neomacs-layout-engine/src/buffer_source/owned_capture.rs
+++ b/crates/neomacs-layout-engine/src/buffer_source/owned_capture.rs
@@ -436,111 +436,8 @@ fn literal_raise_or_nil(value: Value) -> bool {
 }
 
 #[cfg(test)]
-mod tests {
-    use super::*;
-    use crate::display_row::face_state::{DisplayRowMeasurementMode, DisplayRowMeasurementPolicy};
-    use crate::display_row::metrics::DisplayRowFallbackMetrics;
-    use crate::neovm_bridge::{FaceResolver, LayoutBufferSnapshot};
-    use neomacs_display_protocol::types::FaceId;
-    use neovm_core::emacs_core::Context;
-    use neovm_core::face::FaceTable;
-
-    fn capture(text: &str, chars: usize) -> Result<CapturedPhysicalLine, RowProgramError> {
-        capture_with_properties(text, chars, None)
-    }
-
-    fn capture_with_properties(
-        text: &str,
-        chars: usize,
-        property_start: Option<usize>,
-    ) -> Result<CapturedPhysicalLine, RowProgramError> {
-        let mut eval = Context::new();
-        let buffer = eval.buffer_manager_mut().current_buffer_mut().unwrap();
-        buffer.insert(text);
-        if let Some(start) = property_start {
-            buffer.text_props_put_property_in_emacs_byte_range(
-                EmacsByteRange::new(EmacsBytePos::new(start), EmacsBytePos::new(text.len())),
-                Value::symbol("display"),
-                Value::string("replacement"),
-            );
-        }
-        let id = buffer.id();
-        let snapshot = LayoutBufferSnapshot::from_buffer(buffer);
-        let resolver = FaceResolver::new(&FaceTable::new(), 0xffffff, 0, 14.0, None);
-        let metrics = DisplayRowFallbackMetrics::from_default_face_extents(8.0, 16.0, 12.0);
-        let context = BufferSourceFaceResolutionContext::new(
-            &snapshot,
-            &resolver,
-            DisplayRowMeasurementPolicy::for_mode(DisplayRowMeasurementMode::ConcreteFont),
-            resolver.default_face(),
-            FaceId::new(1),
-            metrics,
-            metrics,
-            Default::default(),
-        );
-        capture_physical_line(
-            id,
-            1,
-            CharPos0::ZERO,
-            chars,
-            16,
-            context,
-            &mut FrameFaceAttempt::for_test_with_next_id(2),
-            || false,
-        )
-    }
-
-    #[test]
-    fn later_line_replacement_does_not_reject_complete_plain_line() {
-        let line = capture_with_properties("好a\nreplaced\n", 32, Some(5)).unwrap();
-        assert_eq!(line.end, CharPos0::new(3));
-        assert!(matches!(
-            capture_with_properties("好a\nreplaced\n", 32, Some(3)),
-            Err(RowProgramError::Unsupported)
-        ));
-    }
-
-    #[test]
-    fn acquisition_stops_before_copying_a_huge_physical_line() {
-        assert!(matches!(
-            capture(&"a".repeat(1_000_000), 32),
-            Err(RowProgramError::Incomplete)
-        ));
-    }
-
-    #[test]
-    fn complete_line_capture_keeps_canonical_source_positions() {
-        let line = capture("a好b\nnext\n", 16).unwrap();
-        assert_eq!(line.end, CharPos0::new(4));
-        assert!(matches!(
-            line.items.last().unwrap().kind,
-            DisplayItemKind::RowBreak(_)
-        ));
-        let first = &line.items[0];
-        assert_eq!(
-            first.span.start,
-            crate::display_item::DisplaySourcePosition::buffer(
-                match first.span.start {
-                    crate::display_item::DisplaySourcePosition::Buffer { buffer_id, .. } =>
-                        buffer_id,
-                    _ => panic!("buffer provenance"),
-                },
-                CharPos0::ZERO,
-                neovm_core::buffer::EmacsBytePos::ZERO
-            )
-        );
-    }
-    #[test]
-    fn nobreak_text_requires_buffer_special_character_policy() {
-        for ch in ['\u{00a0}', '\u{00ad}', '\u{2011}'] {
-            let text = format!("before{ch}after\n");
-            assert!(
-                matches!(capture(&text, 32), Err(RowProgramError::Unsupported)),
-                "{ch:?}"
-            );
-        }
-    }
-}
+#[path = "tests/owned_capture_test.rs"]
+mod tests;
 
 fn literal_line_height(value: Value) -> bool {
     value.is_nil()
diff --git a/crates/neomacs-layout-engine/src/buffer_source/producer/mod.rs b/crates/neomacs-layout-engine/src/buffer_source/producer/mod.rs
index c2ead05e85..9170e7e879 100644
--- a/crates/neomacs-layout-engine/src/buffer_source/producer/mod.rs
+++ b/crates/neomacs-layout-engine/src/buffer_source/producer/mod.rs
@@ -360,6 +360,7 @@ impl<'request, B: LayoutBufferView> BufferElementProducer<'request, B> {
 }
 
 #[cfg(test)]
+#[path = "tests/producer_test.rs"]
 mod tests;
 
 #[cfg(test)]
diff --git a/crates/neomacs-layout-engine/src/buffer_source/producer/tests/mod.rs b/crates/neomacs-layout-engine/src/buffer_source/producer/tests/producer_test.rs
similarity index 100%
rename from crates/neomacs-layout-engine/src/buffer_source/producer/tests/mod.rs
rename to crates/neomacs-layout-engine/src/buffer_source/producer/tests/producer_test.rs
diff --git a/crates/neomacs-layout-engine/src/buffer_source/producer/vocabulary.rs b/crates/neomacs-layout-engine/src/buffer_source/producer/vocabulary.rs
index 175e7d67c1..d284562fa4 100644
--- a/crates/neomacs-layout-engine/src/buffer_source/producer/vocabulary.rs
+++ b/crates/neomacs-layout-engine/src/buffer_source/producer/vocabulary.rs
@@ -440,4 +440,5 @@ impl ProducedElement {
 }
 
 #[cfg(test)]
+#[path = "vocabulary/tests/vocabulary_test.rs"]
 mod tests;
diff --git a/crates/neomacs-layout-engine/src/buffer_source/producer/vocabulary/tests/mod.rs b/crates/neomacs-layout-engine/src/buffer_source/producer/vocabulary/tests/vocabulary_test.rs
similarity index 100%
rename from crates/neomacs-layout-engine/src/buffer_source/producer/vocabulary/tests/mod.rs
rename to crates/neomacs-layout-engine/src/buffer_source/producer/vocabulary/tests/vocabulary_test.rs
diff --git a/crates/neomacs-layout-engine/src/buffer_source/row_route/mod.rs b/crates/neomacs-layout-engine/src/buffer_source/row_route/mod.rs
index c3d8d215cf..d2fdd5c40b 100644
--- a/crates/neomacs-layout-engine/src/buffer_source/row_route/mod.rs
+++ b/crates/neomacs-layout-engine/src/buffer_source/row_route/mod.rs
@@ -618,4 +618,5 @@ impl PlainRowPlan {
 }
 
 #[cfg(test)]
+#[path = "tests/row_route_test.rs"]
 mod tests;
diff --git a/crates/neomacs-layout-engine/src/buffer_source/row_route/tests/mod.rs b/crates/neomacs-layout-engine/src/buffer_source/row_route/tests/row_route_test.rs
similarity index 100%
rename from crates/neomacs-layout-engine/src/buffer_source/row_route/tests/mod.rs
rename to crates/neomacs-layout-engine/src/buffer_source/row_route/tests/row_route_test.rs
diff --git a/crates/neomacs-layout-engine/src/buffer_source/tests/owned_capture_test.rs b/crates/neomacs-layout-engine/src/buffer_source/tests/owned_capture_test.rs
new file mode 100644
index 0000000000..a835136b26
--- /dev/null
+++ b/crates/neomacs-layout-engine/src/buffer_source/tests/owned_capture_test.rs
@@ -0,0 +1,102 @@
+use super::*;
+use crate::display_row::face_state::{DisplayRowMeasurementMode, DisplayRowMeasurementPolicy};
+use crate::display_row::metrics::DisplayRowFallbackMetrics;
+use crate::neovm_bridge::{FaceResolver, LayoutBufferSnapshot};
+use neomacs_display_protocol::types::FaceId;
+use neovm_core::emacs_core::Context;
+use neovm_core::face::FaceTable;
+
+fn capture(text: &str, chars: usize) -> Result<CapturedPhysicalLine, RowProgramError> {
+    capture_with_properties(text, chars, None)
+}
+
+fn capture_with_properties(
+    text: &str,
+    chars: usize,
+    property_start: Option<usize>,
+) -> Result<CapturedPhysicalLine, RowProgramError> {
+    let mut eval = Context::new();
+    let buffer = eval.buffer_manager_mut().current_buffer_mut().unwrap();
+    buffer.insert(text);
+    if let Some(start) = property_start {
+        buffer.text_props_put_property_in_emacs_byte_range(
+            EmacsByteRange::new(EmacsBytePos::new(start), EmacsBytePos::new(text.len())),
+            Value::symbol("display"),
+            Value::string("replacement"),
+        );
+    }
+    let id = buffer.id();
+    let snapshot = LayoutBufferSnapshot::from_buffer(buffer);
+    let resolver = FaceResolver::new(&FaceTable::new(), 0xffffff, 0, 14.0, None);
+    let metrics = DisplayRowFallbackMetrics::from_default_face_extents(8.0, 16.0, 12.0);
+    let context = BufferSourceFaceResolutionContext::new(
+        &snapshot,
+        &resolver,
+        DisplayRowMeasurementPolicy::for_mode(DisplayRowMeasurementMode::ConcreteFont),
+        resolver.default_face(),
+        FaceId::new(1),
+        metrics,
+        metrics,
+        Default::default(),
+    );
+    capture_physical_line(
+        id,
+        1,
+        CharPos0::ZERO,
+        chars,
+        16,
+        context,
+        &mut FrameFaceAttempt::for_test_with_next_id(2),
+        || false,
+    )
+}
+
+#[test]
+fn later_line_replacement_does_not_reject_complete_plain_line() {
+    let line = capture_with_properties("好a\nreplaced\n", 32, Some(5)).unwrap();
+    assert_eq!(line.end, CharPos0::new(3));
+    assert!(matches!(
+        capture_with_properties("好a\nreplaced\n", 32, Some(3)),
+        Err(RowProgramError::Unsupported)
+    ));
+}
+
+#[test]
+fn acquisition_stops_before_copying_a_huge_physical_line() {
+    assert!(matches!(
+        capture(&"a".repeat(1_000_000), 32),
+        Err(RowProgramError::Incomplete)
+    ));
+}
+
+#[test]
+fn complete_line_capture_keeps_canonical_source_positions() {
+    let line = capture("a好b\nnext\n", 16).unwrap();
+    assert_eq!(line.end, CharPos0::new(4));
+    assert!(matches!(
+        line.items.last().unwrap().kind,
+        DisplayItemKind::RowBreak(_)
+    ));
+    let first = &line.items[0];
+    assert_eq!(
+        first.span.start,
+        crate::display_item::DisplaySourcePosition::buffer(
+            match first.span.start {
+                crate::display_item::DisplaySourcePosition::Buffer { buffer_id, .. } => buffer_id,
+                _ => panic!("buffer provenance"),
+            },
+            CharPos0::ZERO,
+            neovm_core::buffer::EmacsBytePos::ZERO
+        )
+    );
+}
+#[test]
+fn nobreak_text_requires_buffer_special_character_policy() {
+    for ch in ['\u{00a0}', '\u{00ad}', '\u{2011}'] {
+        let text = format!("before{ch}after\n");
+        assert!(
+            matches!(capture(&text, 32), Err(RowProgramError::Unsupported)),
+            "{ch:?}"
+        );
+    }
+}
diff --git a/crates/neomacs-layout-engine/src/buffer_source/tests/property_keys_budget_support.rs b/crates/neomacs-layout-engine/src/buffer_source/tests/property_keys_budget_support_test.rs
similarity index 100%
rename from crates/neomacs-layout-engine/src/buffer_source/tests/property_keys_budget_support.rs
rename to crates/neomacs-layout-engine/src/buffer_source/tests/property_keys_budget_support_test.rs
diff --git a/crates/neomacs-layout-engine/src/buffer_source/tests/source_budget_default_policy.rs b/crates/neomacs-layout-engine/src/buffer_source/tests/source_budget_default_policy_test.rs
similarity index 100%
rename from crates/neomacs-layout-engine/src/buffer_source/tests/source_budget_default_policy.rs
rename to crates/neomacs-layout-engine/src/buffer_source/tests/source_budget_default_policy_test.rs
diff --git a/crates/neomacs-layout-engine/src/buffer_source/tests/source_budget_policy_aliases.rs b/crates/neomacs-layout-engine/src/buffer_source/tests/source_budget_policy_aliases_test.rs
similarity index 100%
rename from crates/neomacs-layout-engine/src/buffer_source/tests/source_budget_policy_aliases.rs
rename to crates/neomacs-layout-engine/src/buffer_source/tests/source_budget_policy_aliases_test.rs
diff --git a/crates/neomacs-layout-engine/src/buffer_source/tests/window_source_tests.rs b/crates/neomacs-layout-engine/src/buffer_source/tests/window_source_test.rs
similarity index 100%
rename from crates/neomacs-layout-engine/src/buffer_source/tests/window_source_tests.rs
rename to crates/neomacs-layout-engine/src/buffer_source/tests/window_source_test.rs
diff --git a/crates/neomacs-layout-engine/src/buffer_source/window_geometry.rs b/crates/neomacs-layout-engine/src/buffer_source/window_geometry.rs
index e3d1a1d046..33b16974a7 100644
--- a/crates/neomacs-layout-engine/src/buffer_source/window_geometry.rs
+++ b/crates/neomacs-layout-engine/src/buffer_source/window_geometry.rs
@@ -477,4 +477,5 @@ impl BufferWindowLocalDisplayPolicy {
 }
 
 #[cfg(test)]
+#[path = "window_geometry/tests/window_geometry_test.rs"]
 mod tests;
diff --git a/crates/neomacs-layout-engine/src/buffer_source/window_geometry/tests/mod.rs b/crates/neomacs-layout-engine/src/buffer_source/window_geometry/tests/window_geometry_test.rs
similarity index 100%
rename from crates/neomacs-layout-engine/src/buffer_source/window_geometry/tests/mod.rs
rename to crates/neomacs-layout-engine/src/buffer_source/window_geometry/tests/window_geometry_test.rs
diff --git a/crates/neomacs-layout-engine/src/buffer_source/window_source.rs b/crates/neomacs-layout-engine/src/buffer_source/window_source.rs
index 3ba412d7e1..dc8a424cb5 100644
--- a/crates/neomacs-layout-engine/src/buffer_source/window_source.rs
+++ b/crates/neomacs-layout-engine/src/buffer_source/window_source.rs
@@ -13,11 +13,11 @@ use crate::types::{PartialBodyWalkStart, WindowKind, WindowParams};
 use neovm_core::buffer::{CharPos0, EmacsBytePos, TextPositionAnchor};
 
 #[cfg(test)]
-#[path = "tests/window_source_tests.rs"]
+#[path = "tests/window_source_test.rs"]
 mod bounded_read_tests;
 
 #[cfg(test)]
-#[path = "tests/property_keys_budget_support.rs"]
+#[path = "tests/property_keys_budget_support_test.rs"]
 pub(crate) mod property_keys_budget_support;
 
 /// Numeric source-copy policy. This carries no Lisp state and is owned by
@@ -663,12 +663,13 @@ impl BufferWindowSourceRequest {
 }
 
 #[cfg(test)]
+#[path = "window_source/tests/window_source_test.rs"]
 mod tests;
 
 #[cfg(test)]
-#[path = "tests/source_budget_policy_aliases.rs"]
+#[path = "tests/source_budget_policy_aliases_test.rs"]
 mod source_budget_policy_aliases_tests;
 
 #[cfg(test)]
-#[path = "tests/source_budget_default_policy.rs"]
+#[path = "tests/source_budget_default_policy_test.rs"]
 mod source_budget_default_policy_tests;
diff --git a/crates/neomacs-layout-engine/src/buffer_source/window_source/tests/mod.rs b/crates/neomacs-layout-engine/src/buffer_source/window_source/tests/window_source_test.rs
similarity index 100%
rename from crates/neomacs-layout-engine/src/buffer_source/window_source/tests/mod.rs
rename to crates/neomacs-layout-engine/src/buffer_source/window_source/tests/window_source_test.rs
diff --git a/crates/neomacs-layout-engine/src/composition.rs b/crates/neomacs-layout-engine/src/composition.rs
index ce96e5daac..912c6927e8 100644
--- a/crates/neomacs-layout-engine/src/composition.rs
+++ b/crates/neomacs-layout-engine/src/composition.rs
@@ -216,4 +216,5 @@ pub(crate) fn needs_complex_shaping(ch: char) -> bool {
 }
 
 #[cfg(test)]
+#[path = "composition/tests/composition_test.rs"]
 mod tests;
diff --git a/crates/neomacs-layout-engine/src/composition/tests/mod.rs b/crates/neomacs-layout-engine/src/composition/tests/composition_test.rs
similarity index 100%
rename from crates/neomacs-layout-engine/src/composition/tests/mod.rs
rename to crates/neomacs-layout-engine/src/composition/tests/composition_test.rs
diff --git a/crates/neomacs-layout-engine/src/display_face_layout.rs b/crates/neomacs-layout-engine/src/display_face_layout.rs
index 150012b045..63f38af1f6 100644
--- a/crates/neomacs-layout-engine/src/display_face_layout.rs
+++ b/crates/neomacs-layout-engine/src/display_face_layout.rs
@@ -89,4 +89,5 @@ fn positive_f32(value: f32) -> Option<f32> {
 }
 
 #[cfg(test)]
+#[path = "display_face_layout/tests/display_face_layout_test.rs"]
 mod tests;
diff --git a/crates/neomacs-layout-engine/src/display_face_layout/tests/mod.rs b/crates/neomacs-layout-engine/src/display_face_layout/tests/display_face_layout_test.rs
similarity index 100%
rename from crates/neomacs-layout-engine/src/display_face_layout/tests/mod.rs
rename to crates/neomacs-layout-engine/src/display_face_layout/tests/display_face_layout_test.rs
diff --git a/crates/neomacs-layout-engine/src/display_frame_output.rs b/crates/neomacs-layout-engine/src/display_frame_output.rs
index 5ed60d1034..71657a653b 100644
--- a/crates/neomacs-layout-engine/src/display_frame_output.rs
+++ b/crates/neomacs-layout-engine/src/display_frame_output.rs
@@ -1091,4 +1091,5 @@ impl WindowScrollBarMetrics {
 }
 
 #[cfg(test)]
+#[path = "display_frame_output/tests/display_frame_output_test.rs"]
 mod tests;
diff --git a/crates/neomacs-layout-engine/src/display_frame_output/tests/mod.rs b/crates/neomacs-layout-engine/src/display_frame_output/tests/display_frame_output_test.rs
similarity index 100%
rename from crates/neomacs-layout-engine/src/display_frame_output/tests/mod.rs
rename to crates/neomacs-layout-engine/src/display_frame_output/tests/display_frame_output_test.rs
diff --git a/crates/neomacs-layout-engine/src/display_item.rs b/crates/neomacs-layout-engine/src/display_item.rs
index f81c4b7c72..5cbff7b88e 100644
--- a/crates/neomacs-layout-engine/src/display_item.rs
+++ b/crates/neomacs-layout-engine/src/display_item.rs
@@ -1684,4 +1684,5 @@ impl DisplayRowBreak {
 }
 
 #[cfg(test)]
+#[path = "display_item/tests/display_item_test.rs"]
 mod tests;
diff --git a/crates/neomacs-layout-engine/src/display_item/tests/mod.rs b/crates/neomacs-layout-engine/src/display_item/tests/display_item_test.rs
similarity index 100%
rename from crates/neomacs-layout-engine/src/display_item/tests/mod.rs
rename to crates/neomacs-layout-engine/src/display_item/tests/display_item_test.rs
diff --git a/crates/neomacs-layout-engine/src/display_pixel_calc.rs b/crates/neomacs-layout-engine/src/display_pixel_calc.rs
index 1b66ac08c4..fe66171261 100644
--- a/crates/neomacs-layout-engine/src/display_pixel_calc.rs
+++ b/crates/neomacs-layout-engine/src/display_pixel_calc.rs
@@ -868,4 +868,5 @@ fn as_f64(v: &Value) -> Option<f64> {
 // ---------------------------------------------------------------------------
 
 #[cfg(test)]
+#[path = "display_pixel_calc/tests/display_pixel_calc_test.rs"]
 mod tests;
diff --git a/crates/neomacs-layout-engine/src/display_pixel_calc/tests/mod.rs b/crates/neomacs-layout-engine/src/display_pixel_calc/tests/display_pixel_calc_test.rs
similarity index 100%
rename from crates/neomacs-layout-engine/src/display_pixel_calc/tests/mod.rs
rename to crates/neomacs-layout-engine/src/display_pixel_calc/tests/display_pixel_calc_test.rs
diff --git a/crates/neomacs-layout-engine/src/display_property.rs b/crates/neomacs-layout-engine/src/display_property.rs
index d693f6f4af..5116d46842 100644
--- a/crates/neomacs-layout-engine/src/display_property.rs
+++ b/crates/neomacs-layout-engine/src/display_property.rs
@@ -672,4 +672,5 @@ fn lisp_number(value: Value) -> Option<f32> {
 }
 
 #[cfg(test)]
+#[path = "display_property/tests/display_property_test.rs"]
 mod tests;
diff --git a/crates/neomacs-layout-engine/src/display_property/tests/mod.rs b/crates/neomacs-layout-engine/src/display_property/tests/display_property_test.rs
similarity index 100%
rename from crates/neomacs-layout-engine/src/display_property/tests/mod.rs
rename to crates/neomacs-layout-engine/src/display_property/tests/display_property_test.rs
diff --git a/crates/neomacs-layout-engine/src/display_row/builder.rs b/crates/neomacs-layout-engine/src/display_row/builder.rs
index 60cae4d637..b7255993cc 100644
--- a/crates/neomacs-layout-engine/src/display_row/builder.rs
+++ b/crates/neomacs-layout-engine/src/display_row/builder.rs
@@ -3284,4 +3284,5 @@ fn source_span_start_char(span: &SourceSpan) -> usize {
 }
 
 #[cfg(test)]
+#[path = "builder/tests/builder_test.rs"]
 mod tests;
diff --git a/crates/neomacs-layout-engine/src/display_row/builder/tests/mod.rs b/crates/neomacs-layout-engine/src/display_row/builder/tests/builder_test.rs
similarity index 100%
rename from crates/neomacs-layout-engine/src/display_row/builder/tests/mod.rs
rename to crates/neomacs-layout-engine/src/display_row/builder/tests/builder_test.rs
diff --git a/crates/neomacs-layout-engine/src/display_row/finalizer.rs b/crates/neomacs-layout-engine/src/display_row/finalizer.rs
index de0832ddf1..48260f7c6f 100644
--- a/crates/neomacs-layout-engine/src/display_row/finalizer.rs
+++ b/crates/neomacs-layout-engine/src/display_row/finalizer.rs
@@ -500,6 +500,7 @@ impl<'cursor> GlyphRowFinalizer<'cursor> {
 }
 
 #[cfg(test)]
+#[path = "finalizer/tests/finalizer_test.rs"]
 mod tests;
 
 #[cfg(test)]
diff --git a/crates/neomacs-layout-engine/src/display_row/finalizer/tests/mod.rs b/crates/neomacs-layout-engine/src/display_row/finalizer/tests/finalizer_test.rs
similarity index 100%
rename from crates/neomacs-layout-engine/src/display_row/finalizer/tests/mod.rs
rename to crates/neomacs-layout-engine/src/display_row/finalizer/tests/finalizer_test.rs
diff --git a/crates/neomacs-layout-engine/src/display_row/geometry.rs b/crates/neomacs-layout-engine/src/display_row/geometry.rs
index 4c7aef0169..d642e2aadf 100644
--- a/crates/neomacs-layout-engine/src/display_row/geometry.rs
+++ b/crates/neomacs-layout-engine/src/display_row/geometry.rs
@@ -1140,4 +1140,5 @@ impl DisplayRowGeometryCursor {
 }
 
 #[cfg(test)]
+#[path = "geometry/tests/geometry_test.rs"]
 mod tests;
diff --git a/crates/neomacs-layout-engine/src/display_row/geometry/tests/mod.rs b/crates/neomacs-layout-engine/src/display_row/geometry/tests/geometry_test.rs
similarity index 100%
rename from crates/neomacs-layout-engine/src/display_row/geometry/tests/mod.rs
rename to crates/neomacs-layout-engine/src/display_row/geometry/tests/geometry_test.rs
diff --git a/crates/neomacs-layout-engine/src/display_row/mod.rs b/crates/neomacs-layout-engine/src/display_row/mod.rs
index da56449344..193577e5a2 100644
--- a/crates/neomacs-layout-engine/src/display_row/mod.rs
+++ b/crates/neomacs-layout-engine/src/display_row/mod.rs
@@ -1352,7 +1352,7 @@ impl<'metrics> DisplayRowRenderer<'metrics> {
 }
 
 #[cfg(test)]
-#[path = "test.rs"]
+#[path = "tests/display_row_test.rs"]
 mod tests;
 
 // Submodules of the display_row family (moved from flat crate root).
diff --git a/crates/neomacs-layout-engine/src/display_row/source_append.rs b/crates/neomacs-layout-engine/src/display_row/source_append.rs
index 25f3373ffe..498ded7f50 100644
--- a/crates/neomacs-layout-engine/src/display_row/source_append.rs
+++ b/crates/neomacs-layout-engine/src/display_row/source_append.rs
@@ -782,4 +782,5 @@ pub(crate) fn display_item_append_kind(
 }
 
 #[cfg(test)]
+#[path = "source_append/tests/source_append_test.rs"]
 mod tests;
diff --git a/crates/neomacs-layout-engine/src/display_row/source_append/tests/mod.rs b/crates/neomacs-layout-engine/src/display_row/source_append/tests/source_append_test.rs
similarity index 100%
rename from crates/neomacs-layout-engine/src/display_row/source_append/tests/mod.rs
rename to crates/neomacs-layout-engine/src/display_row/source_append/tests/source_append_test.rs
diff --git a/crates/neomacs-layout-engine/src/display_row/source_render.rs b/crates/neomacs-layout-engine/src/display_row/source_render.rs
index 3919fa92b6..d2c080f43f 100644
--- a/crates/neomacs-layout-engine/src/display_row/source_render.rs
+++ b/crates/neomacs-layout-engine/src/display_row/source_render.rs
@@ -1950,4 +1950,5 @@ fn current_text_measure_state<'emit>(
 }
 
 #[cfg(test)]
+#[path = "source_render/tests/source_render_test.rs"]
 mod tests;
diff --git a/crates/neomacs-layout-engine/src/display_row/source_render/tests/mod.rs b/crates/neomacs-layout-engine/src/display_row/source_render/tests/source_render_test.rs
similarity index 100%
rename from crates/neomacs-layout-engine/src/display_row/source_render/tests/mod.rs
rename to crates/neomacs-layout-engine/src/display_row/source_render/tests/source_render_test.rs
diff --git a/crates/neomacs-layout-engine/src/display_row/source_state.rs b/crates/neomacs-layout-engine/src/display_row/source_state.rs
index 76534301b1..1673fda8af 100644
--- a/crates/neomacs-layout-engine/src/display_row/source_state.rs
+++ b/crates/neomacs-layout-engine/src/display_row/source_state.rs
@@ -124,5 +124,5 @@ impl DisplayRowSourceState {
 }
 
 #[cfg(test)]
-#[path = "source_state/tests/mod.rs"]
+#[path = "source_state/tests/source_state_test.rs"]
 mod tests;
diff --git a/crates/neomacs-layout-engine/src/display_row/source_state/tests/mod.rs b/crates/neomacs-layout-engine/src/display_row/source_state/tests/source_state_test.rs
similarity index 100%
rename from crates/neomacs-layout-engine/src/display_row/source_state/tests/mod.rs
rename to crates/neomacs-layout-engine/src/display_row/source_state/tests/source_state_test.rs
diff --git a/crates/neomacs-layout-engine/src/display_row/test.rs b/crates/neomacs-layout-engine/src/display_row/tests/display_row_test.rs
similarity index 100%
rename from crates/neomacs-layout-engine/src/display_row/test.rs
rename to crates/neomacs-layout-engine/src/display_row/tests/display_row_test.rs
diff --git a/crates/neomacs-layout-engine/src/display_row/trailing_whitespace.rs b/crates/neomacs-layout-engine/src/display_row/trailing_whitespace.rs
index 339795e756..507974b065 100644
--- a/crates/neomacs-layout-engine/src/display_row/trailing_whitespace.rs
+++ b/crates/neomacs-layout-engine/src/display_row/trailing_whitespace.rs
@@ -84,4 +84,5 @@ impl DisplayCurrentRowMutation for HighlightTrailingWhitespaceMutation {
 }
 
 #[cfg(test)]
+#[path = "trailing_whitespace/tests/trailing_whitespace_test.rs"]
 mod tests;
diff --git a/crates/neomacs-layout-engine/src/display_row/trailing_whitespace/tests/mod.rs b/crates/neomacs-layout-engine/src/display_row/trailing_whitespace/tests/trailing_whitespace_test.rs
similarity index 100%
rename from crates/neomacs-layout-engine/src/display_row/trailing_whitespace/tests/mod.rs
rename to crates/neomacs-layout-engine/src/display_row/trailing_whitespace/tests/trailing_whitespace_test.rs
diff --git a/crates/neomacs-layout-engine/src/display_source.rs b/crates/neomacs-layout-engine/src/display_source.rs
index 4020a22191..c0510a3c4d 100644
--- a/crates/neomacs-layout-engine/src/display_source.rs
+++ b/crates/neomacs-layout-engine/src/display_source.rs
@@ -3980,4 +3980,5 @@ fn is_control_char(ch: char) -> bool {
 }
 
 #[cfg(test)]
+#[path = "display_source/tests/display_source_test.rs"]
 mod tests;
diff --git a/crates/neomacs-layout-engine/src/display_source/tests/mod.rs b/crates/neomacs-layout-engine/src/display_source/tests/display_source_test.rs
similarity index 100%
rename from crates/neomacs-layout-engine/src/display_source/tests/mod.rs
rename to crates/neomacs-layout-engine/src/display_source/tests/display_source_test.rs
diff --git a/crates/neomacs-layout-engine/src/display_source_overflow.rs b/crates/neomacs-layout-engine/src/display_source_overflow.rs
index 4a44ee6d51..9336bcd127 100644
--- a/crates/neomacs-layout-engine/src/display_source_overflow.rs
+++ b/crates/neomacs-layout-engine/src/display_source_overflow.rs
@@ -335,4 +335,5 @@ impl DisplayImageOverflowAction {
 }
 
 #[cfg(test)]
+#[path = "display_source_overflow/tests/display_source_overflow_test.rs"]
 mod tests;
diff --git a/crates/neomacs-layout-engine/src/display_source_overflow/tests/mod.rs b/crates/neomacs-layout-engine/src/display_source_overflow/tests/display_source_overflow_test.rs
similarity index 100%
rename from crates/neomacs-layout-engine/src/display_source_overflow/tests/mod.rs
rename to crates/neomacs-layout-engine/src/display_source_overflow/tests/display_source_overflow_test.rs
diff --git a/crates/neomacs-layout-engine/src/display_source_resolver/tests/compiled_collection_mutation.rs b/crates/neomacs-layout-engine/src/display_source_resolver/tests/compiled_collection_mutation_test.rs
similarity index 100%
rename from crates/neomacs-layout-engine/src/display_source_resolver/tests/compiled_collection_mutation.rs
rename to crates/neomacs-layout-engine/src/display_source_resolver/tests/compiled_collection_mutation_test.rs
diff --git a/crates/neomacs-layout-engine/src/display_source_resolver/tests/display_source_resolver_test.rs b/crates/neomacs-layout-engine/src/display_source_resolver/tests/display_source_resolver_test.rs
index 03e24b16e1..ea6ff80da4 100644
--- a/crates/neomacs-layout-engine/src/display_source_resolver/tests/display_source_resolver_test.rs
+++ b/crates/neomacs-layout-engine/src/display_source_resolver/tests/display_source_resolver_test.rs
@@ -5,7 +5,7 @@ use neovm_core::emacs_core::Context;
 use neovm_core::face::{Color as NeoColor, Face as NeoFace, FaceTable};
 
 #[cfg(test)]
-#[path = "compiled_collection_mutation.rs"]
+#[path = "compiled_collection_mutation_test.rs"]
 mod compiled_collection_mutation;
 
 fn test_buffer_snapshot() -> LayoutBufferSnapshot {
diff --git a/crates/neomacs-layout-engine/src/display_status_line.rs b/crates/neomacs-layout-engine/src/display_status_line.rs
index 2740ad59a7..d77b03e110 100644
--- a/crates/neomacs-layout-engine/src/display_status_line.rs
+++ b/crates/neomacs-layout-engine/src/display_status_line.rs
@@ -2453,4 +2453,5 @@ pub(crate) fn window_chrome_row_height_for_face_at_scale(
 }
 
 #[cfg(test)]
+#[path = "display_status_line/tests/display_status_line_test.rs"]
 mod tests;
diff --git a/crates/neomacs-layout-engine/src/display_status_line/tests/mod.rs b/crates/neomacs-layout-engine/src/display_status_line/tests/display_status_line_test.rs
similarity index 100%
rename from crates/neomacs-layout-engine/src/display_status_line/tests/mod.rs
rename to crates/neomacs-layout-engine/src/display_status_line/tests/display_status_line_test.rs
diff --git a/crates/neomacs-layout-engine/src/display_when.rs b/crates/neomacs-layout-engine/src/display_when.rs
index 79debcaf70..8fff558307 100644
--- a/crates/neomacs-layout-engine/src/display_when.rs
+++ b/crates/neomacs-layout-engine/src/display_when.rs
@@ -391,4 +391,5 @@ fn collect_prefix_string_when_forms(
 }
 
 #[cfg(test)]
+#[path = "display_when/tests/display_when_test.rs"]
 mod tests;
diff --git a/crates/neomacs-layout-engine/src/display_when/tests/mod.rs b/crates/neomacs-layout-engine/src/display_when/tests/display_when_test.rs
similarity index 100%
rename from crates/neomacs-layout-engine/src/display_when/tests/mod.rs
rename to crates/neomacs-layout-engine/src/display_when/tests/display_when_test.rs
diff --git a/crates/neomacs-layout-engine/src/engine.rs b/crates/neomacs-layout-engine/src/engine.rs
index 10931fe066..c5841ffa1f 100644
--- a/crates/neomacs-layout-engine/src/engine.rs
+++ b/crates/neomacs-layout-engine/src/engine.rs
@@ -5390,6 +5390,7 @@ impl LayoutEngine {
 }
 
 #[cfg(test)]
+#[path = "engine/tests/engine_test.rs"]
 mod tests;
 
 #[cfg(test)]
diff --git a/crates/neomacs-layout-engine/src/engine/mini_source_start.rs b/crates/neomacs-layout-engine/src/engine/mini_source_start.rs
index e5b9f8d1be..2ef9eb3c95 100644
--- a/crates/neomacs-layout-engine/src/engine/mini_source_start.rs
+++ b/crates/neomacs-layout-engine/src/engine/mini_source_start.rs
@@ -37,5 +37,5 @@ pub(super) fn aligned_after_string_start(
 }
 
 #[cfg(test)]
-#[path = "tests/mini_source_start.rs"]
+#[path = "tests/mini_source_start_test.rs"]
 mod tests;
diff --git a/crates/neomacs-layout-engine/src/engine/mini_source_stop.rs b/crates/neomacs-layout-engine/src/engine/mini_source_stop.rs
index db8a66ba87..679be7e3d6 100644
--- a/crates/neomacs-layout-engine/src/engine/mini_source_stop.rs
+++ b/crates/neomacs-layout-engine/src/engine/mini_source_stop.rs
@@ -52,5 +52,5 @@ pub(super) fn condition_end_boundary(
 }
 
 #[cfg(test)]
-#[path = "tests/mini_source_stop.rs"]
+#[path = "tests/mini_source_stop_test.rs"]
 mod tests;
diff --git a/crates/neomacs-layout-engine/src/engine/tests/edit_sync_engine_test.rs b/crates/neomacs-layout-engine/src/engine/tests/edit_sync_engine_test.rs
index ca63654d4b..894ae44c6d 100644
--- a/crates/neomacs-layout-engine/src/engine/tests/edit_sync_engine_test.rs
+++ b/crates/neomacs-layout-engine/src/engine/tests/edit_sync_engine_test.rs
@@ -768,9 +768,9 @@ fn source_budget_retry_restores_remapped_background_frame_artifacts() {
 }
 
 #[cfg(test)]
-#[path = "edit_sync_source_budget_consumers.rs"]
+#[path = "edit_sync_source_budget_consumers_test.rs"]
 mod source_budget_consumers;
 
 #[cfg(test)]
-#[path = "edit_sync_source_budget_replay_retry.rs"]
+#[path = "edit_sync_source_budget_replay_retry_test.rs"]
 mod source_budget_replay_retry;
diff --git a/crates/neomacs-layout-engine/src/engine/tests/edit_sync_source_budget_consumers.rs b/crates/neomacs-layout-engine/src/engine/tests/edit_sync_source_budget_consumers_test.rs
similarity index 100%
rename from crates/neomacs-layout-engine/src/engine/tests/edit_sync_source_budget_consumers.rs
rename to crates/neomacs-layout-engine/src/engine/tests/edit_sync_source_budget_consumers_test.rs
diff --git a/crates/neomacs-layout-engine/src/engine/tests/edit_sync_source_budget_replay_retry.rs b/crates/neomacs-layout-engine/src/engine/tests/edit_sync_source_budget_replay_retry_test.rs
similarity index 100%
rename from crates/neomacs-layout-engine/src/engine/tests/edit_sync_source_budget_replay_retry.rs
rename to crates/neomacs-layout-engine/src/engine/tests/edit_sync_source_budget_replay_retry_test.rs
diff --git a/crates/neomacs-layout-engine/src/engine/tests/mod.rs b/crates/neomacs-layout-engine/src/engine/tests/engine_test.rs
similarity index 99%
rename from crates/neomacs-layout-engine/src/engine/tests/mod.rs
rename to crates/neomacs-layout-engine/src/engine/tests/engine_test.rs
index fecf227f5f..209b4fd94f 100644
--- a/crates/neomacs-layout-engine/src/engine/tests/mod.rs
+++ b/crates/neomacs-layout-engine/src/engine/tests/engine_test.rs
@@ -34,30 +34,48 @@ mod line_spacing;
 #[path = "../../tests/engine_display_motion_test.rs"]
 mod display_motion;
 
+#[path = "chrome_memo_engine_test.rs"]
 mod chrome_memo_engine_test;
 #[cfg(test)]
+#[path = "displayed_start_key_test.rs"]
 mod displayed_start_key_test;
+#[path = "edit_line_numbers_test.rs"]
 mod edit_line_numbers_test;
+#[path = "edit_replay_point_visibility_test.rs"]
 mod edit_replay_point_visibility_test;
+#[path = "edit_replay_row_extent_test.rs"]
 mod edit_replay_row_extent_test;
+#[path = "edit_sync_engine_test.rs"]
 mod edit_sync_engine_test;
 #[cfg(test)]
+#[path = "edit_sync_prove_first_engine_test.rs"]
 mod edit_sync_prove_first_engine_test;
 #[path = "../../tests/engine_layout_validity_test.rs"]
 mod layout_validity;
+#[path = "lazy_text_hit_test.rs"]
 mod lazy_text_hit_test;
+#[path = "mini_window_still_test.rs"]
 mod mini_window_still_test;
+#[path = "mode_line_gate_engine_test.rs"]
 mod mode_line_gate_engine_test;
 #[cfg(test)]
+#[path = "posn_current_matrix_clear_engine_test.rs"]
 mod posn_current_matrix_clear_engine_test;
 #[cfg(test)]
+#[path = "posn_frame_pool_engine_test.rs"]
 mod posn_frame_pool_engine_test;
 #[cfg(test)]
+#[path = "posn_frame_pool_guard_test.rs"]
 mod posn_frame_pool_guard_test;
+#[path = "replay_cursor_on_tab_test.rs"]
 mod replay_cursor_on_tab_test;
+#[path = "scroll_back_engine_test.rs"]
 mod scroll_back_engine_test;
+#[path = "scroll_input_policy_test.rs"]
 mod scroll_input_policy_test;
+#[path = "scroll_surface_test.rs"]
 mod scroll_surface_test;
+#[path = "text_snapshot_cow_test.rs"]
 mod text_snapshot_cow_test;
 
 fn test_image_load(id: u32) -> neomacs_display_protocol::ImageLoadToken {
@@ -36706,8 +36724,10 @@ fn hscroll_cursor_publication_preserves_clipping_visible_text_and_eol() {
     }
 }
 
+#[path = "prepared_viewport_test.rs"]
 mod prepared_viewport_test;
 
+#[path = "offscreen_row_test.rs"]
 mod offscreen_row_test;
 
 #[test]
@@ -37030,8 +37050,9 @@ fn unchanged_frame_layout_consults_the_image_catalog_once_per_pass() {
 }
 
 #[cfg(test)]
+#[path = "point_rows_test.rs"]
 mod point_rows_test;
 
 #[cfg(test)]
-#[path = "mini_scroll_sites.rs"]
+#[path = "mini_scroll_sites_test.rs"]
 mod mini_scroll_sites;
diff --git a/crates/neomacs-layout-engine/src/engine/tests/mini_scroll_sites.rs b/crates/neomacs-layout-engine/src/engine/tests/mini_scroll_sites_test.rs
similarity index 100%
rename from crates/neomacs-layout-engine/src/engine/tests/mini_scroll_sites.rs
rename to crates/neomacs-layout-engine/src/engine/tests/mini_scroll_sites_test.rs
diff --git a/crates/neomacs-layout-engine/src/engine/tests/mini_source_start.rs b/crates/neomacs-layout-engine/src/engine/tests/mini_source_start_test.rs
similarity index 100%
rename from crates/neomacs-layout-engine/src/engine/tests/mini_source_start.rs
rename to crates/neomacs-layout-engine/src/engine/tests/mini_source_start_test.rs
diff --git a/crates/neomacs-layout-engine/src/engine/tests/mini_source_stop.rs b/crates/neomacs-layout-engine/src/engine/tests/mini_source_stop_test.rs
similarity index 100%
rename from crates/neomacs-layout-engine/src/engine/tests/mini_source_stop.rs
rename to crates/neomacs-layout-engine/src/engine/tests/mini_source_stop_test.rs
diff --git a/crates/neomacs-layout-engine/src/font/catalog.rs b/crates/neomacs-layout-engine/src/font/catalog.rs
index 401c55417d..d85e70c001 100644
--- a/crates/neomacs-layout-engine/src/font/catalog.rs
+++ b/crates/neomacs-layout-engine/src/font/catalog.rs
@@ -166,4 +166,5 @@ impl FontCatalog {
 }
 
 #[cfg(test)]
+#[path = "catalog/tests/catalog_test.rs"]
 mod tests;
diff --git a/crates/neomacs-layout-engine/src/font/catalog/tests/mod.rs b/crates/neomacs-layout-engine/src/font/catalog/tests/catalog_test.rs
similarity index 100%
rename from crates/neomacs-layout-engine/src/font/catalog/tests/mod.rs
rename to crates/neomacs-layout-engine/src/font/catalog/tests/catalog_test.rs
diff --git a/crates/neomacs-layout-engine/src/font/font_match.rs b/crates/neomacs-layout-engine/src/font/font_match.rs
index ec42b3b38d..c19e7edd67 100644
--- a/crates/neomacs-layout-engine/src/font/font_match.rs
+++ b/crates/neomacs-layout-engine/src/font/font_match.rs
@@ -265,4 +265,5 @@ fn pick_nearest_css_weight(weights: &[u16], requested_weight: u16) -> u16 {
 }
 
 #[cfg(test)]
+#[path = "font_match/tests/font_match_test.rs"]
 mod tests;
diff --git a/crates/neomacs-layout-engine/src/font/font_match/tests/mod.rs b/crates/neomacs-layout-engine/src/font/font_match/tests/font_match_test.rs
similarity index 100%
rename from crates/neomacs-layout-engine/src/font/font_match/tests/mod.rs
rename to crates/neomacs-layout-engine/src/font/font_match/tests/font_match_test.rs
diff --git a/crates/neomacs-layout-engine/src/font/fontconfig.rs b/crates/neomacs-layout-engine/src/font/fontconfig.rs
index 97bf149550..830a3190a4 100644
--- a/crates/neomacs-layout-engine/src/font/fontconfig.rs
+++ b/crates/neomacs-layout-engine/src/font/fontconfig.rs
@@ -1675,4 +1675,5 @@ fn query_default_subpixel_order() -> FontconfigSubpixelOrder {
 }
 
 #[cfg(test)]
+#[path = "fontconfig/tests/fontconfig_test.rs"]
 mod tests;
diff --git a/crates/neomacs-layout-engine/src/font/fontconfig/candidate_cache.rs b/crates/neomacs-layout-engine/src/font/fontconfig/candidate_cache.rs
index 5a9f428986..29f7c6c5fc 100644
--- a/crates/neomacs-layout-engine/src/font/fontconfig/candidate_cache.rs
+++ b/crates/neomacs-layout-engine/src/font/fontconfig/candidate_cache.rs
@@ -104,74 +104,5 @@ fn font_bytes(font: &ListedFont) -> usize {
 }
 
 #[cfg(test)]
-mod tests {
-    use super::*;
-    fn query(family: &str) -> Query {
-        Query::new(Some(family), &[], None, &[], FcQueryKind::List).unwrap()
-    }
-    #[test]
-    fn complete_query_key_distinguishes_native_inputs() {
-        let base = query("test");
-        for other in [
-            Query::new(None, &[], None, &[], FcQueryKind::List).unwrap(),
-            Query::new(Some("test"), &[(1, 3)], None, &[], FcQueryKind::List).unwrap(),
-            Query::new(Some("test"), &[], Some(65), &[], FcQueryKind::List).unwrap(),
-            Query::new(Some("test"), &[], None, &["en".into()], FcQueryKind::List).unwrap(),
-            Query::new(Some("test"), &[], None, &[], FcQueryKind::Match).unwrap(),
-        ] {
-            assert_ne!(base, other);
-        }
-    }
-    #[test]
-    fn bounded_cache_reuses_negative_answers_and_evicts_least_recent_query() {
-        let mut cache = CandidateQueries::with_limits(2, 4096);
-        cache.insert(query("a"), &[]);
-        cache.insert(query("b"), &[]);
-        assert_eq!(cache.get(&query("a")), Some(vec![]));
-        cache.insert(query("c"), &[]);
-        assert_eq!(cache.get(&query("b")), None);
-        assert_eq!(cache.get(&query("a")), Some(vec![]));
-        assert!(cache.bytes <= 4096);
-    }
-    #[test]
-    fn byte_limit_evicts_and_oversized_keys_are_not_retained() {
-        let mut cache = CandidateQueries::with_limits(128, query("a").bytes());
-        cache.insert(query("a"), &[]);
-        cache.insert(query("b"), &[]);
-        assert_eq!(cache.entries.len(), 1);
-        assert_eq!(cache.get(&query("a")), None);
-        cache.insert(query("too long"), &[]);
-        assert_eq!(cache.entries.len(), 1);
-        assert!(Query::new(Some(&"x".repeat(65537)), &[], None, &[], FcQueryKind::List).is_none());
-    }
-
-    #[test]
-    fn font_payload_counts_toward_limit_and_returned_answers_are_independent() {
-        let font = ListedFont {
-            matched: super::super::FontMatch {
-                family: "fixture".into(),
-                file: Some("font-file".into()),
-                face_index: 0,
-                variation_coords: vec![],
-                postscript_name: None,
-                weight: None,
-                slant: neovm_core::face::FontSlant::Normal,
-                size: crate::font_backend::PlatformFontSize::Scalable,
-            },
-            style: "regular".into(),
-            weight_css: None,
-            width: None,
-            spacing: None,
-            foundry: None,
-        };
-        let bytes = query("a").bytes() + font_bytes(&font);
-        let mut cache = CandidateQueries::with_limits(128, bytes);
-        cache.insert(query("a"), std::slice::from_ref(&font));
-        let mut answer = cache.get(&query("a")).unwrap();
-        answer[0].matched.family.clear();
-        assert_eq!(cache.get(&query("a")), Some(vec![font.clone()]));
-        cache.insert(query("b"), &[font.clone(), font]);
-        assert_eq!(cache.get(&query("b")), None);
-        assert_eq!(cache.bytes, bytes);
-    }
-}
+#[path = "tests/candidate_cache_test.rs"]
+mod tests;
diff --git a/crates/neomacs-layout-engine/src/font/fontconfig/tests/candidate_cache_test.rs b/crates/neomacs-layout-engine/src/font/fontconfig/tests/candidate_cache_test.rs
new file mode 100644
index 0000000000..a0702d8938
--- /dev/null
+++ b/crates/neomacs-layout-engine/src/font/fontconfig/tests/candidate_cache_test.rs
@@ -0,0 +1,69 @@
+use super::*;
+fn query(family: &str) -> Query {
+    Query::new(Some(family), &[], None, &[], FcQueryKind::List).unwrap()
+}
+#[test]
+fn complete_query_key_distinguishes_native_inputs() {
+    let base = query("test");
+    for other in [
+        Query::new(None, &[], None, &[], FcQueryKind::List).unwrap(),
+        Query::new(Some("test"), &[(1, 3)], None, &[], FcQueryKind::List).unwrap(),
+        Query::new(Some("test"), &[], Some(65), &[], FcQueryKind::List).unwrap(),
+        Query::new(Some("test"), &[], None, &["en".into()], FcQueryKind::List).unwrap(),
+        Query::new(Some("test"), &[], None, &[], FcQueryKind::Match).unwrap(),
+    ] {
+        assert_ne!(base, other);
+    }
+}
+#[test]
+fn bounded_cache_reuses_negative_answers_and_evicts_least_recent_query() {
+    let mut cache = CandidateQueries::with_limits(2, 4096);
+    cache.insert(query("a"), &[]);
+    cache.insert(query("b"), &[]);
+    assert_eq!(cache.get(&query("a")), Some(vec![]));
+    cache.insert(query("c"), &[]);
+    assert_eq!(cache.get(&query("b")), None);
+    assert_eq!(cache.get(&query("a")), Some(vec![]));
+    assert!(cache.bytes <= 4096);
+}
+#[test]
+fn byte_limit_evicts_and_oversized_keys_are_not_retained() {
+    let mut cache = CandidateQueries::with_limits(128, query("a").bytes());
+    cache.insert(query("a"), &[]);
+    cache.insert(query("b"), &[]);
+    assert_eq!(cache.entries.len(), 1);
+    assert_eq!(cache.get(&query("a")), None);
+    cache.insert(query("too long"), &[]);
+    assert_eq!(cache.entries.len(), 1);
+    assert!(Query::new(Some(&"x".repeat(65537)), &[], None, &[], FcQueryKind::List).is_none());
+}
+
+#[test]
+fn font_payload_counts_toward_limit_and_returned_answers_are_independent() {
+    let font = ListedFont {
+        matched: super::super::FontMatch {
+            family: "fixture".into(),
+            file: Some("font-file".into()),
+            face_index: 0,
+            variation_coords: vec![],
+            postscript_name: None,
+            weight: None,
+            slant: neovm_core::face::FontSlant::Normal,
+            size: crate::font_backend::PlatformFontSize::Scalable,
+        },
+        style: "regular".into(),
+        weight_css: None,
+        width: None,
+        spacing: None,
+        foundry: None,
+    };
+    let bytes = query("a").bytes() + font_bytes(&font);
+    let mut cache = CandidateQueries::with_limits(128, bytes);
+    cache.insert(query("a"), std::slice::from_ref(&font));
+    let mut answer = cache.get(&query("a")).unwrap();
+    answer[0].matched.family.clear();
+    assert_eq!(cache.get(&query("a")), Some(vec![font.clone()]));
+    cache.insert(query("b"), &[font.clone(), font]);
+    assert_eq!(cache.get(&query("b")), None);
+    assert_eq!(cache.bytes, bytes);
+}
diff --git a/crates/neomacs-layout-engine/src/font/fontconfig/tests/mod.rs b/crates/neomacs-layout-engine/src/font/fontconfig/tests/fontconfig_test.rs
similarity index 100%
rename from crates/neomacs-layout-engine/src/font/fontconfig/tests/mod.rs
rename to crates/neomacs-layout-engine/src/font/fontconfig/tests/fontconfig_test.rs
diff --git a/crates/neomacs-layout-engine/src/font/metrics.rs b/crates/neomacs-layout-engine/src/font/metrics.rs
index fee0f238f4..ae267223bb 100644
--- a/crates/neomacs-layout-engine/src/font/metrics.rs
+++ b/crates/neomacs-layout-engine/src/font/metrics.rs
@@ -3579,4 +3579,5 @@ fn font_slant_to_cosmic_style(slant: FontSlant) -> Option<Style> {
 }
 
 #[cfg(test)]
+#[path = "metrics/tests/metrics_test.rs"]
 mod tests;
diff --git a/crates/neomacs-layout-engine/src/font/metrics/tests/mod.rs b/crates/neomacs-layout-engine/src/font/metrics/tests/metrics_test.rs
similarity index 100%
rename from crates/neomacs-layout-engine/src/font/metrics/tests/mod.rs
rename to crates/neomacs-layout-engine/src/font/metrics/tests/metrics_test.rs
diff --git a/crates/neomacs-layout-engine/src/font/policy.rs b/crates/neomacs-layout-engine/src/font/policy.rs
index f16c953395..da9c3a0042 100644
--- a/crates/neomacs-layout-engine/src/font/policy.rs
+++ b/crates/neomacs-layout-engine/src/font/policy.rs
@@ -487,4 +487,5 @@ pub(crate) fn wildcard_casefold_match(pattern: &str, text: &str) -> bool {
 }
 
 #[cfg(test)]
+#[path = "policy/tests/policy_test.rs"]
 mod tests;
diff --git a/crates/neomacs-layout-engine/src/font/policy/tests/mod.rs b/crates/neomacs-layout-engine/src/font/policy/tests/policy_test.rs
similarity index 100%
rename from crates/neomacs-layout-engine/src/font/policy/tests/mod.rs
rename to crates/neomacs-layout-engine/src/font/policy/tests/policy_test.rs
diff --git a/crates/neomacs-layout-engine/src/font/resolver.rs b/crates/neomacs-layout-engine/src/font/resolver.rs
index e74c26d6d3..01da930029 100644
--- a/crates/neomacs-layout-engine/src/font/resolver.rs
+++ b/crates/neomacs-layout-engine/src/font/resolver.rs
@@ -958,4 +958,5 @@ fn family_affinity_score(queried_family: Option<&str>, candidate_family: &str) -
 }
 
 #[cfg(test)]
+#[path = "resolver/tests/resolver_test.rs"]
 mod tests;
diff --git a/crates/neomacs-layout-engine/src/font/resolver/tests/mod.rs b/crates/neomacs-layout-engine/src/font/resolver/tests/resolver_test.rs
similarity index 100%
rename from crates/neomacs-layout-engine/src/font/resolver/tests/mod.rs
rename to crates/neomacs-layout-engine/src/font/resolver/tests/resolver_test.rs
diff --git a/crates/neomacs-layout-engine/src/font/resolver/tests/worker_policy_cache_budget_test.rs b/crates/neomacs-layout-engine/src/font/resolver/tests/worker_policy_cache_budget_test.rs
new file mode 100644
index 0000000000..766beac6aa
--- /dev/null
+++ b/crates/neomacs-layout-engine/src/font/resolver/tests/worker_policy_cache_budget_test.rs
@@ -0,0 +1,26 @@
+use super::*;
+
+#[test]
+fn worker_query_budget_reserves_distinct_requests_before_native_lookup() {
+    let mut resolver = FontResolver::platform_default();
+    let size = FontSelectionSize::new(
+        14.0,
+        neomacs_display_protocol::DeviceScale::new(1.0).unwrap(),
+    );
+    let policy = Arc::new(
+        FrozenCharacterPolicies::capture(&[("monospace", '中', 400, false, size)], 4096).unwrap(),
+    );
+    let other = Arc::new(
+        FrozenCharacterPolicies::capture(&[("monospace", '文', 400, false, size)], 4096).unwrap(),
+    );
+    assert!(resolver.worker_policy_fits_cache(&policy, 1));
+    resolver.install_worker_policy(policy.clone());
+    assert!(resolver.worker_policy_fits_cache(&policy, 1));
+    assert!(!resolver.worker_policy_fits_cache(&other, 1));
+    assert!(resolver.worker_policy_fits_cache(&other, 2));
+    resolver.install_worker_policy(other);
+    assert!(!resolver.worker_policy_fits_cache(&policy, 1));
+    assert!(resolver.worker_policy_fits_cache(&policy, 2));
+    resolver.clear_caches();
+    assert!(resolver.worker_policy_fits_cache(&policy, 1));
+}
diff --git a/crates/neomacs-layout-engine/src/font/resolver/worker_policy.rs b/crates/neomacs-layout-engine/src/font/resolver/worker_policy.rs
index 70e2775e61..c96fb2da37 100644
--- a/crates/neomacs-layout-engine/src/font/resolver/worker_policy.rs
+++ b/crates/neomacs-layout-engine/src/font/resolver/worker_policy.rs
@@ -242,33 +242,5 @@ impl FontResolver {
 }
 
 #[cfg(test)]
-mod cache_budget_tests {
-    use super::*;
-
-    #[test]
-    fn worker_query_budget_reserves_distinct_requests_before_native_lookup() {
-        let mut resolver = FontResolver::platform_default();
-        let size = FontSelectionSize::new(
-            14.0,
-            neomacs_display_protocol::DeviceScale::new(1.0).unwrap(),
-        );
-        let policy = Arc::new(
-            FrozenCharacterPolicies::capture(&[("monospace", '中', 400, false, size)], 4096)
-                .unwrap(),
-        );
-        let other = Arc::new(
-            FrozenCharacterPolicies::capture(&[("monospace", '文', 400, false, size)], 4096)
-                .unwrap(),
-        );
-        assert!(resolver.worker_policy_fits_cache(&policy, 1));
-        resolver.install_worker_policy(policy.clone());
-        assert!(resolver.worker_policy_fits_cache(&policy, 1));
-        assert!(!resolver.worker_policy_fits_cache(&other, 1));
-        assert!(resolver.worker_policy_fits_cache(&other, 2));
-        resolver.install_worker_policy(other);
-        assert!(!resolver.worker_policy_fits_cache(&policy, 1));
-        assert!(resolver.worker_policy_fits_cache(&policy, 2));
-        resolver.clear_caches();
-        assert!(resolver.worker_policy_fits_cache(&policy, 1));
-    }
-}
+#[path = "tests/worker_policy_cache_budget_test.rs"]
+mod cache_budget_tests;
diff --git a/crates/neomacs-layout-engine/src/font/sizing.rs b/crates/neomacs-layout-engine/src/font/sizing.rs
index 7ddeb9ff3f..3c5d0c5c2b 100644
--- a/crates/neomacs-layout-engine/src/font/sizing.rs
+++ b/crates/neomacs-layout-engine/src/font/sizing.rs
@@ -306,4 +306,5 @@ pub(crate) fn fallback_frame_res_y(display_height_px: i32, display_height_mm: i3
 }
 
 #[cfg(test)]
+#[path = "sizing/tests/sizing_test.rs"]
 mod tests;
diff --git a/crates/neomacs-layout-engine/src/font/sizing/tests/mod.rs b/crates/neomacs-layout-engine/src/font/sizing/tests/sizing_test.rs
similarity index 100%
rename from crates/neomacs-layout-engine/src/font/sizing/tests/mod.rs
rename to crates/neomacs-layout-engine/src/font/sizing/tests/sizing_test.rs
diff --git a/crates/neomacs-layout-engine/src/font_backend/native_asset_cache.rs b/crates/neomacs-layout-engine/src/font_backend/native_asset_cache.rs
index c166c37c17..35568dd77e 100644
--- a/crates/neomacs-layout-engine/src/font_backend/native_asset_cache.rs
+++ b/crates/neomacs-layout-engine/src/font_backend/native_asset_cache.rs
@@ -146,4 +146,5 @@ impl NativeFontAssetCache {
 }
 
 #[cfg(test)]
+#[path = "native_asset_cache/tests/native_asset_cache_test.rs"]
 mod tests;
diff --git a/crates/neomacs-layout-engine/src/font_backend/native_asset_cache/tests/mod.rs b/crates/neomacs-layout-engine/src/font_backend/native_asset_cache/tests/native_asset_cache_test.rs
similarity index 100%
rename from crates/neomacs-layout-engine/src/font_backend/native_asset_cache/tests/mod.rs
rename to crates/neomacs-layout-engine/src/font_backend/native_asset_cache/tests/native_asset_cache_test.rs
diff --git a/crates/neomacs-layout-engine/src/font_backend/windows/mod.rs b/crates/neomacs-layout-engine/src/font_backend/windows/mod.rs
index 79d1a70c70..2c74627a18 100644
--- a/crates/neomacs-layout-engine/src/font_backend/windows/mod.rs
+++ b/crates/neomacs-layout-engine/src/font_backend/windows/mod.rs
@@ -542,4 +542,5 @@ impl TextAnalysisSourceMethods for SingleLocaleAnalysis {
 }
 
 #[cfg(test)]
+#[path = "tests/windows_test.rs"]
 mod tests;
diff --git a/crates/neomacs-layout-engine/src/font_backend/windows/tests/mod.rs b/crates/neomacs-layout-engine/src/font_backend/windows/tests/windows_test.rs
similarity index 100%
rename from crates/neomacs-layout-engine/src/font_backend/windows/tests/mod.rs
rename to crates/neomacs-layout-engine/src/font_backend/windows/tests/windows_test.rs
diff --git a/crates/neomacs-layout-engine/src/frame_face_arena.rs b/crates/neomacs-layout-engine/src/frame_face_arena.rs
index cda0236c0d..0232b0ab8d 100644
--- a/crates/neomacs-layout-engine/src/frame_face_arena.rs
+++ b/crates/neomacs-layout-engine/src/frame_face_arena.rs
@@ -969,4 +969,5 @@ fn merge_compatible_realization(existing: &mut Face, replacement: &Face) -> bool
 }
 
 #[cfg(test)]
+#[path = "frame_face_arena/tests/frame_face_arena_test.rs"]
 mod tests;
diff --git a/crates/neomacs-layout-engine/src/frame_face_arena/tests/mod.rs b/crates/neomacs-layout-engine/src/frame_face_arena/tests/frame_face_arena_test.rs
similarity index 100%
rename from crates/neomacs-layout-engine/src/frame_face_arena/tests/mod.rs
rename to crates/neomacs-layout-engine/src/frame_face_arena/tests/frame_face_arena_test.rs
diff --git a/crates/neomacs-layout-engine/src/frame_presentation.rs b/crates/neomacs-layout-engine/src/frame_presentation.rs
index 06c2648df4..950db33763 100644
--- a/crates/neomacs-layout-engine/src/frame_presentation.rs
+++ b/crates/neomacs-layout-engine/src/frame_presentation.rs
@@ -137,4 +137,5 @@ impl PresentationComposer {
 }
 
 #[cfg(test)]
+#[path = "frame_presentation/tests/frame_presentation_test.rs"]
 mod tests;
diff --git a/crates/neomacs-layout-engine/src/frame_presentation/tests/mod.rs b/crates/neomacs-layout-engine/src/frame_presentation/tests/frame_presentation_test.rs
similarity index 100%
rename from crates/neomacs-layout-engine/src/frame_presentation/tests/mod.rs
rename to crates/neomacs-layout-engine/src/frame_presentation/tests/frame_presentation_test.rs
diff --git a/crates/neomacs-layout-engine/src/glyph_row_writer.rs b/crates/neomacs-layout-engine/src/glyph_row_writer.rs
index cd55e270aa..d9760dc63b 100644
--- a/crates/neomacs-layout-engine/src/glyph_row_writer.rs
+++ b/crates/neomacs-layout-engine/src/glyph_row_writer.rs
@@ -5,7 +5,7 @@ use neomacs_display_protocol::glyph_matrix::{
 use neomacs_display_protocol::types::FaceId;
 
 #[cfg(test)]
-#[path = "glyph_row_writer/tests.rs"]
+#[path = "glyph_row_writer/tests/glyph_row_writer_test.rs"]
 mod tests;
 
 #[derive(Clone, Copy)]
diff --git a/crates/neomacs-layout-engine/src/glyph_row_writer/tests.rs b/crates/neomacs-layout-engine/src/glyph_row_writer/tests/glyph_row_writer_test.rs
similarity index 100%
rename from crates/neomacs-layout-engine/src/glyph_row_writer/tests.rs
rename to crates/neomacs-layout-engine/src/glyph_row_writer/tests/glyph_row_writer_test.rs
diff --git a/crates/neomacs-layout-engine/src/gui_chrome.rs b/crates/neomacs-layout-engine/src/gui_chrome.rs
index a8bc349a66..4f705b7018 100644
--- a/crates/neomacs-layout-engine/src/gui_chrome.rs
+++ b/crates/neomacs-layout-engine/src/gui_chrome.rs
@@ -809,4 +809,5 @@ fn key_symbol_name(key: &Value) -> String {
 }
 
 #[cfg(test)]
+#[path = "gui_chrome/tests/gui_chrome_test.rs"]
 mod tests;
diff --git a/crates/neomacs-layout-engine/src/gui_chrome/tests/mod.rs b/crates/neomacs-layout-engine/src/gui_chrome/tests/gui_chrome_test.rs
similarity index 100%
rename from crates/neomacs-layout-engine/src/gui_chrome/tests/mod.rs
rename to crates/neomacs-layout-engine/src/gui_chrome/tests/gui_chrome_test.rs
diff --git a/crates/neomacs-layout-engine/src/incremental_layout/edit_sync.rs b/crates/neomacs-layout-engine/src/incremental_layout/edit_sync.rs
index e66b6cc187..cda9099194 100644
--- a/crates/neomacs-layout-engine/src/incremental_layout/edit_sync.rs
+++ b/crates/neomacs-layout-engine/src/incremental_layout/edit_sync.rs
@@ -893,7 +893,7 @@ pub(crate) fn plan_positions(
 }
 
 #[cfg(test)]
-#[path = "tests/edit_sync_lazy_proof_policy_aliases.rs"]
+#[path = "tests/edit_sync_lazy_proof_policy_aliases_test.rs"]
 mod lazy_proof_policy_aliases;
 
 #[cfg(test)]
@@ -905,15 +905,15 @@ mod tests;
 mod lazy_proof_selector_tests;
 
 #[cfg(test)]
-#[path = "tests/edit_sync_policy_aliases.rs"]
+#[path = "tests/edit_sync_policy_aliases_test.rs"]
 mod edit_sync_policy_aliases_tests;
 
 #[cfg(test)]
-#[path = "tests/edit_sync_default_policy.rs"]
+#[path = "tests/edit_sync_default_policy_test.rs"]
 mod edit_sync_default_policy_tests;
 
 #[cfg(test)]
-#[path = "tests/edit_sync_lazy_proof_policy_absence.rs"]
+#[path = "tests/edit_sync_lazy_proof_policy_absence_test.rs"]
 mod lazy_proof_policy_absence;
 
 #[cfg(test)]
diff --git a/crates/neomacs-layout-engine/src/incremental_layout/mode_line_gate.rs b/crates/neomacs-layout-engine/src/incremental_layout/mode_line_gate.rs
index b7fc719e82..72d69206d1 100644
--- a/crates/neomacs-layout-engine/src/incremental_layout/mode_line_gate.rs
+++ b/crates/neomacs-layout-engine/src/incremental_layout/mode_line_gate.rs
@@ -447,9 +447,9 @@ pub(crate) fn line_numbers_require_mode_line(mode: crate::types::DisplayLineNumb
 mod tests;
 
 #[cfg(test)]
-#[path = "tests/mode_line_gate_policy_aliases.rs"]
+#[path = "tests/mode_line_gate_policy_aliases_test.rs"]
 mod mode_line_gate_policy_aliases_tests;
 
 #[cfg(test)]
-#[path = "tests/mode_line_gate_default_policy.rs"]
+#[path = "tests/mode_line_gate_default_policy_test.rs"]
 mod mode_line_gate_default_policy_tests;
diff --git a/crates/neomacs-layout-engine/src/incremental_layout/tests/edit_sync_default_policy.rs b/crates/neomacs-layout-engine/src/incremental_layout/tests/edit_sync_default_policy_test.rs
similarity index 100%
rename from crates/neomacs-layout-engine/src/incremental_layout/tests/edit_sync_default_policy.rs
rename to crates/neomacs-layout-engine/src/incremental_layout/tests/edit_sync_default_policy_test.rs
diff --git a/crates/neomacs-layout-engine/src/incremental_layout/tests/edit_sync_lazy_proof_policy_absence.rs b/crates/neomacs-layout-engine/src/incremental_layout/tests/edit_sync_lazy_proof_policy_absence_test.rs
similarity index 100%
rename from crates/neomacs-layout-engine/src/incremental_layout/tests/edit_sync_lazy_proof_policy_absence.rs
rename to crates/neomacs-layout-engine/src/incremental_layout/tests/edit_sync_lazy_proof_policy_absence_test.rs
diff --git a/crates/neomacs-layout-engine/src/incremental_layout/tests/edit_sync_lazy_proof_policy_aliases.rs b/crates/neomacs-layout-engine/src/incremental_layout/tests/edit_sync_lazy_proof_policy_aliases_test.rs
similarity index 100%
rename from crates/neomacs-layout-engine/src/incremental_layout/tests/edit_sync_lazy_proof_policy_aliases.rs
rename to crates/neomacs-layout-engine/src/incremental_layout/tests/edit_sync_lazy_proof_policy_aliases_test.rs
diff --git a/crates/neomacs-layout-engine/src/incremental_layout/tests/edit_sync_policy_aliases.rs b/crates/neomacs-layout-engine/src/incremental_layout/tests/edit_sync_policy_aliases_test.rs
similarity index 100%
rename from crates/neomacs-layout-engine/src/incremental_layout/tests/edit_sync_policy_aliases.rs
rename to crates/neomacs-layout-engine/src/incremental_layout/tests/edit_sync_policy_aliases_test.rs
diff --git a/crates/neomacs-layout-engine/src/incremental_layout/tests/mode_line_gate_default_policy.rs b/crates/neomacs-layout-engine/src/incremental_layout/tests/mode_line_gate_default_policy_test.rs
similarity index 100%
rename from crates/neomacs-layout-engine/src/incremental_layout/tests/mode_line_gate_default_policy.rs
rename to crates/neomacs-layout-engine/src/incremental_layout/tests/mode_line_gate_default_policy_test.rs
diff --git a/crates/neomacs-layout-engine/src/incremental_layout/tests/mode_line_gate_policy_aliases.rs b/crates/neomacs-layout-engine/src/incremental_layout/tests/mode_line_gate_policy_aliases_test.rs
similarity index 100%
rename from crates/neomacs-layout-engine/src/incremental_layout/tests/mode_line_gate_policy_aliases.rs
rename to crates/neomacs-layout-engine/src/incremental_layout/tests/mode_line_gate_policy_aliases_test.rs
diff --git a/crates/neomacs-layout-engine/src/neovm_bridge.rs b/crates/neomacs-layout-engine/src/neovm_bridge.rs
index 3c6adea605..4b9efceee6 100644
--- a/crates/neomacs-layout-engine/src/neovm_bridge.rs
+++ b/crates/neomacs-layout-engine/src/neovm_bridge.rs
@@ -5060,8 +5060,9 @@ fn box_style_to_u8(style: &NeoBoxStyle) -> u8 {
 }
 
 #[cfg(test)]
+#[path = "neovm_bridge/tests/neovm_bridge_test.rs"]
 mod tests;
 
 #[cfg(test)]
-#[path = "neovm_bridge/line_count_test.rs"]
+#[path = "neovm_bridge/tests/line_count_test.rs"]
 mod line_count_test;
diff --git a/crates/neomacs-layout-engine/src/neovm_bridge/line_count_test.rs b/crates/neomacs-layout-engine/src/neovm_bridge/tests/line_count_test.rs
similarity index 100%
rename from crates/neomacs-layout-engine/src/neovm_bridge/line_count_test.rs
rename to crates/neomacs-layout-engine/src/neovm_bridge/tests/line_count_test.rs
diff --git a/crates/neomacs-layout-engine/src/neovm_bridge/tests/mod.rs b/crates/neomacs-layout-engine/src/neovm_bridge/tests/neovm_bridge_test.rs
similarity index 100%
rename from crates/neomacs-layout-engine/src/neovm_bridge/tests/mod.rs
rename to crates/neomacs-layout-engine/src/neovm_bridge/tests/neovm_bridge_test.rs
diff --git a/crates/neomacs-layout-engine/src/output/builder.rs b/crates/neomacs-layout-engine/src/output/builder.rs
index 9611650cfc..ad4facad2b 100644
--- a/crates/neomacs-layout-engine/src/output/builder.rs
+++ b/crates/neomacs-layout-engine/src/output/builder.rs
@@ -821,4 +821,5 @@ where
 }
 
 #[cfg(test)]
+#[path = "builder/tests/builder_test.rs"]
 mod tests;
diff --git a/crates/neomacs-layout-engine/src/output/builder/tests/mod.rs b/crates/neomacs-layout-engine/src/output/builder/tests/builder_test.rs
similarity index 100%
rename from crates/neomacs-layout-engine/src/output/builder/tests/mod.rs
rename to crates/neomacs-layout-engine/src/output/builder/tests/builder_test.rs
diff --git a/crates/neomacs-layout-engine/src/output/window_state.rs b/crates/neomacs-layout-engine/src/output/window_state.rs
index 676e063342..5e585b4962 100644
--- a/crates/neomacs-layout-engine/src/output/window_state.rs
+++ b/crates/neomacs-layout-engine/src/output/window_state.rs
@@ -736,8 +736,9 @@ impl OutputWindowGridEntry {
 }
 
 #[cfg(test)]
+#[path = "window_state/tests/window_state_test.rs"]
 mod tests;
 
 #[cfg(test)]
-#[path = "window_state/tests/mini_preparation.rs"]
+#[path = "window_state/tests/mini_preparation_test.rs"]
 mod mini_preparation_tests;
diff --git a/crates/neomacs-layout-engine/src/output/window_state/tests/mini_preparation.rs b/crates/neomacs-layout-engine/src/output/window_state/tests/mini_preparation_test.rs
similarity index 100%
rename from crates/neomacs-layout-engine/src/output/window_state/tests/mini_preparation.rs
rename to crates/neomacs-layout-engine/src/output/window_state/tests/mini_preparation_test.rs
diff --git a/crates/neomacs-layout-engine/src/output/window_state/tests/mod.rs b/crates/neomacs-layout-engine/src/output/window_state/tests/window_state_test.rs
similarity index 100%
rename from crates/neomacs-layout-engine/src/output/window_state/tests/mod.rs
rename to crates/neomacs-layout-engine/src/output/window_state/tests/window_state_test.rs
diff --git a/crates/neomacs-layout-engine/src/presentation/pointer.rs b/crates/neomacs-layout-engine/src/presentation/pointer.rs
index c0692bf520..a747dac44f 100644
--- a/crates/neomacs-layout-engine/src/presentation/pointer.rs
+++ b/crates/neomacs-layout-engine/src/presentation/pointer.rs
@@ -132,4 +132,5 @@ pub(crate) fn window_pointer_source_map(
 }
 
 #[cfg(test)]
+#[path = "pointer/tests/pointer_test.rs"]
 mod tests;
diff --git a/crates/neomacs-layout-engine/src/presentation/pointer/tests/mod.rs b/crates/neomacs-layout-engine/src/presentation/pointer/tests/pointer_test.rs
similarity index 100%
rename from crates/neomacs-layout-engine/src/presentation/pointer/tests/mod.rs
rename to crates/neomacs-layout-engine/src/presentation/pointer/tests/pointer_test.rs
diff --git a/crates/neomacs-layout-engine/src/presentation/presented_pointer_map.rs b/crates/neomacs-layout-engine/src/presentation/presented_pointer_map.rs
index ad8dcdbd72..0c39f056dd 100644
--- a/crates/neomacs-layout-engine/src/presentation/presented_pointer_map.rs
+++ b/crates/neomacs-layout-engine/src/presentation/presented_pointer_map.rs
@@ -227,4 +227,5 @@ fn adjacent_rect(left: FrameRect, right: FrameRect) -> Option<FrameRect> {
 }
 
 #[cfg(test)]
+#[path = "presented_pointer_map/tests/presented_pointer_map_test.rs"]
 mod tests;
diff --git a/crates/neomacs-layout-engine/src/presentation/presented_pointer_map/tests/mod.rs b/crates/neomacs-layout-engine/src/presentation/presented_pointer_map/tests/presented_pointer_map_test.rs
similarity index 100%
rename from crates/neomacs-layout-engine/src/presentation/presented_pointer_map/tests/mod.rs
rename to crates/neomacs-layout-engine/src/presentation/presented_pointer_map/tests/presented_pointer_map_test.rs
diff --git a/crates/neomacs-layout-engine/src/row_layout/font_measurement.rs b/crates/neomacs-layout-engine/src/row_layout/font_measurement.rs
index 94701f2e37..55beb86eaa 100644
--- a/crates/neomacs-layout-engine/src/row_layout/font_measurement.rs
+++ b/crates/neomacs-layout-engine/src/row_layout/font_measurement.rs
@@ -262,115 +262,5 @@ impl WorkerFontMeasurements {
 }
 
 #[cfg(test)]
-mod tests {
-    use super::*;
-    use crate::neovm_bridge::ResolvedFace;
-    use neomacs_display_protocol::types::FaceId;
-
-    fn face() -> DisplayRowFace {
-        DisplayRowFace::from_resolved(FaceId::new(1), &ResolvedFace::default())
-    }
-
-    #[test]
-    fn cancellation_does_not_initialize_native_fonts() {
-        let mut source = FontMetricsService::new();
-        let faces = [face()];
-        let snapshot = FontMeasurementSnapshot::capture(&faces, &mut source, &[]).unwrap();
-        let mut worker = WorkerFontMeasurements::default();
-        assert!(matches!(
-            worker.prepare(&snapshot, &faces, &|| true),
-            Err(RowProgramError::Cancelled)
-        ));
-        assert!(worker.service.is_none());
-    }
-
-    #[test]
-    fn changed_font_metrics_reject_worker_measurement() {
-        let mut source = FontMetricsService::new();
-        let faces = [face()];
-        let mut snapshot = FontMeasurementSnapshot::capture(&faces, &mut source, &[]).unwrap();
-        snapshot.receipts[0].ascent += 1.0;
-        let mut worker = WorkerFontMeasurements::default();
-        assert!(matches!(
-            worker.prepare(&snapshot, &faces, &|| false),
-            Err(RowProgramError::Cancelled)
-        ));
-    }
-
-    #[test]
-    fn font_receipts_are_bounded_before_submission() {
-        let mut source = FontMetricsService::new();
-        let faces = vec![face(); MAX_CACHED_FACES];
-        assert!(matches!(
-            FontMeasurementSnapshot::capture(&faces, &mut source, &[]),
-            Err(RowProgramError::Budget)
-        ));
-    }
-
-    #[test]
-    fn worker_matches_captured_fonts_after_scale_change() {
-        let mut source = FontMetricsService::new();
-        let faces = [face()];
-        let mut worker = WorkerFontMeasurements::default();
-        for scale in [1.0, 1.5, 2.0, 1.0] {
-            source.set_device_scale(DeviceScale::new(scale).unwrap());
-            let snapshot = FontMeasurementSnapshot::capture(&faces, &mut source, &[]).unwrap();
-            let service = worker.prepare(&snapshot, &faces, &|| false).unwrap();
-            assert_eq!(service.device_scale().get(), scale);
-        }
-    }
-    #[test]
-    fn repeated_worker_unicode_queries_keep_native_font_caches_warm() {
-        use crate::display_item::*;
-        let mut source = FontMetricsService::new();
-        let faces = [face()];
-        let items = [DisplayItem::new(
-            SourceSpan::synthetic(1, 0, 1),
-            RenderFaceRef::FaceId(faces[0].face_id),
-            DisplayItemKind::TextRun(DisplayTextRun::independent("中")),
-        )];
-        let snapshot = FontMeasurementSnapshot::capture(&faces, &mut source, &items).unwrap();
-        let mut worker = WorkerFontMeasurements::default();
-        for _ in 0..MAX_CACHED_CHARACTER_QUERIES + 1 {
-            let service = worker.prepare(&snapshot, &faces, &|| false).unwrap();
-            let face = &faces[0];
-            assert!(
-                service
-                    .resolved_font_for_char(
-                        '中',
-                        &face.font_family,
-                        face.font_weight,
-                        face.italic,
-                        face.font_size
-                    )
-                    .is_some()
-            );
-            assert!(!service.worker_font_policy_missing());
-        }
-        assert_eq!(
-            worker.cache_rebuilds, 1,
-            "repeated use is not working-set growth"
-        );
-    }
-
-    #[test]
-    fn worker_font_face_budget_counts_distinct_selections() {
-        let mut source = FontMetricsService::new();
-        let mut worker = WorkerFontMeasurements::default();
-        for index in 0..MAX_CACHED_FACES {
-            let mut current = face();
-            current.font_size = 10.0 + index as f32;
-            let faces = [current];
-            let snapshot = FontMeasurementSnapshot::capture(&faces, &mut source, &[]).unwrap();
-            worker.prepare(&snapshot, &faces, &|| false).unwrap();
-        }
-        for size in [10.0, 10.0 + MAX_CACHED_FACES as f32] {
-            let mut current = face();
-            current.font_size = size;
-            let faces = [current];
-            let snapshot = FontMeasurementSnapshot::capture(&faces, &mut source, &[]).unwrap();
-            worker.prepare(&snapshot, &faces, &|| false).unwrap();
-            assert_eq!(worker.cache_rebuilds, if size == 10.0 { 1 } else { 2 });
-        }
-    }
-}
+#[path = "tests/font_measurement_test.rs"]
+mod tests;
diff --git a/crates/neomacs-layout-engine/src/row_layout/input.rs b/crates/neomacs-layout-engine/src/row_layout/input.rs
index 7911694884..2b61ed1a16 100644
--- a/crates/neomacs-layout-engine/src/row_layout/input.rs
+++ b/crates/neomacs-layout-engine/src/row_layout/input.rs
@@ -44,45 +44,5 @@ impl ResolvedTextInput {
 }
 
 #[cfg(test)]
-mod tests {
-    use super::*;
-    use crate::display_item::{DisplayLength, DisplayStretch, DisplayStretchWidth, RenderFaceRef};
-
-    #[test]
-    fn owned_text_resolves_inheritance_and_moves_across_threads() {
-        fn require_send_sync<T: Send + Sync + 'static>() {}
-        require_send_sync::<ResolvedTextInput>();
-        let source = SourceSpan::synthetic(4, 0, 3);
-        let input = ResolvedTextInput::capture(
-            DisplayItem::new(
-                source.clone(),
-                RenderFaceRef::Inherit,
-                DisplayItemKind::TextRun(DisplayTextRun::independent("aλ中")),
-            ),
-            FaceId::new(7),
-        )
-        .expect("ordinary text is supported");
-        let input = std::thread::spawn(move || input).join().unwrap();
-        assert_eq!(input.face, FaceId::new(7));
-        assert_eq!(input.span, source);
-        assert_eq!(input.run.text.as_ref(), "aλ中");
-    }
-
-    #[test]
-    fn non_text_input_returns_unchanged_for_synchronous_processing() {
-        let item = DisplayItem::new(
-            SourceSpan::synthetic(2, 0, 1),
-            RenderFaceRef::Inherit,
-            DisplayItemKind::Stretch(DisplayStretch {
-                width: DisplayStretchWidth::Length(DisplayLength::Pixels(12.0)),
-                height: None,
-                ascent: None,
-            }),
-        );
-        let original = item.clone();
-        assert_eq!(
-            ResolvedTextInput::capture(item, FaceId::new(7)),
-            Err(original)
-        );
-    }
-}
+#[path = "tests/input_test.rs"]
+mod tests;
diff --git a/crates/neomacs-layout-engine/src/row_layout/mapped_input.rs b/crates/neomacs-layout-engine/src/row_layout/mapped_input.rs
index ebd981aaa1..c72ee0bdbc 100644
--- a/crates/neomacs-layout-engine/src/row_layout/mapped_input.rs
+++ b/crates/neomacs-layout-engine/src/row_layout/mapped_input.rs
@@ -49,30 +49,5 @@ impl ResolvedMappedTextInput {
 }
 
 #[cfg(test)]
-mod tests {
-    use super::*;
-    use crate::display_item::{
-        DisplayItemFaceOverlay, DisplaySourceMappedFaceRun, DisplaySourceMappedText, RenderFaceRef,
-    };
-
-    #[test]
-    fn unresolved_mapped_faces_return_the_original_item() {
-        for mapped in [
-            DisplaySourceMappedText::new("ab")
-                .with_semantic_face_overlay(DisplayItemFaceOverlay::EscapeGlyph),
-            DisplaySourceMappedText::new("ab")
-                .with_lisp_face_runs(vec![DisplaySourceMappedFaceRun::new(2, None)]),
-        ] {
-            let item = DisplayItem::new(
-                SourceSpan::synthetic(2, 0, 1),
-                RenderFaceRef::Inherit,
-                DisplayItemKind::SourceMappedText(mapped),
-            );
-            let original = item.clone();
-            assert_eq!(
-                ResolvedMappedTextInput::capture(item, FaceId::new(7)),
-                Err(original)
-            );
-        }
-    }
-}
+#[path = "tests/mapped_input_test.rs"]
+mod tests;
diff --git a/crates/neomacs-layout-engine/src/row_layout/program.rs b/crates/neomacs-layout-engine/src/row_layout/program.rs
index 4ad2dda977..9f5ffbd7c6 100644
--- a/crates/neomacs-layout-engine/src/row_layout/program.rs
+++ b/crates/neomacs-layout-engine/src/row_layout/program.rs
@@ -1154,424 +1154,5 @@ fn measurement_suffix(
 }
 
 #[cfg(test)]
-mod tests {
-    use super::*;
-    use crate::display_row::face_state::DisplayRowGlyphMeasurer;
-    use crate::font::metrics::FontMetricsService;
-    use crate::glyph_advance::GlyphAdvanceQuantization;
-    use crate::neovm_bridge::ResolvedFace;
-
-    fn geometry(width: f32) -> RowProgramGeometry {
-        RowProgramGeometry {
-            inherited_line_spacing: 0.0,
-            character_wrap: false,
-            word_wrap: false,
-            fringe: None,
-            width,
-            metrics: DisplayRowFallbackMetrics::from_default_face_extents(8.0, 16.0, 12.0),
-            tabs: DisplayTabPolicy::every(4),
-            base_face: FaceId::new(1),
-            background: Color::BLACK,
-        }
-    }
-    fn limits() -> RowProgramLimits {
-        RowProgramLimits {
-            items: 16,
-            text_bytes: 4096,
-            glyphs: 1024,
-        }
-    }
-    fn items() -> Vec<DisplayItem> {
-        let text = |id, text: &str| {
-            DisplayItem::new(
-                SourceSpan::synthetic(id, 0, text.chars().count()),
-                RenderFaceRef::FaceId(FaceId::new(id as u32)),
-                DisplayItemKind::TextRun(DisplayTextRun::independent(text)),
-            )
-        };
-        let mut raised = text(2, "affinity 好 café á שלום سلام");
-        raised.layout.raise = Some(0.25);
-        let mut spaced = text(1, "a b\tc");
-        spaced.layout.space_width = Some(1.7);
-        vec![
-            raised,
-            spaced,
-            DisplayItem::new(
-                SourceSpan::synthetic(1, 40, 41),
-                RenderFaceRef::FaceId(FaceId::new(1)),
-                DisplayItemKind::RowBreak(DisplayRowBreak {
-                    line_height: DisplayLineHeightPolicy::Default,
-                    line_spacing: DisplayLineSpacingPolicy::Inherit,
-                }),
-            ),
-        ]
-    }
-    fn faces() -> Vec<DisplayRowFace> {
-        let base = ResolvedFace::default();
-        let mut tall = base.clone();
-        tall.font_size = 26.0;
-        vec![
-            DisplayRowFace::from_resolved(FaceId::new(1), &base),
-            DisplayRowFace::from_resolved(FaceId::new(2), &tall),
-        ]
-    }
-
-    fn ascii_wrapped_program(text: &str) -> RowProgram {
-        let face = FaceId::new(1);
-        let faces = vec![DisplayRowFace::from_resolved(
-            face,
-            &ResolvedFace::default(),
-        )];
-        let mut measurer = DisplayRowGlyphMeasurer::new(&faces, None, 8.0);
-        let mut geometry = geometry(32.0);
-        geometry.character_wrap = true;
-        RowProgram::capture(
-            geometry,
-            [
-                DisplayItem::new(
-                    SourceSpan::synthetic(1, 0, text.len()),
-                    RenderFaceRef::FaceId(face),
-                    DisplayItemKind::TextRun(DisplayTextRun::independent(text)),
-                ),
-                DisplayItem::new(
-                    SourceSpan::synthetic(1, text.len(), text.len() + 1),
-                    RenderFaceRef::FaceId(face),
-                    DisplayItemKind::RowBreak(DisplayRowBreak {
-                        line_height: DisplayLineHeightPolicy::Default,
-                        line_spacing: DisplayLineSpacingPolicy::Inherit,
-                    }),
-                ),
-            ],
-            faces.clone(),
-            &mut measurer,
-            limits(),
-        )
-        .unwrap()
-    }
-
-    fn measured_fragment(text: &str, start: usize, complete: bool) -> RowProgram {
-        let mut program = ascii_wrapped_program(text);
-        for (operation, _) in &mut program.operations {
-            let offset = if matches!(operation, Operation::Break { .. }) {
-                text.len()
-            } else {
-                0
-            };
-            let span = match operation {
-                Operation::Text(input) => &mut input.span,
-                Operation::Break { span, .. } => span,
-                _ => unreachable!(),
-            };
-            let length = if offset == 0 { text.len() } else { 1 };
-            *span = SourceSpan::synthetic(1, start + offset, start + offset + length);
-        }
-        if !complete {
-            program.operations.pop();
-        }
-        program
-    }
-
-    #[test]
-    fn fragment_assembly_preserves_visual_rows_and_drops_unfinished_tail() {
-        let mut prefix = measured_fragment("abcdef", 0, false);
-        let partial = prefix.clone().compute_visual_rows(16, || false).unwrap();
-        assert!(
-            partial
-                .iter()
-                .all(|row| row.end_kind == ComputedRowEnd::Continuation)
-        );
-        assert!(partial.iter().map(|row| row.slots.len()).sum::<usize>() < 6);
-        prefix
-            .append_measured_fragment(
-                measured_fragment("ghijkl", 6, true),
-                RowProgramLimits {
-                    items: 64,
-                    text_bytes: 16384,
-                    glyphs: 4096,
-                },
-            )
-            .unwrap();
-        let joined = prefix.compute_visual_rows(16, || false).unwrap();
-        let whole = ascii_wrapped_program("abcdefghijkl")
-            .compute_visual_rows(16, || false)
-            .unwrap();
-        assert_eq!(joined.len(), whole.len());
-        for (joined, whole) in joined.iter().zip(&whole) {
-            assert_eq!(joined.source, whole.source);
-            assert_eq!(joined.end_kind, whole.end_kind);
-            assert_eq!(joined.slots.len(), whole.slots.len());
-            // `==`, not the Debug text: each row carries its own appearance
-            // id (`RowAppearance`), an identity that row equality ignores.
-            assert_eq!(joined.row, whole.row);
-        }
-    }
-
-    #[test]
-    fn fragment_assembly_rejects_gaps_geometry_changes_and_budget_overflow() {
-        let maximum = RowProgramLimits {
-            items: 64,
-            text_bytes: 16384,
-            glyphs: 4096,
-        };
-        let prefix = measured_fragment("abcd", 0, false);
-        assert!(matches!(
-            prefix
-                .clone()
-                .append_measured_fragment(measured_fragment("efgh", 5, true), maximum),
-            Err(RowProgramError::Unsupported)
-        ));
-        let mut next = measured_fragment("efgh", 4, true);
-        next.geometry.width += 1.0;
-        assert!(matches!(
-            prefix.clone().append_measured_fragment(next, maximum),
-            Err(RowProgramError::Unsupported)
-        ));
-        assert!(matches!(
-            prefix
-                .clone()
-                .append_measured_fragment(measured_fragment("efgh", 4, true), limits()),
-            Err(RowProgramError::Budget)
-        ));
-        let mut next = measured_fragment("efgh", 4, true);
-        next.measurements.char_width += 1.0;
-        assert!(matches!(
-            prefix.clone().append_measured_fragment(next, maximum),
-            Err(RowProgramError::Unsupported)
-        ));
-        let mut next = measured_fragment("efgh", 4, true);
-        next.faces[0].font_size += 1.0;
-        assert!(matches!(
-            prefix.clone().append_measured_fragment(next, maximum),
-            Err(RowProgramError::Cancelled)
-        ));
-        assert!(matches!(
-            prefix.compute_visual_rows(16, || true),
-            Err(RowProgramError::Cancelled)
-        ));
-    }
-
-    #[test]
-    fn wrapped_program_bounds_visual_rows_and_total_glyphs() {
-        let program = ascii_wrapped_program("abcdefghijkl");
-        let rows = program.clone().compute_visual_rows(16, || false).unwrap();
-        assert!(rows.len() > 1);
-        assert!(
-            rows[..rows.len() - 1]
-                .iter()
-                .all(|row| row.end_kind == ComputedRowEnd::Continuation)
-        );
-        assert_eq!(rows.last().unwrap().end_kind, ComputedRowEnd::Newline);
-        assert_eq!(rows.iter().map(|row| row.slots.len()).sum::<usize>(), 12);
-        let prefix = program.clone().compute_visual_rows(1, || false).unwrap();
-        assert_eq!(prefix.len(), 1);
-        assert_eq!(prefix[0].end_kind, ComputedRowEnd::Continuation);
-        assert!(matches!(
-            program.clone().compute(|| false),
-            Err(RowProgramError::Overflow)
-        ));
-        assert!(matches!(
-            program.clone().compute_visual_rows(0, || false),
-            Err(RowProgramError::Budget)
-        ));
-        let mut small = program;
-        small.limits.glyphs = 5;
-        assert!(matches!(
-            small.compute_visual_rows(16, || false),
-            Err(RowProgramError::Budget)
-        ));
-    }
-
-    #[test]
-    fn wrapped_program_supports_tab_after_continuation_and_rejects_cancellation() {
-        let rows = ascii_wrapped_program("abcdefghijkl\tz")
-            .compute_visual_rows(16, || false)
-            .unwrap();
-        assert_eq!(rows.last().unwrap().end_kind, ComputedRowEnd::Newline);
-        let calls = std::cell::Cell::new(0);
-        assert!(matches!(
-            ascii_wrapped_program("abcdefghijkl").compute_visual_rows(16, || {
-                calls.set(calls.get() + 1);
-                calls.get() > 1
-            }),
-            Err(RowProgramError::Cancelled)
-        ));
-    }
-
-    #[test]
-    fn complete_row_program_uses_exact_captured_fonts_on_worker() {
-        fn require_send<T: Send + 'static>() {}
-        require_send::<RowProgram>();
-        require_send::<ComputedRow>();
-        let faces = faces();
-        let mut fonts = FontMetricsService::new();
-        let mut measurer = DisplayRowGlyphMeasurer::with_mode(
-            &faces,
-            Some(&mut fonts),
-            8.0,
-            GlyphAdvanceQuantization::PreserveLogicalPixels,
-            DisplayRowMeasurementMode::ConcreteFont,
-        );
-        let geometry = geometry(2000.0);
-        let inputs = items();
-        let job = RowProgram::capture(
-            geometry.clone(),
-            inputs.clone(),
-            faces.clone(),
-            &mut measurer,
-            limits(),
-        )
-        .unwrap();
-        // Independent synchronous writer call: no capture or replay adapter.
-        let layout = geometry.layout();
-        let mut expected = new_display_row(&layout);
-        let mut position = DisplayRowPosition::new(0.0, 0);
-        let mut slots = Vec::new();
-        for input in inputs {
-            // Match the buffer source's active-face installation before
-            // handing the item to the independent synchronous glyph writer.
-            let face = faces
-                .iter()
-                .find(|face| face.face_id == render_face_ref_id(input.face, geometry.base_face))
-                .unwrap();
-            let minimum = measurer.face_vertical_metrics_px(face.face_id).unwrap_or(
-                DisplayRowVerticalMetrics::new(
-                    face.metrics.line_height_px(),
-                    face.metrics.ascent_px(),
-                ),
-            );
-            let mut item_layout = layout.clone();
-            item_layout.height_px = expected.height_px.max(minimum.height_px());
-            item_layout.ascent_px = expected.ascent_px.max(minimum.ascent_px());
-            let newline = match input.kind {
-                DisplayItemKind::RowBreak(value) => Some(value),
-                _ => None,
-            };
-            let progress = DisplayRowProgressWriter::with_glyph_measurer(
-                &item_layout,
-                &mut expected,
-                &mut measurer,
-                position,
-                geometry.width,
-            )
-            .push_item(input);
-            assert_ne!(progress.status(), DisplayRowAppendStatus::Clipped);
-            position = progress.end();
-            slots.extend(progress.slots().iter().cloned());
-            if let Some(newline) = newline {
-                DisplayRowLineEndFinalizer::new(
-                    newline,
-                    FaceId::new(1),
-                    geometry.width - position.x_px(),
-                    geometry.metrics,
-                    geometry.background,
-                    DisplayRowMeasurementMode::ConcreteFont,
-                    Default::default(),
-                    Default::default(),
-                )
-                .finalize(&mut expected, &faces);
-            }
-        }
-        crate::glyph_row_writer::normalize_external_row(&mut expected);
-        // Dropping the real font service before spawning prevents accidental
-        // dependence on a live catalog or a fresh default-font worker.
-        drop(measurer);
-        drop(fonts);
-        let actual = std::thread::spawn(move || job.compute(|| false))
-            .join()
-            .unwrap()
-            .unwrap();
-        assert_eq!(actual.row, expected);
-        assert_eq!(actual.slots, slots);
-    }
-
-    #[test]
-    fn incomplete_overbudget_cancelled_and_clipped_rows_are_never_admitted() {
-        let faces = faces();
-        let mut measurer = DisplayRowGlyphMeasurer::new(&faces, None, 8.0);
-        assert!(matches!(
-            RowProgram::capture(
-                geometry(2000.0),
-                items().into_iter().take(1),
-                faces.clone(),
-                &mut measurer,
-                limits()
-            ),
-            Err(RowProgramError::Incomplete)
-        ));
-        for budget in [
-            RowProgramLimits {
-                items: 1,
-                ..limits()
-            },
-            RowProgramLimits {
-                text_bytes: 1,
-                ..limits()
-            },
-            RowProgramLimits {
-                glyphs: 1,
-                ..limits()
-            },
-        ] {
-            assert!(matches!(
-                RowProgram::capture(
-                    geometry(2000.0),
-                    items(),
-                    faces.clone(),
-                    &mut measurer,
-                    budget
-                ),
-                Err(RowProgramError::Budget)
-            ));
-        }
-        let job = RowProgram::capture(
-            geometry(2000.0),
-            items(),
-            faces.clone(),
-            &mut measurer,
-            limits(),
-        )
-        .unwrap();
-        assert!(matches!(
-            job.compute(|| true),
-            Err(RowProgramError::Cancelled)
-        ));
-        let job = RowProgram::capture(
-            geometry(8.0),
-            items(),
-            faces.clone(),
-            &mut measurer,
-            limits(),
-        )
-        .unwrap();
-        assert!(matches!(
-            job.compute(|| false),
-            Err(RowProgramError::Overflow)
-        ));
-    }
-
-    #[test]
-    fn named_line_spacing_never_crosses_worker_boundary() {
-        let _eval = neovm_core::emacs_core::Context::new();
-        let faces = faces();
-        let mut measurer = DisplayRowGlyphMeasurer::new(&faces, None, 8.0);
-        let mut input = items();
-        if let DisplayItemKind::RowBreak(value) = &mut input.last_mut().unwrap().kind {
-            value.line_spacing = DisplayLineSpacingPolicy::Scale {
-                factor: 1.5,
-                reference: DisplayLineSpacingReference::Named(
-                    neovm_core::emacs_core::Value::symbol("default"),
-                ),
-            };
-        }
-        assert!(matches!(
-            RowProgram::capture(
-                geometry(2000.0),
-                input,
-                faces.clone(),
-                &mut measurer,
-                limits()
-            ),
-            Err(RowProgramError::Unsupported)
-        ));
-    }
-}
+#[path = "tests/program_test.rs"]
+mod tests;
diff --git a/crates/neomacs-layout-engine/src/row_layout/spacing_input.rs b/crates/neomacs-layout-engine/src/row_layout/spacing_input.rs
index 643fa801c4..b53f8ceefa 100644
--- a/crates/neomacs-layout-engine/src/row_layout/spacing_input.rs
+++ b/crates/neomacs-layout-engine/src/row_layout/spacing_input.rs
@@ -126,47 +126,5 @@ impl ResolvedSpacingInput {
 }
 
 #[cfg(test)]
-mod tests {
-    use super::*;
-    use neovm_core::emacs_core::{Context, Value};
-
-    #[test]
-    fn every_lisp_spacing_operand_is_rejected_intact() {
-        let _eval = Context::new();
-        let expression = Value::list(vec![Value::symbol("+"), Value::fixnum(2), Value::fixnum(3)]);
-        let literal = DisplayStretchWidth::Length(DisplayLength::Pixels(16.0));
-        for stretch in [
-            DisplayStretch {
-                width: DisplayStretchWidth::AlignTo(expression),
-                height: None,
-                ascent: None,
-            },
-            DisplayStretch {
-                width: DisplayStretchWidth::Length(DisplayLength::Expr(expression)),
-                height: None,
-                ascent: None,
-            },
-            DisplayStretch {
-                width: literal.clone(),
-                height: Some(DisplayLength::Expr(expression)),
-                ascent: None,
-            },
-            DisplayStretch {
-                width: literal,
-                height: None,
-                ascent: Some(DisplayLength::Expr(expression)),
-            },
-        ] {
-            let item = DisplayItem::new(
-                SourceSpan::synthetic(1, 0, 1),
-                RenderFaceRef::Inherit,
-                DisplayItemKind::Stretch(stretch),
-            );
-            let original = item.clone();
-            assert_eq!(
-                ResolvedSpacingInput::capture(item, FaceId::new(2)),
-                Err(original)
-            );
-        }
-    }
-}
+#[path = "tests/spacing_input_test.rs"]
+mod tests;
diff --git a/crates/neomacs-layout-engine/src/row_layout/tests/font_measurement_test.rs b/crates/neomacs-layout-engine/src/row_layout/tests/font_measurement_test.rs
new file mode 100644
index 0000000000..65bbdb97fe
--- /dev/null
+++ b/crates/neomacs-layout-engine/src/row_layout/tests/font_measurement_test.rs
@@ -0,0 +1,110 @@
+use super::*;
+use crate::neovm_bridge::ResolvedFace;
+use neomacs_display_protocol::types::FaceId;
+
+fn face() -> DisplayRowFace {
+    DisplayRowFace::from_resolved(FaceId::new(1), &ResolvedFace::default())
+}
+
+#[test]
+fn cancellation_does_not_initialize_native_fonts() {
+    let mut source = FontMetricsService::new();
+    let faces = [face()];
+    let snapshot = FontMeasurementSnapshot::capture(&faces, &mut source, &[]).unwrap();
+    let mut worker = WorkerFontMeasurements::default();
+    assert!(matches!(
+        worker.prepare(&snapshot, &faces, &|| true),
+        Err(RowProgramError::Cancelled)
+    ));
+    assert!(worker.service.is_none());
+}
+
+#[test]
+fn changed_font_metrics_reject_worker_measurement() {
+    let mut source = FontMetricsService::new();
+    let faces = [face()];
+    let mut snapshot = FontMeasurementSnapshot::capture(&faces, &mut source, &[]).unwrap();
+    snapshot.receipts[0].ascent += 1.0;
+    let mut worker = WorkerFontMeasurements::default();
+    assert!(matches!(
+        worker.prepare(&snapshot, &faces, &|| false),
+        Err(RowProgramError::Cancelled)
+    ));
+}
+
+#[test]
+fn font_receipts_are_bounded_before_submission() {
+    let mut source = FontMetricsService::new();
+    let faces = vec![face(); MAX_CACHED_FACES];
+    assert!(matches!(
+        FontMeasurementSnapshot::capture(&faces, &mut source, &[]),
+        Err(RowProgramError::Budget)
+    ));
+}
+
+#[test]
+fn worker_matches_captured_fonts_after_scale_change() {
+    let mut source = FontMetricsService::new();
+    let faces = [face()];
+    let mut worker = WorkerFontMeasurements::default();
+    for scale in [1.0, 1.5, 2.0, 1.0] {
+        source.set_device_scale(DeviceScale::new(scale).unwrap());
+        let snapshot = FontMeasurementSnapshot::capture(&faces, &mut source, &[]).unwrap();
+        let service = worker.prepare(&snapshot, &faces, &|| false).unwrap();
+        assert_eq!(service.device_scale().get(), scale);
+    }
+}
+#[test]
+fn repeated_worker_unicode_queries_keep_native_font_caches_warm() {
+    use crate::display_item::*;
+    let mut source = FontMetricsService::new();
+    let faces = [face()];
+    let items = [DisplayItem::new(
+        SourceSpan::synthetic(1, 0, 1),
+        RenderFaceRef::FaceId(faces[0].face_id),
+        DisplayItemKind::TextRun(DisplayTextRun::independent("中")),
+    )];
+    let snapshot = FontMeasurementSnapshot::capture(&faces, &mut source, &items).unwrap();
+    let mut worker = WorkerFontMeasurements::default();
+    for _ in 0..MAX_CACHED_CHARACTER_QUERIES + 1 {
+        let service = worker.prepare(&snapshot, &faces, &|| false).unwrap();
+        let face = &faces[0];
+        assert!(
+            service
+                .resolved_font_for_char(
+                    '中',
+                    &face.font_family,
+                    face.font_weight,
+                    face.italic,
+                    face.font_size
+                )
+                .is_some()
+        );
+        assert!(!service.worker_font_policy_missing());
+    }
+    assert_eq!(
+        worker.cache_rebuilds, 1,
+        "repeated use is not working-set growth"
+    );
+}
+
+#[test]
+fn worker_font_face_budget_counts_distinct_selections() {
+    let mut source = FontMetricsService::new();
+    let mut worker = WorkerFontMeasurements::default();
+    for index in 0..MAX_CACHED_FACES {
+        let mut current = face();
+        current.font_size = 10.0 + index as f32;
+        let faces = [current];
+        let snapshot = FontMeasurementSnapshot::capture(&faces, &mut source, &[]).unwrap();
+        worker.prepare(&snapshot, &faces, &|| false).unwrap();
+    }
+    for size in [10.0, 10.0 + MAX_CACHED_FACES as f32] {
+        let mut current = face();
+        current.font_size = size;
+        let faces = [current];
+        let snapshot = FontMeasurementSnapshot::capture(&faces, &mut source, &[]).unwrap();
+        worker.prepare(&snapshot, &faces, &|| false).unwrap();
+        assert_eq!(worker.cache_rebuilds, if size == 10.0 { 1 } else { 2 });
+    }
+}
diff --git a/crates/neomacs-layout-engine/src/row_layout/tests/input_test.rs b/crates/neomacs-layout-engine/src/row_layout/tests/input_test.rs
new file mode 100644
index 0000000000..393aa684e4
--- /dev/null
+++ b/crates/neomacs-layout-engine/src/row_layout/tests/input_test.rs
@@ -0,0 +1,40 @@
+use super::*;
+use crate::display_item::{DisplayLength, DisplayStretch, DisplayStretchWidth, RenderFaceRef};
+
+#[test]
+fn owned_text_resolves_inheritance_and_moves_across_threads() {
+    fn require_send_sync<T: Send + Sync + 'static>() {}
+    require_send_sync::<ResolvedTextInput>();
+    let source = SourceSpan::synthetic(4, 0, 3);
+    let input = ResolvedTextInput::capture(
+        DisplayItem::new(
+            source.clone(),
+            RenderFaceRef::Inherit,
+            DisplayItemKind::TextRun(DisplayTextRun::independent("aλ中")),
+        ),
+        FaceId::new(7),
+    )
+    .expect("ordinary text is supported");
+    let input = std::thread::spawn(move || input).join().unwrap();
+    assert_eq!(input.face, FaceId::new(7));
+    assert_eq!(input.span, source);
+    assert_eq!(input.run.text.as_ref(), "aλ中");
+}
+
+#[test]
+fn non_text_input_returns_unchanged_for_synchronous_processing() {
+    let item = DisplayItem::new(
+        SourceSpan::synthetic(2, 0, 1),
+        RenderFaceRef::Inherit,
+        DisplayItemKind::Stretch(DisplayStretch {
+            width: DisplayStretchWidth::Length(DisplayLength::Pixels(12.0)),
+            height: None,
+            ascent: None,
+        }),
+    );
+    let original = item.clone();
+    assert_eq!(
+        ResolvedTextInput::capture(item, FaceId::new(7)),
+        Err(original)
+    );
+}
diff --git a/crates/neomacs-layout-engine/src/row_layout/tests/mapped_input_test.rs b/crates/neomacs-layout-engine/src/row_layout/tests/mapped_input_test.rs
new file mode 100644
index 0000000000..e3ccba9c69
--- /dev/null
+++ b/crates/neomacs-layout-engine/src/row_layout/tests/mapped_input_test.rs
@@ -0,0 +1,25 @@
+use super::*;
+use crate::display_item::{
+    DisplayItemFaceOverlay, DisplaySourceMappedFaceRun, DisplaySourceMappedText, RenderFaceRef,
+};
+
+#[test]
+fn unresolved_mapped_faces_return_the_original_item() {
+    for mapped in [
+        DisplaySourceMappedText::new("ab")
+            .with_semantic_face_overlay(DisplayItemFaceOverlay::EscapeGlyph),
+        DisplaySourceMappedText::new("ab")
+            .with_lisp_face_runs(vec![DisplaySourceMappedFaceRun::new(2, None)]),
+    ] {
+        let item = DisplayItem::new(
+            SourceSpan::synthetic(2, 0, 1),
+            RenderFaceRef::Inherit,
+            DisplayItemKind::SourceMappedText(mapped),
+        );
+        let original = item.clone();
+        assert_eq!(
+            ResolvedMappedTextInput::capture(item, FaceId::new(7)),
+            Err(original)
+        );
+    }
+}
diff --git a/crates/neomacs-layout-engine/src/row_layout/tests/program_test.rs b/crates/neomacs-layout-engine/src/row_layout/tests/program_test.rs
new file mode 100644
index 0000000000..14b6707de9
--- /dev/null
+++ b/crates/neomacs-layout-engine/src/row_layout/tests/program_test.rs
@@ -0,0 +1,416 @@
+use super::*;
+use crate::display_row::face_state::DisplayRowGlyphMeasurer;
+use crate::font::metrics::FontMetricsService;
+use crate::glyph_advance::GlyphAdvanceQuantization;
+use crate::neovm_bridge::ResolvedFace;
+
+fn geometry(width: f32) -> RowProgramGeometry {
+    RowProgramGeometry {
+        inherited_line_spacing: 0.0,
+        character_wrap: false,
+        word_wrap: false,
+        fringe: None,
+        width,
+        metrics: DisplayRowFallbackMetrics::from_default_face_extents(8.0, 16.0, 12.0),
+        tabs: DisplayTabPolicy::every(4),
+        base_face: FaceId::new(1),
+        background: Color::BLACK,
+    }
+}
+fn limits() -> RowProgramLimits {
+    RowProgramLimits {
+        items: 16,
+        text_bytes: 4096,
+        glyphs: 1024,
+    }
+}
+fn items() -> Vec<DisplayItem> {
+    let text = |id, text: &str| {
+        DisplayItem::new(
+            SourceSpan::synthetic(id, 0, text.chars().count()),
+            RenderFaceRef::FaceId(FaceId::new(id as u32)),
+            DisplayItemKind::TextRun(DisplayTextRun::independent(text)),
+        )
+    };
+    let mut raised = text(2, "affinity 好 café á שלום سلام");
+    raised.layout.raise = Some(0.25);
+    let mut spaced = text(1, "a b\tc");
+    spaced.layout.space_width = Some(1.7);
+    vec![
+        raised,
+        spaced,
+        DisplayItem::new(
+            SourceSpan::synthetic(1, 40, 41),
+            RenderFaceRef::FaceId(FaceId::new(1)),
+            DisplayItemKind::RowBreak(DisplayRowBreak {
+                line_height: DisplayLineHeightPolicy::Default,
+                line_spacing: DisplayLineSpacingPolicy::Inherit,
+            }),
+        ),
+    ]
+}
+fn faces() -> Vec<DisplayRowFace> {
+    let base = ResolvedFace::default();
+    let mut tall = base.clone();
+    tall.font_size = 26.0;
+    vec![
+        DisplayRowFace::from_resolved(FaceId::new(1), &base),
+        DisplayRowFace::from_resolved(FaceId::new(2), &tall),
+    ]
+}
+
+fn ascii_wrapped_program(text: &str) -> RowProgram {
+    let face = FaceId::new(1);
+    let faces = vec![DisplayRowFace::from_resolved(
+        face,
+        &ResolvedFace::default(),
+    )];
+    let mut measurer = DisplayRowGlyphMeasurer::new(&faces, None, 8.0);
+    let mut geometry = geometry(32.0);
+    geometry.character_wrap = true;
+    RowProgram::capture(
+        geometry,
+        [
+            DisplayItem::new(
+                SourceSpan::synthetic(1, 0, text.len()),
+                RenderFaceRef::FaceId(face),
+                DisplayItemKind::TextRun(DisplayTextRun::independent(text)),
+            ),
+            DisplayItem::new(
+                SourceSpan::synthetic(1, text.len(), text.len() + 1),
+                RenderFaceRef::FaceId(face),
+                DisplayItemKind::RowBreak(DisplayRowBreak {
+                    line_height: DisplayLineHeightPolicy::Default,
+                    line_spacing: DisplayLineSpacingPolicy::Inherit,
+                }),
+            ),
+        ],
+        faces.clone(),
+        &mut measurer,
+        limits(),
+    )
+    .unwrap()
+}
+
+fn measured_fragment(text: &str, start: usize, complete: bool) -> RowProgram {
+    let mut program = ascii_wrapped_program(text);
+    for (operation, _) in &mut program.operations {
+        let offset = if matches!(operation, Operation::Break { .. }) {
+            text.len()
+        } else {
+            0
+        };
+        let span = match operation {
+            Operation::Text(input) => &mut input.span,
+            Operation::Break { span, .. } => span,
+            _ => unreachable!(),
+        };
+        let length = if offset == 0 { text.len() } else { 1 };
+        *span = SourceSpan::synthetic(1, start + offset, start + offset + length);
+    }
+    if !complete {
+        program.operations.pop();
+    }
+    program
+}
+
+#[test]
+fn fragment_assembly_preserves_visual_rows_and_drops_unfinished_tail() {
+    let mut prefix = measured_fragment("abcdef", 0, false);
+    let partial = prefix.clone().compute_visual_rows(16, || false).unwrap();
+    assert!(
+        partial
+            .iter()
+            .all(|row| row.end_kind == ComputedRowEnd::Continuation)
+    );
+    assert!(partial.iter().map(|row| row.slots.len()).sum::<usize>() < 6);
+    prefix
+        .append_measured_fragment(
+            measured_fragment("ghijkl", 6, true),
+            RowProgramLimits {
+                items: 64,
+                text_bytes: 16384,
+                glyphs: 4096,
+            },
+        )
+        .unwrap();
+    let joined = prefix.compute_visual_rows(16, || false).unwrap();
+    let whole = ascii_wrapped_program("abcdefghijkl")
+        .compute_visual_rows(16, || false)
+        .unwrap();
+    assert_eq!(joined.len(), whole.len());
+    for (joined, whole) in joined.iter().zip(&whole) {
+        assert_eq!(joined.source, whole.source);
+        assert_eq!(joined.end_kind, whole.end_kind);
+        assert_eq!(joined.slots.len(), whole.slots.len());
+        // `==`, not the Debug text: each row carries its own appearance
+        // id (`RowAppearance`), an identity that row equality ignores.
+        assert_eq!(joined.row, whole.row);
+    }
+}
+
+#[test]
+fn fragment_assembly_rejects_gaps_geometry_changes_and_budget_overflow() {
+    let maximum = RowProgramLimits {
+        items: 64,
+        text_bytes: 16384,
+        glyphs: 4096,
+    };
+    let prefix = measured_fragment("abcd", 0, false);
+    assert!(matches!(
+        prefix
+            .clone()
+            .append_measured_fragment(measured_fragment("efgh", 5, true), maximum),
+        Err(RowProgramError::Unsupported)
+    ));
+    let mut next = measured_fragment("efgh", 4, true);
+    next.geometry.width += 1.0;
+    assert!(matches!(
+        prefix.clone().append_measured_fragment(next, maximum),
+        Err(RowProgramError::Unsupported)
+    ));
+    assert!(matches!(
+        prefix
+            .clone()
+            .append_measured_fragment(measured_fragment("efgh", 4, true), limits()),
+        Err(RowProgramError::Budget)
+    ));
+    let mut next = measured_fragment("efgh", 4, true);
+    next.measurements.char_width += 1.0;
+    assert!(matches!(
+        prefix.clone().append_measured_fragment(next, maximum),
+        Err(RowProgramError::Unsupported)
+    ));
+    let mut next = measured_fragment("efgh", 4, true);
+    next.faces[0].font_size += 1.0;
+    assert!(matches!(
+        prefix.clone().append_measured_fragment(next, maximum),
+        Err(RowProgramError::Cancelled)
+    ));
+    assert!(matches!(
+        prefix.compute_visual_rows(16, || true),
+        Err(RowProgramError::Cancelled)
+    ));
+}
+
+#[test]
+fn wrapped_program_bounds_visual_rows_and_total_glyphs() {
+    let program = ascii_wrapped_program("abcdefghijkl");
+    let rows = program.clone().compute_visual_rows(16, || false).unwrap();
+    assert!(rows.len() > 1);
+    assert!(
+        rows[..rows.len() - 1]
+            .iter()
+            .all(|row| row.end_kind == ComputedRowEnd::Continuation)
+    );
+    assert_eq!(rows.last().unwrap().end_kind, ComputedRowEnd::Newline);
+    assert_eq!(rows.iter().map(|row| row.slots.len()).sum::<usize>(), 12);
+    let prefix = program.clone().compute_visual_rows(1, || false).unwrap();
+    assert_eq!(prefix.len(), 1);
+    assert_eq!(prefix[0].end_kind, ComputedRowEnd::Continuation);
+    assert!(matches!(
+        program.clone().compute(|| false),
+        Err(RowProgramError::Overflow)
+    ));
+    assert!(matches!(
+        program.clone().compute_visual_rows(0, || false),
+        Err(RowProgramError::Budget)
+    ));
+    let mut small = program;
+    small.limits.glyphs = 5;
+    assert!(matches!(
+        small.compute_visual_rows(16, || false),
+        Err(RowProgramError::Budget)
+    ));
+}
+
+#[test]
+fn wrapped_program_supports_tab_after_continuation_and_rejects_cancellation() {
+    let rows = ascii_wrapped_program("abcdefghijkl\tz")
+        .compute_visual_rows(16, || false)
+        .unwrap();
+    assert_eq!(rows.last().unwrap().end_kind, ComputedRowEnd::Newline);
+    let calls = std::cell::Cell::new(0);
+    assert!(matches!(
+        ascii_wrapped_program("abcdefghijkl").compute_visual_rows(16, || {
+            calls.set(calls.get() + 1);
+            calls.get() > 1
+        }),
+        Err(RowProgramError::Cancelled)
+    ));
+}
+
+#[test]
+fn complete_row_program_uses_exact_captured_fonts_on_worker() {
+    fn require_send<T: Send + 'static>() {}
+    require_send::<RowProgram>();
+    require_send::<ComputedRow>();
+    let faces = faces();
+    let mut fonts = FontMetricsService::new();
+    let mut measurer = DisplayRowGlyphMeasurer::with_mode(
+        &faces,
+        Some(&mut fonts),
+        8.0,
+        GlyphAdvanceQuantization::PreserveLogicalPixels,
+        DisplayRowMeasurementMode::ConcreteFont,
+    );
+    let geometry = geometry(2000.0);
+    let inputs = items();
+    let job = RowProgram::capture(
+        geometry.clone(),
+        inputs.clone(),
+        faces.clone(),
+        &mut measurer,
+        limits(),
+    )
+    .unwrap();
+    // Independent synchronous writer call: no capture or replay adapter.
+    let layout = geometry.layout();
+    let mut expected = new_display_row(&layout);
+    let mut position = DisplayRowPosition::new(0.0, 0);
+    let mut slots = Vec::new();
+    for input in inputs {
+        // Match the buffer source's active-face installation before
+        // handing the item to the independent synchronous glyph writer.
+        let face = faces
+            .iter()
+            .find(|face| face.face_id == render_face_ref_id(input.face, geometry.base_face))
+            .unwrap();
+        let minimum = measurer.face_vertical_metrics_px(face.face_id).unwrap_or(
+            DisplayRowVerticalMetrics::new(face.metrics.line_height_px(), face.metrics.ascent_px()),
+        );
+        let mut item_layout = layout.clone();
+        item_layout.height_px = expected.height_px.max(minimum.height_px());
+        item_layout.ascent_px = expected.ascent_px.max(minimum.ascent_px());
+        let newline = match input.kind {
+            DisplayItemKind::RowBreak(value) => Some(value),
+            _ => None,
+        };
+        let progress = DisplayRowProgressWriter::with_glyph_measurer(
+            &item_layout,
+            &mut expected,
+            &mut measurer,
+            position,
+            geometry.width,
+        )
+        .push_item(input);
+        assert_ne!(progress.status(), DisplayRowAppendStatus::Clipped);
+        position = progress.end();
+        slots.extend(progress.slots().iter().cloned());
+        if let Some(newline) = newline {
+            DisplayRowLineEndFinalizer::new(
+                newline,
+                FaceId::new(1),
+                geometry.width - position.x_px(),
+                geometry.metrics,
+                geometry.background,
+                DisplayRowMeasurementMode::ConcreteFont,
+                Default::default(),
+                Default::default(),
+            )
+            .finalize(&mut expected, &faces);
+        }
+    }
+    crate::glyph_row_writer::normalize_external_row(&mut expected);
+    // Dropping the real font service before spawning prevents accidental
+    // dependence on a live catalog or a fresh default-font worker.
+    drop(measurer);
+    drop(fonts);
+    let actual = std::thread::spawn(move || job.compute(|| false))
+        .join()
+        .unwrap()
+        .unwrap();
+    assert_eq!(actual.row, expected);
+    assert_eq!(actual.slots, slots);
+}
+
+#[test]
+fn incomplete_overbudget_cancelled_and_clipped_rows_are_never_admitted() {
+    let faces = faces();
+    let mut measurer = DisplayRowGlyphMeasurer::new(&faces, None, 8.0);
+    assert!(matches!(
+        RowProgram::capture(
+            geometry(2000.0),
+            items().into_iter().take(1),
+            faces.clone(),
+            &mut measurer,
+            limits()
+        ),
+        Err(RowProgramError::Incomplete)
+    ));
+    for budget in [
+        RowProgramLimits {
+            items: 1,
+            ..limits()
+        },
+        RowProgramLimits {
+            text_bytes: 1,
+            ..limits()
+        },
+        RowProgramLimits {
+            glyphs: 1,
+            ..limits()
+        },
+    ] {
+        assert!(matches!(
+            RowProgram::capture(
+                geometry(2000.0),
+                items(),
+                faces.clone(),
+                &mut measurer,
+                budget
+            ),
+            Err(RowProgramError::Budget)
+        ));
+    }
+    let job = RowProgram::capture(
+        geometry(2000.0),
+        items(),
+        faces.clone(),
+        &mut measurer,
+        limits(),
+    )
+    .unwrap();
+    assert!(matches!(
+        job.compute(|| true),
+        Err(RowProgramError::Cancelled)
+    ));
+    let job = RowProgram::capture(
+        geometry(8.0),
+        items(),
+        faces.clone(),
+        &mut measurer,
+        limits(),
+    )
+    .unwrap();
+    assert!(matches!(
+        job.compute(|| false),
+        Err(RowProgramError::Overflow)
+    ));
+}
+
+#[test]
+fn named_line_spacing_never_crosses_worker_boundary() {
+    let _eval = neovm_core::emacs_core::Context::new();
+    let faces = faces();
+    let mut measurer = DisplayRowGlyphMeasurer::new(&faces, None, 8.0);
+    let mut input = items();
+    if let DisplayItemKind::RowBreak(value) = &mut input.last_mut().unwrap().kind {
+        value.line_spacing = DisplayLineSpacingPolicy::Scale {
+            factor: 1.5,
+            reference: DisplayLineSpacingReference::Named(neovm_core::emacs_core::Value::symbol(
+                "default",
+            )),
+        };
+    }
+    assert!(matches!(
+        RowProgram::capture(
+            geometry(2000.0),
+            input,
+            faces.clone(),
+            &mut measurer,
+            limits()
+        ),
+        Err(RowProgramError::Unsupported)
+    ));
+}
diff --git a/crates/neomacs-layout-engine/src/row_layout/tests/spacing_input_test.rs b/crates/neomacs-layout-engine/src/row_layout/tests/spacing_input_test.rs
new file mode 100644
index 0000000000..63abbc3d01
--- /dev/null
+++ b/crates/neomacs-layout-engine/src/row_layout/tests/spacing_input_test.rs
@@ -0,0 +1,42 @@
+use super::*;
+use neovm_core::emacs_core::{Context, Value};
+
+#[test]
+fn every_lisp_spacing_operand_is_rejected_intact() {
+    let _eval = Context::new();
+    let expression = Value::list(vec![Value::symbol("+"), Value::fixnum(2), Value::fixnum(3)]);
+    let literal = DisplayStretchWidth::Length(DisplayLength::Pixels(16.0));
+    for stretch in [
+        DisplayStretch {
+            width: DisplayStretchWidth::AlignTo(expression),
+            height: None,
+            ascent: None,
+        },
+        DisplayStretch {
+            width: DisplayStretchWidth::Length(DisplayLength::Expr(expression)),
+            height: None,
+            ascent: None,
+        },
+        DisplayStretch {
+            width: literal.clone(),
+            height: Some(DisplayLength::Expr(expression)),
+            ascent: None,
+        },
+        DisplayStretch {
+            width: literal,
+            height: None,
+            ascent: Some(DisplayLength::Expr(expression)),
+        },
+    ] {
+        let item = DisplayItem::new(
+            SourceSpan::synthetic(1, 0, 1),
+            RenderFaceRef::Inherit,
+            DisplayItemKind::Stretch(stretch),
+        );
+        let original = item.clone();
+        assert_eq!(
+            ResolvedSpacingInput::capture(item, FaceId::new(2)),
+            Err(original)
+        );
+    }
+}
diff --git a/crates/neomacs-layout-engine/src/row_layout/tests/worker_test.rs b/crates/neomacs-layout-engine/src/row_layout/tests/worker_test.rs
new file mode 100644
index 0000000000..2131a8726b
--- /dev/null
+++ b/crates/neomacs-layout-engine/src/row_layout/tests/worker_test.rs
@@ -0,0 +1,133 @@
+use super::super::program::{RowProgramGeometry, RowProgramLimits};
+use super::*;
+use crate::display_item::*;
+use crate::display_row::builder::DisplayTabPolicy;
+use crate::display_row::face_state::{DisplayRowFace, DisplayRowGlyphMeasurer};
+use crate::display_row::metrics::DisplayRowFallbackMetrics;
+use crate::neovm_bridge::ResolvedFace;
+use neomacs_display_protocol::types::{Color, FaceId};
+
+fn row(text: &str) -> RowProgram {
+    row_with_wrap(text, 1000.0, false)
+}
+
+fn row_with_wrap(text: &str, width: f32, character_wrap: bool) -> RowProgram {
+    let face = FaceId::new(1);
+    let faces = vec![DisplayRowFace::from_resolved(
+        face,
+        &ResolvedFace::default(),
+    )];
+    let mut measurer = DisplayRowGlyphMeasurer::new(&faces, None, 8.0);
+    RowProgram::capture(
+        RowProgramGeometry {
+            inherited_line_spacing: 0.0,
+            character_wrap,
+            word_wrap: false,
+            fringe: None,
+            width,
+            metrics: DisplayRowFallbackMetrics::from_default_face_extents(8.0, 16.0, 12.0),
+            tabs: DisplayTabPolicy::every(4),
+            base_face: face,
+            background: Color::BLACK,
+        },
+        [
+            DisplayItem::new(
+                SourceSpan::synthetic(1, 0, text.len()),
+                RenderFaceRef::FaceId(face),
+                DisplayItemKind::TextRun(DisplayTextRun::independent(text)),
+            ),
+            DisplayItem::new(
+                SourceSpan::synthetic(1, text.len(), text.len() + 1),
+                RenderFaceRef::FaceId(face),
+                DisplayItemKind::RowBreak(DisplayRowBreak {
+                    line_height: DisplayLineHeightPolicy::Default,
+                    line_spacing: DisplayLineSpacingPolicy::Inherit,
+                }),
+            ),
+        ],
+        faces.clone(),
+        &mut measurer,
+        RowProgramLimits {
+            items: 4,
+            text_bytes: 128,
+            glyphs: 128,
+        },
+    )
+    .unwrap()
+}
+
+#[test]
+fn worker_bounds_visual_rows_instead_of_physical_program_count() {
+    let mut worker = RowWorker::default();
+    let ticket = worker
+        .submit(
+            (0..64)
+                .map(|_| row_with_wrap("abcdefgh", 16.0, true))
+                .collect(),
+        )
+        .unwrap();
+    let result = finish(&mut worker);
+    assert_eq!(result.ticket, ticket);
+    let rows = result.rows.unwrap();
+    assert_eq!(rows.len(), MAX_ROWS);
+    assert!(
+        rows.iter()
+            .any(|row| row.end_kind == super::super::program::ComputedRowEnd::Continuation)
+    );
+    assert_eq!(
+        rows.last().unwrap().end_kind,
+        super::super::program::ComputedRowEnd::Newline
+    );
+}
+
+fn finish(worker: &mut RowWorker) -> RowJobResult {
+    let deadline = std::time::Instant::now() + std::time::Duration::from_secs(5);
+    loop {
+        if let Some(result) = worker.take_completed() {
+            return result;
+        }
+        assert!(
+            std::time::Instant::now() < deadline,
+            "worker did not complete"
+        );
+        std::thread::yield_now();
+    }
+}
+
+#[test]
+fn newest_request_replaces_pending_and_completed_results() {
+    let mut worker = RowWorker::default();
+    let first = worker.submit(vec![row("first")]).unwrap();
+    assert_eq!(finish(&mut worker).ticket, first);
+    let mut newest = first;
+    for _ in 0..100 {
+        newest = worker.submit(vec![row("newest")]).unwrap();
+    }
+    let result = finish(&mut worker);
+    assert_eq!(result.ticket, newest);
+    assert_eq!(result.rows.unwrap().len(), 1);
+    assert!(worker.take_completed().is_none());
+}
+
+#[test]
+fn cancellation_clears_mailboxes_and_does_not_block_new_work() {
+    let mut worker = RowWorker::default();
+    worker.submit(vec![row("cancelled")]).unwrap();
+    worker.cancel();
+    assert!(worker.take_completed().is_none());
+    let ticket = worker.submit(vec![row("accepted")]).unwrap();
+    assert_eq!(finish(&mut worker).ticket, ticket);
+}
+
+#[test]
+fn batches_reserve_all_output_and_do_not_start_unbounded_work() {
+    let mut worker = RowWorker::default();
+    assert_eq!(worker.submit(vec![]), Err(RowProgramError::Budget));
+    assert_eq!(
+        worker.submit((0..=MAX_ROWS).map(|_| row("a")).collect()),
+        Err(RowProgramError::Budget)
+    );
+    assert!(worker.thread.is_none());
+    let ticket = worker.submit(vec![row("a")]).unwrap();
+    assert_eq!(finish(&mut worker).ticket, ticket);
+}
diff --git a/crates/neomacs-layout-engine/src/row_layout/worker.rs b/crates/neomacs-layout-engine/src/row_layout/worker.rs
index 4fdb8611d1..232bdf445d 100644
--- a/crates/neomacs-layout-engine/src/row_layout/worker.rs
+++ b/crates/neomacs-layout-engine/src/row_layout/worker.rs
@@ -228,138 +228,5 @@ impl Drop for RowWorker {
 }
 
 #[cfg(test)]
-mod tests {
-    use super::super::program::{RowProgramGeometry, RowProgramLimits};
-    use super::*;
-    use crate::display_item::*;
-    use crate::display_row::builder::DisplayTabPolicy;
-    use crate::display_row::face_state::{DisplayRowFace, DisplayRowGlyphMeasurer};
-    use crate::display_row::metrics::DisplayRowFallbackMetrics;
-    use crate::neovm_bridge::ResolvedFace;
-    use neomacs_display_protocol::types::{Color, FaceId};
-
-    fn row(text: &str) -> RowProgram {
-        row_with_wrap(text, 1000.0, false)
-    }
-
-    fn row_with_wrap(text: &str, width: f32, character_wrap: bool) -> RowProgram {
-        let face = FaceId::new(1);
-        let faces = vec![DisplayRowFace::from_resolved(
-            face,
-            &ResolvedFace::default(),
-        )];
-        let mut measurer = DisplayRowGlyphMeasurer::new(&faces, None, 8.0);
-        RowProgram::capture(
-            RowProgramGeometry {
-                inherited_line_spacing: 0.0,
-                character_wrap,
-                word_wrap: false,
-                fringe: None,
-                width,
-                metrics: DisplayRowFallbackMetrics::from_default_face_extents(8.0, 16.0, 12.0),
-                tabs: DisplayTabPolicy::every(4),
-                base_face: face,
-                background: Color::BLACK,
-            },
-            [
-                DisplayItem::new(
-                    SourceSpan::synthetic(1, 0, text.len()),
-                    RenderFaceRef::FaceId(face),
-                    DisplayItemKind::TextRun(DisplayTextRun::independent(text)),
-                ),
-                DisplayItem::new(
-                    SourceSpan::synthetic(1, text.len(), text.len() + 1),
-                    RenderFaceRef::FaceId(face),
-                    DisplayItemKind::RowBreak(DisplayRowBreak {
-                        line_height: DisplayLineHeightPolicy::Default,
-                        line_spacing: DisplayLineSpacingPolicy::Inherit,
-                    }),
-                ),
-            ],
-            faces.clone(),
-            &mut measurer,
-            RowProgramLimits {
-                items: 4,
-                text_bytes: 128,
-                glyphs: 128,
-            },
-        )
-        .unwrap()
-    }
-
-    #[test]
-    fn worker_bounds_visual_rows_instead_of_physical_program_count() {
-        let mut worker = RowWorker::default();
-        let ticket = worker
-            .submit(
-                (0..64)
-                    .map(|_| row_with_wrap("abcdefgh", 16.0, true))
-                    .collect(),
-            )
-            .unwrap();
-        let result = finish(&mut worker);
-        assert_eq!(result.ticket, ticket);
-        let rows = result.rows.unwrap();
-        assert_eq!(rows.len(), MAX_ROWS);
-        assert!(
-            rows.iter()
-                .any(|row| row.end_kind == super::super::program::ComputedRowEnd::Continuation)
-        );
-        assert_eq!(
-            rows.last().unwrap().end_kind,
-            super::super::program::ComputedRowEnd::Newline
-        );
-    }
-
-    fn finish(worker: &mut RowWorker) -> RowJobResult {
-        let deadline = std::time::Instant::now() + std::time::Duration::from_secs(5);
-        loop {
-            if let Some(result) = worker.take_completed() {
-                return result;
-            }
-            assert!(
-                std::time::Instant::now() < deadline,
-                "worker did not complete"
-            );
-            std::thread::yield_now();
-        }
-    }
-
-    #[test]
-    fn newest_request_replaces_pending_and_completed_results() {
-        let mut worker = RowWorker::default();
-        let first = worker.submit(vec![row("first")]).unwrap();
-        assert_eq!(finish(&mut worker).ticket, first);
-        let mut newest = first;
-        for _ in 0..100 {
-            newest = worker.submit(vec![row("newest")]).unwrap();
-        }
-        let result = finish(&mut worker);
-        assert_eq!(result.ticket, newest);
-        assert_eq!(result.rows.unwrap().len(), 1);
-        assert!(worker.take_completed().is_none());
-    }
-
-    #[test]
-    fn cancellation_clears_mailboxes_and_does_not_block_new_work() {
-        let mut worker = RowWorker::default();
-        worker.submit(vec![row("cancelled")]).unwrap();
-        worker.cancel();
-        assert!(worker.take_completed().is_none());
-        let ticket = worker.submit(vec![row("accepted")]).unwrap();
-        assert_eq!(finish(&mut worker).ticket, ticket);
-    }
-
-    #[test]
-    fn batches_reserve_all_output_and_do_not_start_unbounded_work() {
-        let mut worker = RowWorker::default();
-        assert_eq!(worker.submit(vec![]), Err(RowProgramError::Budget));
-        assert_eq!(
-            worker.submit((0..=MAX_ROWS).map(|_| row("a")).collect()),
-            Err(RowProgramError::Budget)
-        );
-        assert!(worker.thread.is_none());
-        let ticket = worker.submit(vec![row("a")]).unwrap();
-        assert_eq!(finish(&mut worker).ticket, ticket);
-    }
-}
+#[path = "tests/worker_test.rs"]
+mod tests;
diff --git a/crates/neomacs-layout-engine/src/scroll_policy.rs b/crates/neomacs-layout-engine/src/scroll_policy.rs
index 53f5f39387..d26f423943 100644
--- a/crates/neomacs-layout-engine/src/scroll_policy.rs
+++ b/crates/neomacs-layout-engine/src/scroll_policy.rs
@@ -270,4 +270,5 @@ pub(crate) fn line_start_below(
 }
 
 #[cfg(test)]
+#[path = "scroll_policy/tests/scroll_policy_test.rs"]
 mod tests;
diff --git a/crates/neomacs-layout-engine/src/scroll_policy/tests/mod.rs b/crates/neomacs-layout-engine/src/scroll_policy/tests/scroll_policy_test.rs
similarity index 100%
rename from crates/neomacs-layout-engine/src/scroll_policy/tests/mod.rs
rename to crates/neomacs-layout-engine/src/scroll_policy/tests/scroll_policy_test.rs
diff --git a/crates/neomacs-layout-engine/src/tty_menu_bar.rs b/crates/neomacs-layout-engine/src/tty_menu_bar.rs
index df3ebc6558..c43844f78d 100644
--- a/crates/neomacs-layout-engine/src/tty_menu_bar.rs
+++ b/crates/neomacs-layout-engine/src/tty_menu_bar.rs
@@ -363,4 +363,5 @@ fn key_symbol_name(key: &Value) -> String {
 }
 
 #[cfg(test)]
+#[path = "tty_menu_bar/tests/tty_menu_bar_test.rs"]
 mod tests;
diff --git a/crates/neomacs-layout-engine/src/tty_menu_bar/tests/mod.rs b/crates/neomacs-layout-engine/src/tty_menu_bar/tests/tty_menu_bar_test.rs
similarity index 100%
rename from crates/neomacs-layout-engine/src/tty_menu_bar/tests/mod.rs
rename to crates/neomacs-layout-engine/src/tty_menu_bar/tests/tty_menu_bar_test.rs
diff --git a/crates/neomacs-layout-engine/src/types.rs b/crates/neomacs-layout-engine/src/types.rs
index 7d4aae29a3..ca24e2a794 100644
--- a/crates/neomacs-layout-engine/src/types.rs
+++ b/crates/neomacs-layout-engine/src/types.rs
@@ -545,4 +545,5 @@ pub struct FrameParams {
 }
 
 #[cfg(test)]
+#[path = "types/tests/types_test.rs"]
 mod tests;
diff --git a/crates/neomacs-layout-engine/src/types/tests/mod.rs b/crates/neomacs-layout-engine/src/types/tests/types_test.rs
similarity index 100%
rename from crates/neomacs-layout-engine/src/types/tests/mod.rs
rename to crates/neomacs-layout-engine/src/types/tests/types_test.rs
diff --git a/crates/neomacs-layout-engine/src/unicode.rs b/crates/neomacs-layout-engine/src/unicode.rs
index 83c7272108..ac43d29703 100644
--- a/crates/neomacs-layout-engine/src/unicode.rs
+++ b/crates/neomacs-layout-engine/src/unicode.rs
@@ -225,4 +225,5 @@ pub(crate) fn is_potentially_glyphless(ch: char) -> bool {
 }
 
 #[cfg(test)]
+#[path = "unicode/tests/unicode_test.rs"]
 mod tests;
diff --git a/crates/neomacs-layout-engine/src/unicode/tests/mod.rs b/crates/neomacs-layout-engine/src/unicode/tests/unicode_test.rs
similarity index 100%
rename from crates/neomacs-layout-engine/src/unicode/tests/mod.rs
rename to crates/neomacs-layout-engine/src/unicode/tests/unicode_test.rs
diff --git a/crates/neomacs-layout-engine/src/window_output.rs b/crates/neomacs-layout-engine/src/window_output.rs
index 0cac216fe9..fd353a952b 100644
--- a/crates/neomacs-layout-engine/src/window_output.rs
+++ b/crates/neomacs-layout-engine/src/window_output.rs
@@ -1890,4 +1890,5 @@ impl WindowOutputEmitter {
 }
 
 #[cfg(test)]
+#[path = "window_output/tests/window_output_test.rs"]
 mod tests;
diff --git a/crates/neomacs-layout-engine/src/window_output/row_geometry.rs b/crates/neomacs-layout-engine/src/window_output/row_geometry.rs
index a502424200..dff7cdfe34 100644
--- a/crates/neomacs-layout-engine/src/window_output/row_geometry.rs
+++ b/crates/neomacs-layout-engine/src/window_output/row_geometry.rs
@@ -701,59 +701,9 @@ impl WindowRowGeometry {
 }
 
 #[cfg(test)]
-mod tests {
-    use super::*;
-    use crate::window_output::DisplayRowTerminatorCell;
-
-    #[test]
-    fn unfinished_row_moves_to_worker_with_rewind_and_terminator_state() {
-        fn require_send_sync<T: Send + Sync + 'static>() {}
-        require_send_sync::<WindowRowGeometry>();
-        let mut geometry = WindowRowGeometry::new(2, 8.0, 12.0);
-        geometry.begin_current_row_progress(Some(0), 2, 0, 8, 0);
-        geometry.note_row_walk_start(LispCharPos1::new(1));
-        geometry.push_text_display_point(LispCharPos1::new(2), 16.0, 20.0, 8.0, 16.0, 0, 1);
-        geometry.update_current_row_progress(2, 2, 8, 16);
-        let checkpoint = geometry.display_point_len();
-        let (first, last) = geometry.current_row_display_positions();
-        // A rejected wrap candidate must not survive the handoff.
-        geometry.push_text_display_point(LispCharPos1::new(99), 24.0, 20.0, 8.0, 16.0, 0, 2);
-        geometry.truncate_display_points(checkpoint);
-        geometry.restore_current_row_display_positions(first, last);
-        geometry.note_row_terminator(DisplayRowTerminator::new(
-            LispCharPos1::new(3),
-            DisplayRowTerminatorCell::new(8.0, 16.0),
-        ));
-        geometry.note_display_string_wrap(LispCharPos1::new(3));
-        let prepared = std::thread::spawn(move || {
-            geometry.push_text_row(20.0, 16.0, 12.0);
-            assert_eq!(geometry.row_metrics()[0].height(), 16.0);
-            assert_eq!(geometry.row_metrics()[0].ascent(), 12.0);
-            geometry.finish(8)
-        })
-        .join()
-        .unwrap();
-        assert_eq!(prepared.rows.len(), 1);
-        let row = &prepared.rows[0];
-        assert_eq!(row.start_buffer_pos, Some(LispCharPos1::new(1)));
-        assert_eq!(row.end_buffer_pos, Some(LispCharPos1::new(3)));
-        assert_eq!(row.end_source, DisplayRowEndSource::DisplayStringWrap);
-        assert_eq!((row.row, row.y, row.end_x, row.end_col), (2, 8, 16, 2));
-        let points = prepared
-            .point_rows
-            .as_ref()
-            .map(|rows| rows.iter_points().collect::<Vec<_>>())
-            .unwrap_or_else(|| prepared.points.clone());
-        assert_eq!(points.len(), 2);
-        assert_eq!(points[0].buffer_pos, LispCharPos1::new(2));
-        assert_eq!(points[1].buffer_pos, LispCharPos1::new(3));
-        assert_eq!((points[1].x, points[1].width), (16, 8));
-        assert_eq!(prepared.body_rows.len(), 1);
-        assert_eq!(prepared.body_rows[0].body_row, 0);
-        assert_eq!(prepared.body_rows[0].body_y, 0);
-    }
-}
+#[path = "tests/row_geometry_test.rs"]
+mod tests;
 
 #[cfg(test)]
-#[path = "row_geometry/lookup_test.rs"]
+#[path = "row_geometry/tests/lookup_test.rs"]
 mod lookup_test;
diff --git a/crates/neomacs-layout-engine/src/window_output/row_geometry/lookup_test.rs b/crates/neomacs-layout-engine/src/window_output/row_geometry/tests/lookup_test.rs
similarity index 100%
rename from crates/neomacs-layout-engine/src/window_output/row_geometry/lookup_test.rs
rename to crates/neomacs-layout-engine/src/window_output/row_geometry/tests/lookup_test.rs
diff --git a/crates/neomacs-layout-engine/src/window_output/snapshot_rows.rs b/crates/neomacs-layout-engine/src/window_output/snapshot_rows.rs
index 5a34ac4c01..96c68fffa3 100644
--- a/crates/neomacs-layout-engine/src/window_output/snapshot_rows.rs
+++ b/crates/neomacs-layout-engine/src/window_output/snapshot_rows.rs
@@ -85,48 +85,5 @@ impl PreparedWindowRows {
 }
 
 #[cfg(test)]
-mod tests {
-    use super::*;
-    use neovm_core::buffer::LispCharPos1;
-    use neovm_core::window::DisplayPointRole;
-
-    #[test]
-    fn worker_finalization_preserves_source_order_and_revisited_row_geometry() {
-        fn require_send_sync<T: Send + Sync + 'static>() {}
-        require_send_sync::<PreparedWindowRows>();
-        let points: Vec<_> = [(4, 3, 64), (2, 2, 48), (1, 3, 60), (3, 2, 48)]
-            .into_iter()
-            .map(|(pos, row, y)| DisplayPointSnapshot {
-                role: DisplayPointRole::Glyph,
-                buffer_pos: LispCharPos1::new(pos),
-                x: 0,
-                y,
-                width: 8,
-                height: 16,
-                row,
-                col: pos,
-            })
-            .collect();
-        // This is the previous canonical algorithm: first source-ordered
-        // point wins when several positions describe the same output row.
-        let mut ordered = points.clone();
-        ordered.sort_by_key(|point| (point.buffer_pos, point.row, point.col, point.x));
-        let mut expected: Vec<_> = ordered
-            .iter()
-            .map(|point| PresentedBodyRowSnapshot {
-                output_row: point.row,
-                body_row: point.row.saturating_sub(2),
-                body_y: point.y.saturating_sub(16),
-            })
-            .collect();
-        expected.sort_by_key(|row| row.output_row);
-        expected.dedup_by_key(|row| row.output_row);
-        let result = std::thread::spawn(move || PreparedWindowRows::new(points, Vec::new(), 2, 16))
-            .join()
-            .unwrap();
-        assert_eq!(result.points, ordered);
-        assert_eq!(result.body_rows, expected);
-        assert_eq!(result.body_rows.len(), 2);
-        assert_eq!(result.body_rows[1].body_y, 44);
-    }
-}
+#[path = "tests/snapshot_rows_test.rs"]
+mod tests;
diff --git a/crates/neomacs-layout-engine/src/window_output/tests/row_geometry_test.rs b/crates/neomacs-layout-engine/src/window_output/tests/row_geometry_test.rs
new file mode 100644
index 0000000000..687d05082a
--- /dev/null
+++ b/crates/neomacs-layout-engine/src/window_output/tests/row_geometry_test.rs
@@ -0,0 +1,50 @@
+use super::*;
+use crate::window_output::DisplayRowTerminatorCell;
+
+#[test]
+fn unfinished_row_moves_to_worker_with_rewind_and_terminator_state() {
+    fn require_send_sync<T: Send + Sync + 'static>() {}
+    require_send_sync::<WindowRowGeometry>();
+    let mut geometry = WindowRowGeometry::new(2, 8.0, 12.0);
+    geometry.begin_current_row_progress(Some(0), 2, 0, 8, 0);
+    geometry.note_row_walk_start(LispCharPos1::new(1));
+    geometry.push_text_display_point(LispCharPos1::new(2), 16.0, 20.0, 8.0, 16.0, 0, 1);
+    geometry.update_current_row_progress(2, 2, 8, 16);
+    let checkpoint = geometry.display_point_len();
+    let (first, last) = geometry.current_row_display_positions();
+    // A rejected wrap candidate must not survive the handoff.
+    geometry.push_text_display_point(LispCharPos1::new(99), 24.0, 20.0, 8.0, 16.0, 0, 2);
+    geometry.truncate_display_points(checkpoint);
+    geometry.restore_current_row_display_positions(first, last);
+    geometry.note_row_terminator(DisplayRowTerminator::new(
+        LispCharPos1::new(3),
+        DisplayRowTerminatorCell::new(8.0, 16.0),
+    ));
+    geometry.note_display_string_wrap(LispCharPos1::new(3));
+    let prepared = std::thread::spawn(move || {
+        geometry.push_text_row(20.0, 16.0, 12.0);
+        assert_eq!(geometry.row_metrics()[0].height(), 16.0);
+        assert_eq!(geometry.row_metrics()[0].ascent(), 12.0);
+        geometry.finish(8)
+    })
+    .join()
+    .unwrap();
+    assert_eq!(prepared.rows.len(), 1);
+    let row = &prepared.rows[0];
+    assert_eq!(row.start_buffer_pos, Some(LispCharPos1::new(1)));
+    assert_eq!(row.end_buffer_pos, Some(LispCharPos1::new(3)));
+    assert_eq!(row.end_source, DisplayRowEndSource::DisplayStringWrap);
+    assert_eq!((row.row, row.y, row.end_x, row.end_col), (2, 8, 16, 2));
+    let points = prepared
+        .point_rows
+        .as_ref()
+        .map(|rows| rows.iter_points().collect::<Vec<_>>())
+        .unwrap_or_else(|| prepared.points.clone());
+    assert_eq!(points.len(), 2);
+    assert_eq!(points[0].buffer_pos, LispCharPos1::new(2));
+    assert_eq!(points[1].buffer_pos, LispCharPos1::new(3));
+    assert_eq!((points[1].x, points[1].width), (16, 8));
+    assert_eq!(prepared.body_rows.len(), 1);
+    assert_eq!(prepared.body_rows[0].body_row, 0);
+    assert_eq!(prepared.body_rows[0].body_y, 0);
+}
diff --git a/crates/neomacs-layout-engine/src/window_output/tests/snapshot_rows_test.rs b/crates/neomacs-layout-engine/src/window_output/tests/snapshot_rows_test.rs
new file mode 100644
index 0000000000..766788749d
--- /dev/null
+++ b/crates/neomacs-layout-engine/src/window_output/tests/snapshot_rows_test.rs
@@ -0,0 +1,43 @@
+use super::*;
+use neovm_core::buffer::LispCharPos1;
+use neovm_core::window::DisplayPointRole;
+
+#[test]
+fn worker_finalization_preserves_source_order_and_revisited_row_geometry() {
+    fn require_send_sync<T: Send + Sync + 'static>() {}
+    require_send_sync::<PreparedWindowRows>();
+    let points: Vec<_> = [(4, 3, 64), (2, 2, 48), (1, 3, 60), (3, 2, 48)]
+        .into_iter()
+        .map(|(pos, row, y)| DisplayPointSnapshot {
+            role: DisplayPointRole::Glyph,
+            buffer_pos: LispCharPos1::new(pos),
+            x: 0,
+            y,
+            width: 8,
+            height: 16,
+            row,
+            col: pos,
+        })
+        .collect();
+    // This is the previous canonical algorithm: first source-ordered
+    // point wins when several positions describe the same output row.
+    let mut ordered = points.clone();
+    ordered.sort_by_key(|point| (point.buffer_pos, point.row, point.col, point.x));
+    let mut expected: Vec<_> = ordered
+        .iter()
+        .map(|point| PresentedBodyRowSnapshot {
+            output_row: point.row,
+            body_row: point.row.saturating_sub(2),
+            body_y: point.y.saturating_sub(16),
+        })
+        .collect();
+    expected.sort_by_key(|row| row.output_row);
+    expected.dedup_by_key(|row| row.output_row);
+    let result = std::thread::spawn(move || PreparedWindowRows::new(points, Vec::new(), 2, 16))
+        .join()
+        .unwrap();
+    assert_eq!(result.points, ordered);
+    assert_eq!(result.body_rows, expected);
+    assert_eq!(result.body_rows.len(), 2);
+    assert_eq!(result.body_rows[1].body_y, 44);
+}
diff --git a/crates/neomacs-layout-engine/src/window_output/tests/mod.rs b/crates/neomacs-layout-engine/src/window_output/tests/window_output_test.rs
similarity index 100%
rename from crates/neomacs-layout-engine/src/window_output/tests/mod.rs
rename to crates/neomacs-layout-engine/src/window_output/tests/window_output_test.rs
diff --git a/crates/neomacs-perf/src/artifact.rs b/crates/neomacs-perf/src/artifact.rs
index d43d98c034..f79b3389cc 100644
--- a/crates/neomacs-perf/src/artifact.rs
+++ b/crates/neomacs-perf/src/artifact.rs
@@ -355,4 +355,5 @@ pub struct RunArtifact {
 }
 
 #[cfg(test)]
+#[path = "artifact/tests/artifact_test.rs"]
 mod tests;
diff --git a/crates/neomacs-perf/src/artifact/tests/mod.rs b/crates/neomacs-perf/src/artifact/tests/artifact_test.rs
similarity index 100%
rename from crates/neomacs-perf/src/artifact/tests/mod.rs
rename to crates/neomacs-perf/src/artifact/tests/artifact_test.rs
diff --git a/crates/neomacs-perf/src/capture.rs b/crates/neomacs-perf/src/capture.rs
index 54d0902854..9d7faf2582 100644
--- a/crates/neomacs-perf/src/capture.rs
+++ b/crates/neomacs-perf/src/capture.rs
@@ -37,4 +37,5 @@ impl CaptureRoute {
 }
 
 #[cfg(test)]
+#[path = "capture/tests/capture_test.rs"]
 mod tests;
diff --git a/crates/neomacs-perf/src/capture/tests/mod.rs b/crates/neomacs-perf/src/capture/tests/capture_test.rs
similarity index 100%
rename from crates/neomacs-perf/src/capture/tests/mod.rs
rename to crates/neomacs-perf/src/capture/tests/capture_test.rs
diff --git a/crates/neomacs-perf/src/catalog.rs b/crates/neomacs-perf/src/catalog.rs
index 205df35104..980911771f 100644
--- a/crates/neomacs-perf/src/catalog.rs
+++ b/crates/neomacs-perf/src/catalog.rs
@@ -851,4 +851,5 @@ pub const fn scenario(id: ScenarioId) -> &'static ScenarioSpec {
 }
 
 #[cfg(test)]
+#[path = "catalog/tests/catalog_test.rs"]
 mod tests;
diff --git a/crates/neomacs-perf/src/catalog/tests/mod.rs b/crates/neomacs-perf/src/catalog/tests/catalog_test.rs
similarity index 100%
rename from crates/neomacs-perf/src/catalog/tests/mod.rs
rename to crates/neomacs-perf/src/catalog/tests/catalog_test.rs
diff --git a/crates/neomacs-perf/src/cli.rs b/crates/neomacs-perf/src/cli.rs
index 9460958e7b..47aec5ece3 100644
--- a/crates/neomacs-perf/src/cli.rs
+++ b/crates/neomacs-perf/src/cli.rs
@@ -783,4 +783,5 @@ pub fn run_cli(
 }
 
 #[cfg(test)]
+#[path = "cli/tests/cli_test.rs"]
 mod tests;
diff --git a/crates/neomacs-perf/src/cli/tests/mod.rs b/crates/neomacs-perf/src/cli/tests/cli_test.rs
similarity index 100%
rename from crates/neomacs-perf/src/cli/tests/mod.rs
rename to crates/neomacs-perf/src/cli/tests/cli_test.rs
diff --git a/crates/neomacs-perf/src/comparison.rs b/crates/neomacs-perf/src/comparison.rs
index faba1d4b59..6e53e37cdd 100644
--- a/crates/neomacs-perf/src/comparison.rs
+++ b/crates/neomacs-perf/src/comparison.rs
@@ -994,4 +994,5 @@ fn median_absolute_deviation(values: &[f64], center: f64) -> f64 {
 }
 
 #[cfg(test)]
+#[path = "comparison/tests/comparison_test.rs"]
 mod tests;
diff --git a/crates/neomacs-perf/src/comparison/tests/mod.rs b/crates/neomacs-perf/src/comparison/tests/comparison_test.rs
similarity index 100%
rename from crates/neomacs-perf/src/comparison/tests/mod.rs
rename to crates/neomacs-perf/src/comparison/tests/comparison_test.rs
diff --git a/crates/neomacs-perf/src/counters.rs b/crates/neomacs-perf/src/counters.rs
index 91b1282a16..07ef2f05e0 100644
--- a/crates/neomacs-perf/src/counters.rs
+++ b/crates/neomacs-perf/src/counters.rs
@@ -286,4 +286,5 @@ impl PerfStatCapture {
 }
 
 #[cfg(test)]
+#[path = "counters/tests/counters_test.rs"]
 mod tests;
diff --git a/crates/neomacs-perf/src/counters/tests/mod.rs b/crates/neomacs-perf/src/counters/tests/counters_test.rs
similarity index 100%
rename from crates/neomacs-perf/src/counters/tests/mod.rs
rename to crates/neomacs-perf/src/counters/tests/counters_test.rs
diff --git a/crates/neomacs-perf/src/harness.rs b/crates/neomacs-perf/src/harness.rs
index 1dc889a937..7600769e5c 100644
--- a/crates/neomacs-perf/src/harness.rs
+++ b/crates/neomacs-perf/src/harness.rs
@@ -2191,4 +2191,5 @@ fn next_run_id(scenario: ScenarioId, unix_ms: u128) -> String {
 }
 
 #[cfg(test)]
+#[path = "harness/tests/harness_test.rs"]
 mod tests;
diff --git a/crates/neomacs-perf/src/harness/scenarios/bounded_search.rs b/crates/neomacs-perf/src/harness/scenarios/bounded_search.rs
index 9b62de1827..b1df40f54a 100644
--- a/crates/neomacs-perf/src/harness/scenarios/bounded_search.rs
+++ b/crates/neomacs-perf/src/harness/scenarios/bounded_search.rs
@@ -305,4 +305,5 @@ pub(crate) fn valid_bounded_search_measurements(
 }
 
 #[cfg(test)]
+#[path = "bounded_search/tests/bounded_search_test.rs"]
 mod tests;
diff --git a/crates/neomacs-perf/src/harness/scenarios/bounded_search/tests/mod.rs b/crates/neomacs-perf/src/harness/scenarios/bounded_search/tests/bounded_search_test.rs
similarity index 100%
rename from crates/neomacs-perf/src/harness/scenarios/bounded_search/tests/mod.rs
rename to crates/neomacs-perf/src/harness/scenarios/bounded_search/tests/bounded_search_test.rs
diff --git a/crates/neomacs-perf/src/harness/scenarios/builtin_call.rs b/crates/neomacs-perf/src/harness/scenarios/builtin_call.rs
index 07a8919d69..d2f9d1d257 100644
--- a/crates/neomacs-perf/src/harness/scenarios/builtin_call.rs
+++ b/crates/neomacs-perf/src/harness/scenarios/builtin_call.rs
@@ -251,4 +251,5 @@ fn call_measurements(
 }
 
 #[cfg(test)]
+#[path = "builtin_call/tests/builtin_call_test.rs"]
 mod tests;
diff --git a/crates/neomacs-perf/src/harness/scenarios/builtin_call/tests/mod.rs b/crates/neomacs-perf/src/harness/scenarios/builtin_call/tests/builtin_call_test.rs
similarity index 100%
rename from crates/neomacs-perf/src/harness/scenarios/builtin_call/tests/mod.rs
rename to crates/neomacs-perf/src/harness/scenarios/builtin_call/tests/builtin_call_test.rs
diff --git a/crates/neomacs-perf/src/harness/scenarios/search_shape.rs b/crates/neomacs-perf/src/harness/scenarios/search_shape.rs
index 6eca598caa..1b31159d8b 100644
--- a/crates/neomacs-perf/src/harness/scenarios/search_shape.rs
+++ b/crates/neomacs-perf/src/harness/scenarios/search_shape.rs
@@ -273,4 +273,5 @@ fn search_measurements(
 }
 
 #[cfg(test)]
+#[path = "search_shape/tests/search_shape_test.rs"]
 mod tests;
diff --git a/crates/neomacs-perf/src/harness/scenarios/search_shape/tests/mod.rs b/crates/neomacs-perf/src/harness/scenarios/search_shape/tests/search_shape_test.rs
similarity index 100%
rename from crates/neomacs-perf/src/harness/scenarios/search_shape/tests/mod.rs
rename to crates/neomacs-perf/src/harness/scenarios/search_shape/tests/search_shape_test.rs
diff --git a/crates/neomacs-perf/src/harness/scenarios/vm_loop.rs b/crates/neomacs-perf/src/harness/scenarios/vm_loop.rs
index 112b1f669e..90d14e3657 100644
--- a/crates/neomacs-perf/src/harness/scenarios/vm_loop.rs
+++ b/crates/neomacs-perf/src/harness/scenarios/vm_loop.rs
@@ -350,4 +350,5 @@ fn loop_measurements(
 }
 
 #[cfg(test)]
+#[path = "vm_loop/tests/vm_loop_test.rs"]
 mod tests;
diff --git a/crates/neomacs-perf/src/harness/scenarios/vm_loop/first_entry.rs b/crates/neomacs-perf/src/harness/scenarios/vm_loop/first_entry.rs
index 65d775637f..a567542d2c 100644
--- a/crates/neomacs-perf/src/harness/scenarios/vm_loop/first_entry.rs
+++ b/crates/neomacs-perf/src/harness/scenarios/vm_loop/first_entry.rs
@@ -153,4 +153,5 @@ pub(crate) fn measurements(result: &FirstHotLoopResult, process_us: u128) -> Vec
 }
 
 #[cfg(test)]
+#[path = "first_entry/tests/first_entry_test.rs"]
 mod tests;
diff --git a/crates/neomacs-perf/src/harness/scenarios/vm_loop/first_entry/tests/mod.rs b/crates/neomacs-perf/src/harness/scenarios/vm_loop/first_entry/tests/first_entry_test.rs
similarity index 100%
rename from crates/neomacs-perf/src/harness/scenarios/vm_loop/first_entry/tests/mod.rs
rename to crates/neomacs-perf/src/harness/scenarios/vm_loop/first_entry/tests/first_entry_test.rs
diff --git a/crates/neomacs-perf/src/harness/scenarios/vm_loop/tests/mod.rs b/crates/neomacs-perf/src/harness/scenarios/vm_loop/tests/vm_loop_test.rs
similarity index 100%
rename from crates/neomacs-perf/src/harness/scenarios/vm_loop/tests/mod.rs
rename to crates/neomacs-perf/src/harness/scenarios/vm_loop/tests/vm_loop_test.rs
diff --git a/crates/neomacs-perf/src/harness/tests/mod.rs b/crates/neomacs-perf/src/harness/tests/harness_test.rs
similarity index 99%
rename from crates/neomacs-perf/src/harness/tests/mod.rs
rename to crates/neomacs-perf/src/harness/tests/harness_test.rs
index 6d1b6953fb..5475e4f621 100644
--- a/crates/neomacs-perf/src/harness/tests/mod.rs
+++ b/crates/neomacs-perf/src/harness/tests/harness_test.rs
@@ -1569,14 +1569,19 @@ fn scrolling_row_validates_phases_checksums_and_restoration() {
 }
 
 #[cfg(test)]
+#[path = "gc_window_test.rs"]
 mod gc_window_test;
+#[path = "retained_face_gather_environment_test.rs"]
 mod retained_face_gather_environment_test;
 
 #[cfg(test)]
+#[path = "property_keys_environment_test.rs"]
 mod property_keys_environment_test;
 
 #[cfg(test)]
+#[path = "edit_sync_dense_index_environment_test.rs"]
 mod edit_sync_dense_index_environment_test;
 
 #[cfg(test)]
+#[path = "edit_sync_fontify_coverage_environment_test.rs"]
 mod edit_sync_fontify_coverage_environment_test;
diff --git a/crates/neomacs-perf/src/host.rs b/crates/neomacs-perf/src/host.rs
index aaab9481ac..0cb7b44988 100644
--- a/crates/neomacs-perf/src/host.rs
+++ b/crates/neomacs-perf/src/host.rs
@@ -119,4 +119,5 @@ fn command_line(program: &str, arguments: &[&str]) -> Option<String> {
 }
 
 #[cfg(test)]
+#[path = "host/tests/host_test.rs"]
 mod tests;
diff --git a/crates/neomacs-perf/src/host/tests/mod.rs b/crates/neomacs-perf/src/host/tests/host_test.rs
similarity index 100%
rename from crates/neomacs-perf/src/host/tests/mod.rs
rename to crates/neomacs-perf/src/host/tests/host_test.rs
diff --git a/crates/neomacs-perf/src/input_latency.rs b/crates/neomacs-perf/src/input_latency.rs
index e6ea39d112..d73e1f1ba9 100644
--- a/crates/neomacs-perf/src/input_latency.rs
+++ b/crates/neomacs-perf/src/input_latency.rs
@@ -94,64 +94,5 @@ pub(crate) fn report(text: &str, budget_us: u64) -> Result<serde_json::Value, St
 }
 
 #[cfg(test)]
-mod tests {
-    use super::*;
-    #[test]
-    fn report_separates_projected_subset_from_authoritative_latency() {
-        let text = [
-            r#"{"input":1,"kind":"precise","input_to_present_ns":100000000,"input_to_projected_present_ns":5000000,"evicted_inputs":0}"#,
-            r#"{"input":2,"kind":"precise","input_to_present_ns":200000000,"evicted_inputs":0}"#,
-        ].join("\n");
-        let report = report(&text, 16667).unwrap();
-        assert_eq!(report["by_input_kind"]["precise"]["samples"], 2);
-        assert_eq!(report["projected_by_input_kind"]["precise"]["samples"], 1);
-        assert_eq!(report["projected_by_input_kind"]["precise"]["p50_ms"], 5.0);
-        assert_eq!(
-            report["projected_by_input_kind"]["precise"]["over_budget"],
-            0
-        );
-    }
-
-    #[test]
-    fn first_response_includes_fallbacks_and_uses_the_earliest_confirmation() {
-        let text = [
-            r#"{"input":1,"kind":"precise","input_to_present_ns":100000000,"input_to_projected_present_ns":5000000,"evicted_inputs":0}"#,
-            r#"{"input":2,"kind":"precise","input_to_present_ns":200000000,"evicted_inputs":0}"#,
-            r#"{"input":3,"kind":"precise","input_to_present_ns":4000000,"input_to_projected_present_ns":6000000,"evicted_inputs":0}"#,
-        ].join("\n");
-        let report = report(&text, 16667).unwrap();
-        let first = &report["first_response_by_input_kind"]["precise"];
-        assert_eq!(first["samples"], 3);
-        assert_eq!(first["p50_ms"], 5.0);
-        assert_eq!(first["p95_ms"], 200.0);
-        assert_eq!(first["over_budget"], 1);
-    }
-
-    #[test]
-    fn report_keeps_input_kinds_separate_and_counts_budget_misses() {
-        let text = [
-            r#"{"input":1,"kind":"wheel","input_to_present_ns":1000000,"evicted_inputs":0}"#,
-            r#"{"input":2,"kind":"wheel","input_to_present_ns":30000000,"evicted_inputs":0}"#,
-            r#"{"input":3,"kind":"page","input_to_present_ns":5000000,"evicted_inputs":0}"#,
-        ]
-        .join("\n");
-        let result = report(&text, 16667).unwrap();
-        assert_eq!(result["by_input_kind"]["wheel"]["samples"], 2);
-        assert_eq!(result["by_input_kind"]["wheel"]["p95_ms"], 30.0);
-        assert_eq!(result["by_input_kind"]["wheel"]["over_budget"], 1);
-        assert_eq!(result["by_input_kind"]["page"]["over_budget"], 0);
-    }
-    #[test]
-    fn report_rejects_unavailable_or_biased_measurements() {
-        for input in [
-            "",
-            "broken",
-            r#"{"input":1,"kind":"page","input_to_present_ns":null,"evicted_inputs":0}"#,
-            r#"{"input":1,"kind":"page","input_to_present_ns":100,"evicted_inputs":1}"#,
-        ] {
-            assert!(report(input, 16667).is_err());
-        }
-        let sample = r#"{"input":1,"kind":"page","input_to_present_ns":100,"evicted_inputs":0}"#;
-        assert!(report(&format!("{sample}\n{sample}"), 16667).is_err());
-    }
-}
+#[path = "tests/input_latency_test.rs"]
+mod tests;
diff --git a/crates/neomacs-perf/src/native_video.rs b/crates/neomacs-perf/src/native_video.rs
index 3f072b65f8..ecab9abfae 100644
--- a/crates/neomacs-perf/src/native_video.rs
+++ b/crates/neomacs-perf/src/native_video.rs
@@ -306,4 +306,5 @@ pub(crate) fn discover_media_metadata(_path: &Path) -> Result<NativeVideoMediaMe
 }
 
 #[cfg(test)]
+#[path = "native_video/tests/native_video_test.rs"]
 mod tests;
diff --git a/crates/neomacs-perf/src/native_video/tests/mod.rs b/crates/neomacs-perf/src/native_video/tests/native_video_test.rs
similarity index 100%
rename from crates/neomacs-perf/src/native_video/tests/mod.rs
rename to crates/neomacs-perf/src/native_video/tests/native_video_test.rs
diff --git a/crates/neomacs-perf/src/portable_dump.rs b/crates/neomacs-perf/src/portable_dump.rs
index 0de2d761f0..dd8a7eabe1 100644
--- a/crates/neomacs-perf/src/portable_dump.rs
+++ b/crates/neomacs-perf/src/portable_dump.rs
@@ -114,4 +114,5 @@ pub(crate) fn verify_run(provenance: &Path) -> Result<(), String> {
 }
 
 #[cfg(test)]
+#[path = "portable_dump/tests/portable_dump_test.rs"]
 mod tests;
diff --git a/crates/neomacs-perf/src/portable_dump/tests/mod.rs b/crates/neomacs-perf/src/portable_dump/tests/portable_dump_test.rs
similarity index 100%
rename from crates/neomacs-perf/src/portable_dump/tests/mod.rs
rename to crates/neomacs-perf/src/portable_dump/tests/portable_dump_test.rs
diff --git a/crates/neomacs-perf/src/profile.rs b/crates/neomacs-perf/src/profile.rs
index f148be2a61..b187bb4ded 100644
--- a/crates/neomacs-perf/src/profile.rs
+++ b/crates/neomacs-perf/src/profile.rs
@@ -392,4 +392,5 @@ pub struct ProfileReport {
 }
 
 #[cfg(test)]
+#[path = "profile/tests/profile_test.rs"]
 mod tests;
diff --git a/crates/neomacs-perf/src/profile/tests/mod.rs b/crates/neomacs-perf/src/profile/tests/profile_test.rs
similarity index 100%
rename from crates/neomacs-perf/src/profile/tests/mod.rs
rename to crates/neomacs-perf/src/profile/tests/profile_test.rs
diff --git a/crates/neomacs-perf/src/suite.rs b/crates/neomacs-perf/src/suite.rs
index effece0839..bd5392d10d 100644
--- a/crates/neomacs-perf/src/suite.rs
+++ b/crates/neomacs-perf/src/suite.rs
@@ -465,4 +465,5 @@ fn read_history(path: &Path) -> Result<(SuiteHistoryLink, Vec<u8>), PerfError> {
 }
 
 #[cfg(test)]
+#[path = "suite/tests/suite_test.rs"]
 mod tests;
diff --git a/crates/neomacs-perf/src/suite/tests/mod.rs b/crates/neomacs-perf/src/suite/tests/suite_test.rs
similarity index 100%
rename from crates/neomacs-perf/src/suite/tests/mod.rs
rename to crates/neomacs-perf/src/suite/tests/suite_test.rs
diff --git a/crates/neomacs-perf/src/tests/input_latency_test.rs b/crates/neomacs-perf/src/tests/input_latency_test.rs
new file mode 100644
index 0000000000..fc1787b661
--- /dev/null
+++ b/crates/neomacs-perf/src/tests/input_latency_test.rs
@@ -0,0 +1,59 @@
+use super::*;
+#[test]
+fn report_separates_projected_subset_from_authoritative_latency() {
+    let text = [
+            r#"{"input":1,"kind":"precise","input_to_present_ns":100000000,"input_to_projected_present_ns":5000000,"evicted_inputs":0}"#,
+            r#"{"input":2,"kind":"precise","input_to_present_ns":200000000,"evicted_inputs":0}"#,
+        ].join("\n");
+    let report = report(&text, 16667).unwrap();
+    assert_eq!(report["by_input_kind"]["precise"]["samples"], 2);
+    assert_eq!(report["projected_by_input_kind"]["precise"]["samples"], 1);
+    assert_eq!(report["projected_by_input_kind"]["precise"]["p50_ms"], 5.0);
+    assert_eq!(
+        report["projected_by_input_kind"]["precise"]["over_budget"],
+        0
+    );
+}
+
+#[test]
+fn first_response_includes_fallbacks_and_uses_the_earliest_confirmation() {
+    let text = [
+            r#"{"input":1,"kind":"precise","input_to_present_ns":100000000,"input_to_projected_present_ns":5000000,"evicted_inputs":0}"#,
+            r#"{"input":2,"kind":"precise","input_to_present_ns":200000000,"evicted_inputs":0}"#,
+            r#"{"input":3,"kind":"precise","input_to_present_ns":4000000,"input_to_projected_present_ns":6000000,"evicted_inputs":0}"#,
+        ].join("\n");
+    let report = report(&text, 16667).unwrap();
+    let first = &report["first_response_by_input_kind"]["precise"];
+    assert_eq!(first["samples"], 3);
+    assert_eq!(first["p50_ms"], 5.0);
+    assert_eq!(first["p95_ms"], 200.0);
+    assert_eq!(first["over_budget"], 1);
+}
+
+#[test]
+fn report_keeps_input_kinds_separate_and_counts_budget_misses() {
+    let text = [
+        r#"{"input":1,"kind":"wheel","input_to_present_ns":1000000,"evicted_inputs":0}"#,
+        r#"{"input":2,"kind":"wheel","input_to_present_ns":30000000,"evicted_inputs":0}"#,
+        r#"{"input":3,"kind":"page","input_to_present_ns":5000000,"evicted_inputs":0}"#,
+    ]
+    .join("\n");
+    let result = report(&text, 16667).unwrap();
+    assert_eq!(result["by_input_kind"]["wheel"]["samples"], 2);
+    assert_eq!(result["by_input_kind"]["wheel"]["p95_ms"], 30.0);
+    assert_eq!(result["by_input_kind"]["wheel"]["over_budget"], 1);
+    assert_eq!(result["by_input_kind"]["page"]["over_budget"], 0);
+}
+#[test]
+fn report_rejects_unavailable_or_biased_measurements() {
+    for input in [
+        "",
+        "broken",
+        r#"{"input":1,"kind":"page","input_to_present_ns":null,"evicted_inputs":0}"#,
+        r#"{"input":1,"kind":"page","input_to_present_ns":100,"evicted_inputs":1}"#,
+    ] {
+        assert!(report(input, 16667).is_err());
+    }
+    let sample = r#"{"input":1,"kind":"page","input_to_present_ns":100,"evicted_inputs":0}"#;
+    assert!(report(&format!("{sample}\n{sample}"), 16667).is_err());
+}
diff --git a/crates/neomacs-renderer-wgpu/src/external_buffer.rs b/crates/neomacs-renderer-wgpu/src/external_buffer.rs
index d80d308f04..a18c3acdc3 100644
--- a/crates/neomacs-renderer-wgpu/src/external_buffer.rs
+++ b/crates/neomacs-renderer-wgpu/src/external_buffer.rs
@@ -417,4 +417,5 @@ pub type PlatformBuffer = DmaBufBuffer;
 pub type PlatformBuffer = SharedMemoryBuffer;
 
 #[cfg(test)]
+#[path = "external_buffer/tests/external_buffer_test.rs"]
 mod tests;
diff --git a/crates/neomacs-renderer-wgpu/src/external_buffer/tests/mod.rs b/crates/neomacs-renderer-wgpu/src/external_buffer/tests/external_buffer_test.rs
similarity index 100%
rename from crates/neomacs-renderer-wgpu/src/external_buffer/tests/mod.rs
rename to crates/neomacs-renderer-wgpu/src/external_buffer/tests/external_buffer_test.rs
diff --git a/crates/neomacs-renderer-wgpu/src/glyph_atlas/allocator.rs b/crates/neomacs-renderer-wgpu/src/glyph_atlas/allocator.rs
index c93b25000c..87e79018d3 100644
--- a/crates/neomacs-renderer-wgpu/src/glyph_atlas/allocator.rs
+++ b/crates/neomacs-renderer-wgpu/src/glyph_atlas/allocator.rs
@@ -114,4 +114,5 @@ impl ShelfAllocator {
 }
 
 #[cfg(test)]
+#[path = "allocator/tests/allocator_test.rs"]
 mod tests;
diff --git a/crates/neomacs-renderer-wgpu/src/glyph_atlas/allocator/tests/mod.rs b/crates/neomacs-renderer-wgpu/src/glyph_atlas/allocator/tests/allocator_test.rs
similarity index 100%
rename from crates/neomacs-renderer-wgpu/src/glyph_atlas/allocator/tests/mod.rs
rename to crates/neomacs-renderer-wgpu/src/glyph_atlas/allocator/tests/allocator_test.rs
diff --git a/crates/neomacs-renderer-wgpu/src/glyph_atlas/mod.rs b/crates/neomacs-renderer-wgpu/src/glyph_atlas/mod.rs
index cd192c3b1e..9faf421871 100644
--- a/crates/neomacs-renderer-wgpu/src/glyph_atlas/mod.rs
+++ b/crates/neomacs-renderer-wgpu/src/glyph_atlas/mod.rs
@@ -2772,6 +2772,7 @@ fn effective_font_size(face_size: Option<f32>, default_font_size: f32) -> f32 {
 }
 
 #[cfg(test)]
+#[path = "tests/glyph_atlas_test.rs"]
 mod tests;
 
 mod menu;
diff --git a/crates/neomacs-renderer-wgpu/src/glyph_atlas/tests/mod.rs b/crates/neomacs-renderer-wgpu/src/glyph_atlas/tests/glyph_atlas_test.rs
similarity index 100%
rename from crates/neomacs-renderer-wgpu/src/glyph_atlas/tests/mod.rs
rename to crates/neomacs-renderer-wgpu/src/glyph_atlas/tests/glyph_atlas_test.rs
diff --git a/crates/neomacs-renderer-wgpu/src/gpu_frame_timing.rs b/crates/neomacs-renderer-wgpu/src/gpu_frame_timing.rs
index d8ee233fa9..7627932a51 100644
--- a/crates/neomacs-renderer-wgpu/src/gpu_frame_timing.rs
+++ b/crates/neomacs-renderer-wgpu/src/gpu_frame_timing.rs
@@ -368,4 +368,5 @@ fn timestamp_delta_us(start: u64, end: u64, timestamp_period_ns: f32) -> Option<
 }
 
 #[cfg(test)]
+#[path = "gpu_frame_timing/tests/gpu_frame_timing_test.rs"]
 mod tests;
diff --git a/crates/neomacs-renderer-wgpu/src/gpu_frame_timing/tests/mod.rs b/crates/neomacs-renderer-wgpu/src/gpu_frame_timing/tests/gpu_frame_timing_test.rs
similarity index 100%
rename from crates/neomacs-renderer-wgpu/src/gpu_frame_timing/tests/mod.rs
rename to crates/neomacs-renderer-wgpu/src/gpu_frame_timing/tests/gpu_frame_timing_test.rs
diff --git a/crates/neomacs-renderer-wgpu/src/image_bands.rs b/crates/neomacs-renderer-wgpu/src/image_bands.rs
index 30b95f1021..2d45953f61 100644
--- a/crates/neomacs-renderer-wgpu/src/image_bands.rs
+++ b/crates/neomacs-renderer-wgpu/src/image_bands.rs
@@ -591,7 +591,7 @@ impl BandPlan {
 }
 
 #[cfg(test)]
-#[path = "image_bands/tests.rs"]
+#[path = "image_bands/tests/image_bands_test.rs"]
 mod tests;
 
 /// A baseline JPEG's rows, as the decoder hands them over.
diff --git a/crates/neomacs-renderer-wgpu/src/image_bands/tests.rs b/crates/neomacs-renderer-wgpu/src/image_bands/tests/image_bands_test.rs
similarity index 100%
rename from crates/neomacs-renderer-wgpu/src/image_bands/tests.rs
rename to crates/neomacs-renderer-wgpu/src/image_bands/tests/image_bands_test.rs
diff --git a/crates/neomacs-renderer-wgpu/src/image_cache.rs b/crates/neomacs-renderer-wgpu/src/image_cache.rs
index 85c851441a..99326ab621 100644
--- a/crates/neomacs-renderer-wgpu/src/image_cache.rs
+++ b/crates/neomacs-renderer-wgpu/src/image_cache.rs
@@ -2529,4 +2529,5 @@ impl ImageCache {
 }
 
 #[cfg(test)]
+#[path = "image_cache/tests/image_cache_test.rs"]
 mod tests;
diff --git a/crates/neomacs-renderer-wgpu/src/image_cache/tests/decode_diagnostic.rs b/crates/neomacs-renderer-wgpu/src/image_cache/tests/decode_diagnostic_test.rs
similarity index 100%
rename from crates/neomacs-renderer-wgpu/src/image_cache/tests/decode_diagnostic.rs
rename to crates/neomacs-renderer-wgpu/src/image_cache/tests/decode_diagnostic_test.rs
diff --git a/crates/neomacs-renderer-wgpu/src/image_cache/tests/mod.rs b/crates/neomacs-renderer-wgpu/src/image_cache/tests/image_cache_test.rs
similarity index 99%
rename from crates/neomacs-renderer-wgpu/src/image_cache/tests/mod.rs
rename to crates/neomacs-renderer-wgpu/src/image_cache/tests/image_cache_test.rs
index 5774418116..1ad89f11a3 100644
--- a/crates/neomacs-renderer-wgpu/src/image_cache/tests/mod.rs
+++ b/crates/neomacs-renderer-wgpu/src/image_cache/tests/image_cache_test.rs
@@ -2645,7 +2645,7 @@ fn a_jpeg_below_the_threshold_publishes_no_bands() {
     );
 }
 
-#[path = "decode_diagnostic.rs"]
+#[path = "decode_diagnostic_test.rs"]
 mod decode_diagnostic;
 
 /// A diagnostic for tests that only exercise scheduling, not wording.
diff --git a/crates/neomacs-renderer-wgpu/src/image_scale.rs b/crates/neomacs-renderer-wgpu/src/image_scale.rs
index ac953bdeb9..667e51e192 100644
--- a/crates/neomacs-renderer-wgpu/src/image_scale.rs
+++ b/crates/neomacs-renderer-wgpu/src/image_scale.rs
@@ -656,5 +656,5 @@ fn scale_channel(sum: i64, total: i64) -> u8 {
 }
 
 #[cfg(test)]
-#[path = "image_scale/tests.rs"]
+#[path = "image_scale/tests/image_scale_test.rs"]
 mod tests;
diff --git a/crates/neomacs-renderer-wgpu/src/image_scale/tests.rs b/crates/neomacs-renderer-wgpu/src/image_scale/tests/image_scale_test.rs
similarity index 100%
rename from crates/neomacs-renderer-wgpu/src/image_scale/tests.rs
rename to crates/neomacs-renderer-wgpu/src/image_scale/tests/image_scale_test.rs
diff --git a/crates/neomacs-renderer-wgpu/src/image_sequence.rs b/crates/neomacs-renderer-wgpu/src/image_sequence.rs
index ea38a25d46..b3f1632a4b 100644
--- a/crates/neomacs-renderer-wgpu/src/image_sequence.rs
+++ b/crates/neomacs-renderer-wgpu/src/image_sequence.rs
@@ -385,4 +385,5 @@ pub(crate) fn decode_sequence(data: &[u8]) -> Option<Arc<DecodedImageSequence>>
 }
 
 #[cfg(test)]
+#[path = "image_sequence/tests/image_sequence_test.rs"]
 mod tests;
diff --git a/crates/neomacs-renderer-wgpu/src/image_sequence/tests/mod.rs b/crates/neomacs-renderer-wgpu/src/image_sequence/tests/image_sequence_test.rs
similarity index 100%
rename from crates/neomacs-renderer-wgpu/src/image_sequence/tests/mod.rs
rename to crates/neomacs-renderer-wgpu/src/image_sequence/tests/image_sequence_test.rs
diff --git a/crates/neomacs-renderer-wgpu/src/media_budget.rs b/crates/neomacs-renderer-wgpu/src/media_budget.rs
index 38c2edfe64..87190fe1a1 100644
--- a/crates/neomacs-renderer-wgpu/src/media_budget.rs
+++ b/crates/neomacs-renderer-wgpu/src/media_budget.rs
@@ -205,4 +205,5 @@ impl Default for MediaBudget {
 }
 
 #[cfg(test)]
+#[path = "media_budget/tests/media_budget_test.rs"]
 mod tests;
diff --git a/crates/neomacs-renderer-wgpu/src/media_budget/tests/mod.rs b/crates/neomacs-renderer-wgpu/src/media_budget/tests/media_budget_test.rs
similarity index 100%
rename from crates/neomacs-renderer-wgpu/src/media_budget/tests/mod.rs
rename to crates/neomacs-renderer-wgpu/src/media_budget/tests/media_budget_test.rs
diff --git a/crates/neomacs-renderer-wgpu/src/native_presentation/abi.rs b/crates/neomacs-renderer-wgpu/src/native_presentation/abi.rs
index 4049cac6c0..57c0bb0c68 100644
--- a/crates/neomacs-renderer-wgpu/src/native_presentation/abi.rs
+++ b/crates/neomacs-renderer-wgpu/src/native_presentation/abi.rs
@@ -70,16 +70,5 @@ pub type GetPast =
     unsafe extern "system" fn(vk::Device, *const PastInfo, *mut PastProperties) -> vk::Result;
 
 #[cfg(test)]
-mod tests {
-    use super::*;
-    #[test]
-    #[cfg(target_pointer_width = "64")]
-    fn extension_abi_matches_vulkan_headers() {
-        assert_eq!(std::mem::size_of::<TimingFeatures>(), 32);
-        assert_eq!(std::mem::size_of::<PastTiming>(), 72);
-        assert_eq!(std::mem::size_of::<PastProperties>(), 48);
-        assert_eq!(std::mem::offset_of!(PastTiming, stages), 40);
-        assert_eq!(std::mem::offset_of!(PastTiming, domain_id), 56);
-        assert_eq!(std::mem::size_of::<SwapchainTimestamp>(), 40);
-    }
-}
+#[path = "tests/abi_test.rs"]
+mod tests;
diff --git a/crates/neomacs-renderer-wgpu/src/native_presentation/clock.rs b/crates/neomacs-renderer-wgpu/src/native_presentation/clock.rs
index 655e28c275..8886b65022 100644
--- a/crates/neomacs-renderer-wgpu/src/native_presentation/clock.rs
+++ b/crates/neomacs-renderer-wgpu/src/native_presentation/clock.rs
@@ -15,34 +15,5 @@ impl Calibration {
     }
 }
 #[cfg(test)]
-mod tests {
-    use super::*;
-    #[test]
-    fn clock_conversion_rejects_uncertain_zero_and_overflowing_observations() {
-        let calibration = Calibration {
-            monotonic: 100,
-            local: 300,
-            uncertainty_ns: 50,
-        };
-        assert_eq!(calibration.convert(350), Some(150));
-        assert_eq!(calibration.convert(100), None);
-        assert_eq!(calibration.convert(0), None);
-        assert_eq!(
-            Calibration {
-                uncertainty_ns: 1_000_001,
-                ..calibration
-            }
-            .convert(350),
-            None
-        );
-        assert_eq!(
-            Calibration {
-                monotonic: u64::MAX,
-                local: 1,
-                uncertainty_ns: 0
-            }
-            .convert(2),
-            None
-        );
-    }
-}
+#[path = "tests/clock_test.rs"]
+mod tests;
diff --git a/crates/neomacs-renderer-wgpu/src/native_presentation/query.rs b/crates/neomacs-renderer-wgpu/src/native_presentation/query.rs
index e99051fa45..0bcabeb03e 100644
--- a/crates/neomacs-renderer-wgpu/src/native_presentation/query.rs
+++ b/crates/neomacs-renderer-wgpu/src/native_presentation/query.rs
@@ -329,104 +329,5 @@ impl SwapchainTiming {
 }
 
 #[cfg(test)]
-mod tests {
-    use super::*;
-    fn session() -> SwapchainTiming {
-        SwapchainTiming {
-            swapchain: vk::SwapchainKHR::null(),
-            generation: 1,
-            domain: vk::TimeDomainKHR::from_raw(abi::SWAPCHAIN_LOCAL),
-            domain_id: 9,
-            counter: 3,
-            outstanding: [1, 2].into(),
-            last_id: 2,
-        }
-    }
-    fn record(id: u64) -> abi::PastTiming {
-        abi::PastTiming {
-            present_id: id,
-            complete: 1,
-            stage_count: 1,
-            domain: vk::TimeDomainKHR::from_raw(abi::SWAPCHAIN_LOCAL),
-            domain_id: 9,
-            ..Default::default()
-        }
-    }
-    const CALIBRATION: Calibration = Calibration {
-        monotonic: 100,
-        local: 110,
-        uncertainty_ns: 50,
-    };
-    const STAGE: abi::StageTime = abi::StageTime {
-        stage: abi::FIRST_PIXEL_OUT,
-        time: 200,
-    };
-    #[test]
-    fn native_records_require_exact_id_complete_stage_and_clock_generation() {
-        let mut session = session();
-        let observations = session
-            .decode(3, 2, &[record(2), record(999)], &[STAGE; 2], CALIBRATION)
-            .unwrap();
-        assert_eq!(observations.len(), 1);
-        assert_eq!(
-            (observations[0].present_id, observations[0].monotonic_ns),
-            (2, 190)
-        );
-        assert_eq!(observations[0].uncertainty_ns, 50);
-        assert!(session.outstanding.contains(&1));
-        assert!(
-            session
-                .decode(3, 1, &[record(2)], &[STAGE], CALIBRATION)
-                .unwrap()
-                .is_empty()
-        );
-        let mut partial = record(1);
-        partial.complete = 0;
-        assert!(
-            session
-                .decode(3, 1, &[partial], &[STAGE], CALIBRATION)
-                .unwrap()
-                .is_empty()
-        );
-        assert!(session.outstanding.contains(&1));
-        assert!(
-            session
-                .decode(4, 1, &[record(1)], &[STAGE], CALIBRATION)
-                .is_none()
-        );
-        assert!(
-            session
-                .decode(3, 2, &[record(1)], &[STAGE], CALIBRATION)
-                .is_none()
-        );
-        let mut bad_domain = record(1);
-        bad_domain.domain_id = 10;
-        assert!(
-            session
-                .decode(3, 1, &[bad_domain], &[STAGE], CALIBRATION)
-                .unwrap()
-                .is_empty()
-        );
-    }
-    #[test]
-    fn queue_completion_and_uncertain_clocks_are_not_pixel_output_evidence() {
-        for (stage, calibration) in [
-            (abi::StageTime { stage: 1, ..STAGE }, CALIBRATION),
-            (abi::StageTime { time: 0, ..STAGE }, CALIBRATION),
-            (
-                STAGE,
-                Calibration {
-                    uncertainty_ns: 1_000_001,
-                    ..CALIBRATION
-                },
-            ),
-        ] {
-            assert!(
-                session()
-                    .decode(3, 1, &[record(1)], &[stage], calibration)
-                    .unwrap()
-                    .is_empty()
-            );
-        }
-    }
-}
+#[path = "tests/query_test.rs"]
+mod tests;
diff --git a/crates/neomacs-renderer-wgpu/src/native_presentation/tests/abi_test.rs b/crates/neomacs-renderer-wgpu/src/native_presentation/tests/abi_test.rs
new file mode 100644
index 0000000000..5e1eff67fb
--- /dev/null
+++ b/crates/neomacs-renderer-wgpu/src/native_presentation/tests/abi_test.rs
@@ -0,0 +1,11 @@
+use super::*;
+#[test]
+#[cfg(target_pointer_width = "64")]
+fn extension_abi_matches_vulkan_headers() {
+    assert_eq!(std::mem::size_of::<TimingFeatures>(), 32);
+    assert_eq!(std::mem::size_of::<PastTiming>(), 72);
+    assert_eq!(std::mem::size_of::<PastProperties>(), 48);
+    assert_eq!(std::mem::offset_of!(PastTiming, stages), 40);
+    assert_eq!(std::mem::offset_of!(PastTiming, domain_id), 56);
+    assert_eq!(std::mem::size_of::<SwapchainTimestamp>(), 40);
+}
diff --git a/crates/neomacs-renderer-wgpu/src/native_presentation/tests/clock_test.rs b/crates/neomacs-renderer-wgpu/src/native_presentation/tests/clock_test.rs
new file mode 100644
index 0000000000..ec8545855a
--- /dev/null
+++ b/crates/neomacs-renderer-wgpu/src/native_presentation/tests/clock_test.rs
@@ -0,0 +1,29 @@
+use super::*;
+#[test]
+fn clock_conversion_rejects_uncertain_zero_and_overflowing_observations() {
+    let calibration = Calibration {
+        monotonic: 100,
+        local: 300,
+        uncertainty_ns: 50,
+    };
+    assert_eq!(calibration.convert(350), Some(150));
+    assert_eq!(calibration.convert(100), None);
+    assert_eq!(calibration.convert(0), None);
+    assert_eq!(
+        Calibration {
+            uncertainty_ns: 1_000_001,
+            ..calibration
+        }
+        .convert(350),
+        None
+    );
+    assert_eq!(
+        Calibration {
+            monotonic: u64::MAX,
+            local: 1,
+            uncertainty_ns: 0
+        }
+        .convert(2),
+        None
+    );
+}
diff --git a/crates/neomacs-renderer-wgpu/src/native_presentation/tests/query_test.rs b/crates/neomacs-renderer-wgpu/src/native_presentation/tests/query_test.rs
new file mode 100644
index 0000000000..99a16defcb
--- /dev/null
+++ b/crates/neomacs-renderer-wgpu/src/native_presentation/tests/query_test.rs
@@ -0,0 +1,99 @@
+use super::*;
+fn session() -> SwapchainTiming {
+    SwapchainTiming {
+        swapchain: vk::SwapchainKHR::null(),
+        generation: 1,
+        domain: vk::TimeDomainKHR::from_raw(abi::SWAPCHAIN_LOCAL),
+        domain_id: 9,
+        counter: 3,
+        outstanding: [1, 2].into(),
+        last_id: 2,
+    }
+}
+fn record(id: u64) -> abi::PastTiming {
+    abi::PastTiming {
+        present_id: id,
+        complete: 1,
+        stage_count: 1,
+        domain: vk::TimeDomainKHR::from_raw(abi::SWAPCHAIN_LOCAL),
+        domain_id: 9,
+        ..Default::default()
+    }
+}
+const CALIBRATION: Calibration = Calibration {
+    monotonic: 100,
+    local: 110,
+    uncertainty_ns: 50,
+};
+const STAGE: abi::StageTime = abi::StageTime {
+    stage: abi::FIRST_PIXEL_OUT,
+    time: 200,
+};
+#[test]
+fn native_records_require_exact_id_complete_stage_and_clock_generation() {
+    let mut session = session();
+    let observations = session
+        .decode(3, 2, &[record(2), record(999)], &[STAGE; 2], CALIBRATION)
+        .unwrap();
+    assert_eq!(observations.len(), 1);
+    assert_eq!(
+        (observations[0].present_id, observations[0].monotonic_ns),
+        (2, 190)
+    );
+    assert_eq!(observations[0].uncertainty_ns, 50);
+    assert!(session.outstanding.contains(&1));
+    assert!(
+        session
+            .decode(3, 1, &[record(2)], &[STAGE], CALIBRATION)
+            .unwrap()
+            .is_empty()
+    );
+    let mut partial = record(1);
+    partial.complete = 0;
+    assert!(
+        session
+            .decode(3, 1, &[partial], &[STAGE], CALIBRATION)
+            .unwrap()
+            .is_empty()
+    );
+    assert!(session.outstanding.contains(&1));
+    assert!(
+        session
+            .decode(4, 1, &[record(1)], &[STAGE], CALIBRATION)
+            .is_none()
+    );
+    assert!(
+        session
+            .decode(3, 2, &[record(1)], &[STAGE], CALIBRATION)
+            .is_none()
+    );
+    let mut bad_domain = record(1);
+    bad_domain.domain_id = 10;
+    assert!(
+        session
+            .decode(3, 1, &[bad_domain], &[STAGE], CALIBRATION)
+            .unwrap()
+            .is_empty()
+    );
+}
+#[test]
+fn queue_completion_and_uncertain_clocks_are_not_pixel_output_evidence() {
+    for (stage, calibration) in [
+        (abi::StageTime { stage: 1, ..STAGE }, CALIBRATION),
+        (abi::StageTime { time: 0, ..STAGE }, CALIBRATION),
+        (
+            STAGE,
+            Calibration {
+                uncertainty_ns: 1_000_001,
+                ..CALIBRATION
+            },
+        ),
+    ] {
+        assert!(
+            session()
+                .decode(3, 1, &[record(1)], &[stage], calibration)
+                .unwrap()
+                .is_empty()
+        );
+    }
+}
diff --git a/crates/neomacs-renderer-wgpu/src/renderer/composition_ring.rs b/crates/neomacs-renderer-wgpu/src/renderer/composition_ring.rs
index c4bcf00297..d3c691409c 100644
--- a/crates/neomacs-renderer-wgpu/src/renderer/composition_ring.rs
+++ b/crates/neomacs-renderer-wgpu/src/renderer/composition_ring.rs
@@ -68,4 +68,5 @@ impl<R> CompositionRing<R> {
 }
 
 #[cfg(test)]
+#[path = "composition_ring/tests/composition_ring_test.rs"]
 mod tests;
diff --git a/crates/neomacs-renderer-wgpu/src/renderer/composition_ring/tests/mod.rs b/crates/neomacs-renderer-wgpu/src/renderer/composition_ring/tests/composition_ring_test.rs
similarity index 100%
rename from crates/neomacs-renderer-wgpu/src/renderer/composition_ring/tests/mod.rs
rename to crates/neomacs-renderer-wgpu/src/renderer/composition_ring/tests/composition_ring_test.rs
diff --git a/crates/neomacs-renderer-wgpu/src/renderer/content.rs b/crates/neomacs-renderer-wgpu/src/renderer/content.rs
index 1c1bf12cae..4a2dcbef77 100644
--- a/crates/neomacs-renderer-wgpu/src/renderer/content.rs
+++ b/crates/neomacs-renderer-wgpu/src/renderer/content.rs
@@ -1840,4 +1840,5 @@ impl WgpuRenderer {
 }
 
 #[cfg(test)]
+#[path = "content/tests/content_test.rs"]
 mod tests;
diff --git a/crates/neomacs-renderer-wgpu/src/renderer/content/tests/mod.rs b/crates/neomacs-renderer-wgpu/src/renderer/content/tests/content_test.rs
similarity index 100%
rename from crates/neomacs-renderer-wgpu/src/renderer/content/tests/mod.rs
rename to crates/neomacs-renderer-wgpu/src/renderer/content/tests/content_test.rs
diff --git a/crates/neomacs-renderer-wgpu/src/renderer/cursor_effects.rs b/crates/neomacs-renderer-wgpu/src/renderer/cursor_effects.rs
index 4826b9da20..4696dd2382 100644
--- a/crates/neomacs-renderer-wgpu/src/renderer/cursor_effects.rs
+++ b/crates/neomacs-renderer-wgpu/src/renderer/cursor_effects.rs
@@ -2703,4 +2703,5 @@ pub(super) fn emit_cursor_trail_fade(
 }
 
 #[cfg(test)]
+#[path = "cursor_effects/tests/cursor_effects_test.rs"]
 mod tests;
diff --git a/crates/neomacs-renderer-wgpu/src/renderer/cursor_effects/tests/mod.rs b/crates/neomacs-renderer-wgpu/src/renderer/cursor_effects/tests/cursor_effects_test.rs
similarity index 100%
rename from crates/neomacs-renderer-wgpu/src/renderer/cursor_effects/tests/mod.rs
rename to crates/neomacs-renderer-wgpu/src/renderer/cursor_effects/tests/cursor_effects_test.rs
diff --git a/crates/neomacs-renderer-wgpu/src/renderer/cursor_presentation.rs b/crates/neomacs-renderer-wgpu/src/renderer/cursor_presentation.rs
index 9f6ddb4936..86251580d6 100644
--- a/crates/neomacs-renderer-wgpu/src/renderer/cursor_presentation.rs
+++ b/crates/neomacs-renderer-wgpu/src/renderer/cursor_presentation.rs
@@ -190,4 +190,5 @@ fn rect_approximately_equal(left: Rect, right: Rect) -> bool {
 }
 
 #[cfg(test)]
+#[path = "cursor_presentation/tests/cursor_presentation_test.rs"]
 mod tests;
diff --git a/crates/neomacs-renderer-wgpu/src/renderer/cursor_presentation/tests/mod.rs b/crates/neomacs-renderer-wgpu/src/renderer/cursor_presentation/tests/cursor_presentation_test.rs
similarity index 100%
rename from crates/neomacs-renderer-wgpu/src/renderer/cursor_presentation/tests/mod.rs
rename to crates/neomacs-renderer-wgpu/src/renderer/cursor_presentation/tests/cursor_presentation_test.rs
diff --git a/crates/neomacs-renderer-wgpu/src/renderer/deform.rs b/crates/neomacs-renderer-wgpu/src/renderer/deform.rs
index 4cdd677300..a55c937b9b 100644
--- a/crates/neomacs-renderer-wgpu/src/renderer/deform.rs
+++ b/crates/neomacs-renderer-wgpu/src/renderer/deform.rs
@@ -103,4 +103,5 @@ pub fn page_curl_transform(t: f32, curl_progress: f32, bounds_h: f32) -> (f32, f
 }
 
 #[cfg(test)]
+#[path = "deform/tests/deform_test.rs"]
 mod tests;
diff --git a/crates/neomacs-renderer-wgpu/src/renderer/deform/tests/mod.rs b/crates/neomacs-renderer-wgpu/src/renderer/deform/tests/deform_test.rs
similarity index 100%
rename from crates/neomacs-renderer-wgpu/src/renderer/deform/tests/mod.rs
rename to crates/neomacs-renderer-wgpu/src/renderer/deform/tests/deform_test.rs
diff --git a/crates/neomacs-renderer-wgpu/src/renderer/effect_common.rs b/crates/neomacs-renderer-wgpu/src/renderer/effect_common.rs
index 24946f999d..657075b2f6 100644
--- a/crates/neomacs-renderer-wgpu/src/renderer/effect_common.rs
+++ b/crates/neomacs-renderer-wgpu/src/renderer/effect_common.rs
@@ -150,4 +150,5 @@ pub(super) fn find_cursor_pos(
 }
 
 #[cfg(test)]
+#[path = "effect_common/tests/effect_common_test.rs"]
 mod tests;
diff --git a/crates/neomacs-renderer-wgpu/src/renderer/effect_common/tests/mod.rs b/crates/neomacs-renderer-wgpu/src/renderer/effect_common/tests/effect_common_test.rs
similarity index 100%
rename from crates/neomacs-renderer-wgpu/src/renderer/effect_common/tests/mod.rs
rename to crates/neomacs-renderer-wgpu/src/renderer/effect_common/tests/effect_common_test.rs
diff --git a/crates/neomacs-renderer-wgpu/src/renderer/effects_state.rs b/crates/neomacs-renderer-wgpu/src/renderer/effects_state.rs
index 68b77f61cd..da1ddd7b92 100644
--- a/crates/neomacs-renderer-wgpu/src/renderer/effects_state.rs
+++ b/crates/neomacs-renderer-wgpu/src/renderer/effects_state.rs
@@ -681,4 +681,5 @@ impl RendererFrameEffectsRef<'_> {
 }
 
 #[cfg(test)]
+#[path = "effects_state/tests/effects_state_test.rs"]
 mod tests;
diff --git a/crates/neomacs-renderer-wgpu/src/renderer/effects_state/tests/mod.rs b/crates/neomacs-renderer-wgpu/src/renderer/effects_state/tests/effects_state_test.rs
similarity index 100%
rename from crates/neomacs-renderer-wgpu/src/renderer/effects_state/tests/mod.rs
rename to crates/neomacs-renderer-wgpu/src/renderer/effects_state/tests/effects_state_test.rs
diff --git a/crates/neomacs-renderer-wgpu/src/renderer/glyphs.rs b/crates/neomacs-renderer-wgpu/src/renderer/glyphs.rs
index 5a3c3576b7..88f91e2785 100644
--- a/crates/neomacs-renderer-wgpu/src/renderer/glyphs.rs
+++ b/crates/neomacs-renderer-wgpu/src/renderer/glyphs.rs
@@ -2104,4 +2104,5 @@ impl WgpuRenderer {
 }
 
 #[cfg(test)]
+#[path = "glyphs/tests/glyphs_test.rs"]
 mod tests;
diff --git a/crates/neomacs-renderer-wgpu/src/renderer/glyphs/tests/mod.rs b/crates/neomacs-renderer-wgpu/src/renderer/glyphs/tests/glyphs_test.rs
similarity index 100%
rename from crates/neomacs-renderer-wgpu/src/renderer/glyphs/tests/mod.rs
rename to crates/neomacs-renderer-wgpu/src/renderer/glyphs/tests/glyphs_test.rs
diff --git a/crates/neomacs-renderer-wgpu/src/renderer/gpu_budget.rs b/crates/neomacs-renderer-wgpu/src/renderer/gpu_budget.rs
index 1c152d7114..17d2f0423b 100644
--- a/crates/neomacs-renderer-wgpu/src/renderer/gpu_budget.rs
+++ b/crates/neomacs-renderer-wgpu/src/renderer/gpu_budget.rs
@@ -276,4 +276,5 @@ impl Default for GpuBudget {
 }
 
 #[cfg(test)]
+#[path = "gpu_budget/tests/gpu_budget_test.rs"]
 mod tests;
diff --git a/crates/neomacs-renderer-wgpu/src/renderer/gpu_budget/tests/mod.rs b/crates/neomacs-renderer-wgpu/src/renderer/gpu_budget/tests/gpu_budget_test.rs
similarity index 100%
rename from crates/neomacs-renderer-wgpu/src/renderer/gpu_budget/tests/mod.rs
rename to crates/neomacs-renderer-wgpu/src/renderer/gpu_budget/tests/gpu_budget_test.rs
diff --git a/crates/neomacs-renderer-wgpu/src/renderer/layer_media.rs b/crates/neomacs-renderer-wgpu/src/renderer/layer_media.rs
index 10b8430740..79720bd8a6 100644
--- a/crates/neomacs-renderer-wgpu/src/renderer/layer_media.rs
+++ b/crates/neomacs-renderer-wgpu/src/renderer/layer_media.rs
@@ -714,4 +714,5 @@ impl WgpuRenderer {
     test,
     any(feature = "video", all(feature = "webview", target_os = "linux"))
 ))]
+#[path = "layer_media/tests/layer_media_test.rs"]
 mod tests;
diff --git a/crates/neomacs-renderer-wgpu/src/renderer/layer_media/tests/mod.rs b/crates/neomacs-renderer-wgpu/src/renderer/layer_media/tests/layer_media_test.rs
similarity index 100%
rename from crates/neomacs-renderer-wgpu/src/renderer/layer_media/tests/mod.rs
rename to crates/neomacs-renderer-wgpu/src/renderer/layer_media/tests/layer_media_test.rs
diff --git a/crates/neomacs-renderer-wgpu/src/renderer/layout_pass.rs b/crates/neomacs-renderer-wgpu/src/renderer/layout_pass.rs
index da0808c04c..4686ee7edb 100644
--- a/crates/neomacs-renderer-wgpu/src/renderer/layout_pass.rs
+++ b/crates/neomacs-renderer-wgpu/src/renderer/layout_pass.rs
@@ -231,4 +231,5 @@ impl WgpuRenderer {
 }
 
 #[cfg(test)]
+#[path = "layout_pass/tests/layout_pass_test.rs"]
 mod tests;
diff --git a/crates/neomacs-renderer-wgpu/src/renderer/layout_pass/tests/mod.rs b/crates/neomacs-renderer-wgpu/src/renderer/layout_pass/tests/layout_pass_test.rs
similarity index 100%
rename from crates/neomacs-renderer-wgpu/src/renderer/layout_pass/tests/mod.rs
rename to crates/neomacs-renderer-wgpu/src/renderer/layout_pass/tests/layout_pass_test.rs
diff --git a/crates/neomacs-renderer-wgpu/src/renderer/pattern_effects.rs b/crates/neomacs-renderer-wgpu/src/renderer/pattern_effects.rs
index 59bd17ec41..6b49aaff95 100644
--- a/crates/neomacs-renderer-wgpu/src/renderer/pattern_effects.rs
+++ b/crates/neomacs-renderer-wgpu/src/renderer/pattern_effects.rs
@@ -1917,4 +1917,5 @@ pub(super) fn emit_prism_rainbow_edge(ctx: &EffectCtx) -> Vec<RectVertex> {
 }
 
 #[cfg(test)]
+#[path = "pattern_effects/tests/pattern_effects_test.rs"]
 mod tests;
diff --git a/crates/neomacs-renderer-wgpu/src/renderer/pattern_effects/tests/mod.rs b/crates/neomacs-renderer-wgpu/src/renderer/pattern_effects/tests/pattern_effects_test.rs
similarity index 100%
rename from crates/neomacs-renderer-wgpu/src/renderer/pattern_effects/tests/mod.rs
rename to crates/neomacs-renderer-wgpu/src/renderer/pattern_effects/tests/pattern_effects_test.rs
diff --git a/crates/neomacs-renderer-wgpu/src/renderer/pointer_override.rs b/crates/neomacs-renderer-wgpu/src/renderer/pointer_override.rs
index e9ab29422b..a52b5887c1 100644
--- a/crates/neomacs-renderer-wgpu/src/renderer/pointer_override.rs
+++ b/crates/neomacs-renderer-wgpu/src/renderer/pointer_override.rs
@@ -1070,4 +1070,5 @@ fn clip_convex_polygon(
 }
 
 #[cfg(test)]
+#[path = "pointer_override/tests/pointer_override_test.rs"]
 mod tests;
diff --git a/crates/neomacs-renderer-wgpu/src/renderer/pointer_override/tests/mod.rs b/crates/neomacs-renderer-wgpu/src/renderer/pointer_override/tests/pointer_override_test.rs
similarity index 100%
rename from crates/neomacs-renderer-wgpu/src/renderer/pointer_override/tests/mod.rs
rename to crates/neomacs-renderer-wgpu/src/renderer/pointer_override/tests/pointer_override_test.rs
diff --git a/crates/neomacs-renderer-wgpu/src/renderer/row_reuse.rs b/crates/neomacs-renderer-wgpu/src/renderer/row_reuse.rs
index a6ef8e2e7a..0bf323686e 100644
--- a/crates/neomacs-renderer-wgpu/src/renderer/row_reuse.rs
+++ b/crates/neomacs-renderer-wgpu/src/renderer/row_reuse.rs
@@ -644,4 +644,5 @@ pub(super) fn scale_is_power_of_two(scale: f32) -> bool {
 }
 
 #[cfg(test)]
+#[path = "row_reuse/tests/row_reuse_test.rs"]
 mod tests;
diff --git a/crates/neomacs-renderer-wgpu/src/renderer/row_reuse/tests/mod.rs b/crates/neomacs-renderer-wgpu/src/renderer/row_reuse/tests/row_reuse_test.rs
similarity index 100%
rename from crates/neomacs-renderer-wgpu/src/renderer/row_reuse/tests/mod.rs
rename to crates/neomacs-renderer-wgpu/src/renderer/row_reuse/tests/row_reuse_test.rs
diff --git a/crates/neomacs-renderer-wgpu/src/renderer/snapshot_pool.rs b/crates/neomacs-renderer-wgpu/src/renderer/snapshot_pool.rs
index 8c25f4f7a1..987c669f29 100644
--- a/crates/neomacs-renderer-wgpu/src/renderer/snapshot_pool.rs
+++ b/crates/neomacs-renderer-wgpu/src/renderer/snapshot_pool.rs
@@ -345,4 +345,5 @@ impl<R> SnapshotPool<R> {
 }
 
 #[cfg(test)]
+#[path = "snapshot_pool/tests/snapshot_pool_test.rs"]
 mod tests;
diff --git a/crates/neomacs-renderer-wgpu/src/renderer/snapshot_pool/tests/mod.rs b/crates/neomacs-renderer-wgpu/src/renderer/snapshot_pool/tests/snapshot_pool_test.rs
similarity index 100%
rename from crates/neomacs-renderer-wgpu/src/renderer/snapshot_pool/tests/mod.rs
rename to crates/neomacs-renderer-wgpu/src/renderer/snapshot_pool/tests/snapshot_pool_test.rs
diff --git a/crates/neomacs-renderer-wgpu/src/renderer/transitions.rs b/crates/neomacs-renderer-wgpu/src/renderer/transitions.rs
index 71b15098f6..daf49b26d6 100644
--- a/crates/neomacs-renderer-wgpu/src/renderer/transitions.rs
+++ b/crates/neomacs-renderer-wgpu/src/renderer/transitions.rs
@@ -2545,4 +2545,5 @@ impl WgpuRenderer {
 }
 
 #[cfg(test)]
+#[path = "transitions/tests/transitions_test.rs"]
 mod tests;
diff --git a/crates/neomacs-renderer-wgpu/src/renderer/transitions/tests/mod.rs b/crates/neomacs-renderer-wgpu/src/renderer/transitions/tests/transitions_test.rs
similarity index 100%
rename from crates/neomacs-renderer-wgpu/src/renderer/transitions/tests/mod.rs
rename to crates/neomacs-renderer-wgpu/src/renderer/transitions/tests/transitions_test.rs
diff --git a/crates/neomacs-renderer-wgpu/src/renderer/ui_overlays.rs b/crates/neomacs-renderer-wgpu/src/renderer/ui_overlays.rs
index 93127b6d6d..67347735f2 100644
--- a/crates/neomacs-renderer-wgpu/src/renderer/ui_overlays.rs
+++ b/crates/neomacs-renderer-wgpu/src/renderer/ui_overlays.rs
@@ -2394,4 +2394,5 @@ impl WgpuRenderer {
 }
 
 #[cfg(test)]
+#[path = "ui_overlays/tests/ui_overlays_test.rs"]
 mod tests;
diff --git a/crates/neomacs-renderer-wgpu/src/renderer/ui_overlays/tests/mod.rs b/crates/neomacs-renderer-wgpu/src/renderer/ui_overlays/tests/ui_overlays_test.rs
similarity index 100%
rename from crates/neomacs-renderer-wgpu/src/renderer/ui_overlays/tests/mod.rs
rename to crates/neomacs-renderer-wgpu/src/renderer/ui_overlays/tests/ui_overlays_test.rs
diff --git a/crates/neomacs-renderer-wgpu/src/renderer/window_effects.rs b/crates/neomacs-renderer-wgpu/src/renderer/window_effects.rs
index 247e6d0e48..7b58d6b513 100644
--- a/crates/neomacs-renderer-wgpu/src/renderer/window_effects.rs
+++ b/crates/neomacs-renderer-wgpu/src/renderer/window_effects.rs
@@ -2478,4 +2478,5 @@ pub(super) fn emit_window_switch_fade(
 // ===========================================================================
 
 #[cfg(test)]
+#[path = "window_effects/tests/window_effects_test.rs"]
 mod tests;
diff --git a/crates/neomacs-renderer-wgpu/src/renderer/window_effects/tests/mod.rs b/crates/neomacs-renderer-wgpu/src/renderer/window_effects/tests/window_effects_test.rs
similarity index 100%
rename from crates/neomacs-renderer-wgpu/src/renderer/window_effects/tests/mod.rs
rename to crates/neomacs-renderer-wgpu/src/renderer/window_effects/tests/window_effects_test.rs
diff --git a/crates/neomacs-renderer-wgpu/src/shader_surface_cache.rs b/crates/neomacs-renderer-wgpu/src/shader_surface_cache.rs
index ee05be7beb..242299f912 100644
--- a/crates/neomacs-renderer-wgpu/src/shader_surface_cache.rs
+++ b/crates/neomacs-renderer-wgpu/src/shader_surface_cache.rs
@@ -866,4 +866,5 @@ impl CachedShaderSurface {
 }
 
 #[cfg(test)]
+#[path = "shader_surface_cache/tests/shader_surface_cache_test.rs"]
 mod tests;
diff --git a/crates/neomacs-renderer-wgpu/src/shader_surface_cache/tests/mod.rs b/crates/neomacs-renderer-wgpu/src/shader_surface_cache/tests/shader_surface_cache_test.rs
similarity index 100%
rename from crates/neomacs-renderer-wgpu/src/shader_surface_cache/tests/mod.rs
rename to crates/neomacs-renderer-wgpu/src/shader_surface_cache/tests/shader_surface_cache_test.rs
diff --git a/crates/neomacs-renderer-wgpu/src/tooltip_layout.rs b/crates/neomacs-renderer-wgpu/src/tooltip_layout.rs
index 7f138929bf..250b372540 100644
--- a/crates/neomacs-renderer-wgpu/src/tooltip_layout.rs
+++ b/crates/neomacs-renderer-wgpu/src/tooltip_layout.rs
@@ -164,4 +164,5 @@ impl TooltipLayout {
 }
 
 #[cfg(test)]
+#[path = "tooltip_layout/tests/tooltip_layout_test.rs"]
 mod tests;
diff --git a/crates/neomacs-renderer-wgpu/src/tooltip_layout/tests/mod.rs b/crates/neomacs-renderer-wgpu/src/tooltip_layout/tests/tooltip_layout_test.rs
similarity index 100%
rename from crates/neomacs-renderer-wgpu/src/tooltip_layout/tests/mod.rs
rename to crates/neomacs-renderer-wgpu/src/tooltip_layout/tests/tooltip_layout_test.rs
diff --git a/crates/neomacs-renderer-wgpu/src/vertex.rs b/crates/neomacs-renderer-wgpu/src/vertex.rs
index 7cee1560d8..ee0fa20c34 100644
--- a/crates/neomacs-renderer-wgpu/src/vertex.rs
+++ b/crates/neomacs-renderer-wgpu/src/vertex.rs
@@ -267,4 +267,5 @@ pub struct Uniforms {
 }
 
 #[cfg(test)]
+#[path = "vertex/tests/vertex_test.rs"]
 mod tests;
diff --git a/crates/neomacs-renderer-wgpu/src/vertex/tests/mod.rs b/crates/neomacs-renderer-wgpu/src/vertex/tests/vertex_test.rs
similarity index 100%
rename from crates/neomacs-renderer-wgpu/src/vertex/tests/mod.rs
rename to crates/neomacs-renderer-wgpu/src/vertex/tests/vertex_test.rs
diff --git a/crates/neomacs-renderer-wgpu/src/video_cache.rs b/crates/neomacs-renderer-wgpu/src/video_cache.rs
index 8c79815f61..a95c9b7f49 100644
--- a/crates/neomacs-renderer-wgpu/src/video_cache.rs
+++ b/crates/neomacs-renderer-wgpu/src/video_cache.rs
@@ -1479,4 +1479,5 @@ impl VideoCache {
 }
 
 #[cfg(test)]
+#[path = "video_cache/tests/video_cache_test.rs"]
 mod tests;
diff --git a/crates/neomacs-renderer-wgpu/src/video_cache/tests/mod.rs b/crates/neomacs-renderer-wgpu/src/video_cache/tests/video_cache_test.rs
similarity index 100%
rename from crates/neomacs-renderer-wgpu/src/video_cache/tests/mod.rs
rename to crates/neomacs-renderer-wgpu/src/video_cache/tests/video_cache_test.rs
diff --git a/crates/neomacs-renderer-wgpu/src/vulkan_dmabuf.rs b/crates/neomacs-renderer-wgpu/src/vulkan_dmabuf.rs
index 91f8f3bffb..1cd92e6d08 100644
--- a/crates/neomacs-renderer-wgpu/src/vulkan_dmabuf.rs
+++ b/crates/neomacs-renderer-wgpu/src/vulkan_dmabuf.rs
@@ -1053,4 +1053,5 @@ pub fn import_dmabuf_via_mmap(
 }
 
 #[cfg(test)]
+#[path = "vulkan_dmabuf/tests/vulkan_dmabuf_test.rs"]
 mod tests;
diff --git a/crates/neomacs-renderer-wgpu/src/vulkan_dmabuf/tests/mod.rs b/crates/neomacs-renderer-wgpu/src/vulkan_dmabuf/tests/vulkan_dmabuf_test.rs
similarity index 100%
rename from crates/neomacs-renderer-wgpu/src/vulkan_dmabuf/tests/mod.rs
rename to crates/neomacs-renderer-wgpu/src/vulkan_dmabuf/tests/vulkan_dmabuf_test.rs
diff --git a/crates/neomacs-renderer-wgpu/src/xbm.rs b/crates/neomacs-renderer-wgpu/src/xbm.rs
index d37ddfe65b..855a589242 100644
--- a/crates/neomacs-renderer-wgpu/src/xbm.rs
+++ b/crates/neomacs-renderer-wgpu/src/xbm.rs
@@ -140,4 +140,5 @@ fn constrain_and_return(width: u32, height: u32, rgba: Vec<u8>) -> Option<(u32,
 }
 
 #[cfg(test)]
+#[path = "xbm/tests/xbm_test.rs"]
 mod tests;
diff --git a/crates/neomacs-renderer-wgpu/src/xbm/tests/mod.rs b/crates/neomacs-renderer-wgpu/src/xbm/tests/xbm_test.rs
similarity index 100%
rename from crates/neomacs-renderer-wgpu/src/xbm/tests/mod.rs
rename to crates/neomacs-renderer-wgpu/src/xbm/tests/xbm_test.rs
diff --git a/crates/neomacs-renderer-wgpu/src/xpm.rs b/crates/neomacs-renderer-wgpu/src/xpm.rs
index 7a5ddba4da..9d61283f8f 100644
--- a/crates/neomacs-renderer-wgpu/src/xpm.rs
+++ b/crates/neomacs-renderer-wgpu/src/xpm.rs
@@ -419,4 +419,5 @@ fn hex_byte(s: &str) -> u8 {
 }
 
 #[cfg(test)]
+#[path = "xpm/tests/xpm_test.rs"]
 mod tests;
diff --git a/crates/neomacs-renderer-wgpu/src/xpm/tests/mod.rs b/crates/neomacs-renderer-wgpu/src/xpm/tests/xpm_test.rs
similarity index 100%
rename from crates/neomacs-renderer-wgpu/src/xpm/tests/mod.rs
rename to crates/neomacs-renderer-wgpu/src/xpm/tests/xpm_test.rs
diff --git a/crates/neomacs-video/src/platform/linux/decoder.rs b/crates/neomacs-video/src/platform/linux/decoder.rs
index 5df07532aa..86748a83c5 100644
--- a/crates/neomacs-video/src/platform/linux/decoder.rs
+++ b/crates/neomacs-video/src/platform/linux/decoder.rs
@@ -24,8 +24,8 @@ use crate::{
     BiPlanarVideoFormat, FrameImportPolicy, FrameTiming, InitialPlayback, LoopMode, MediaTime,
     MissingVideoPlugin, MissingVideoPlugins, PackedVideoFormat, PixelAspectRatio, PlaybackAction,
     PlaybackEpoch, VideoChromaLocation, VideoColorPrimaries, VideoColorRange, VideoColorimetry,
-    VideoCommand, VideoCommandError, VideoCompositorImport, VideoDecodeResidency, VideoFrameFormat,
-    VideoDecoderIdentity, VideoDecoderKind, VideoGeometry, VideoInstallerHint,
+    VideoCommand, VideoCommandError, VideoCompositorImport, VideoDecodeResidency,
+    VideoDecoderIdentity, VideoDecoderKind, VideoFrameFormat, VideoGeometry, VideoInstallerHint,
     VideoMatrixCoefficients, VideoRotation, VideoSessionState, VideoSource,
     VideoTransferCharacteristic, VideoWake,
 };
@@ -69,9 +69,7 @@ enum WorkerCommand {
     SetRate(f64),
     SetLoop(LoopMode),
     SetPresentation(crate::PresentationVisibility),
-    InstallLinearFallback {
-        generation: DecoderOutputGeneration,
-    },
+    InstallLinearFallback { generation: DecoderOutputGeneration },
     Close,
 }
 
@@ -267,10 +265,8 @@ impl DecoderBackend for GstreamerDecoder {
             .workers
             .get(&id)
             .ok_or_else(|| format!("video {} is not open", id.get()))?;
-        let transition = request_linear_fallback(
-            &worker.linear_fallback_requested,
-            rejection.generation,
-        );
+        let transition =
+            request_linear_fallback(&worker.linear_fallback_requested, rejection.generation);
         if let DecoderReconfiguration::Applied { generation } = transition {
             worker
                 .commands
@@ -544,8 +540,7 @@ fn run_worker_inner(
             let caps = sample
                 .caps()
                 .ok_or_else(|| "decoded video sample has no caps".to_owned())?;
-            if dma_drm_negotiation == DmaDrmNegotiation::LinearFallback
-                && is_modern_dma_drm(caps)?
+            if dma_drm_negotiation == DmaDrmNegotiation::LinearFallback && is_modern_dma_drm(caps)?
             {
                 // AppSink can still contain buffers queued under the old caps
                 // when the RECONFIGURE event is processed. Those buffers are
@@ -555,10 +550,7 @@ fn run_worker_inner(
                 continue;
             }
             if let Some(rejected) = rejected_dma_drm_format(caps, native_formats)? {
-                match request_linear_fallback(
-                    &linear_fallback_requested,
-                    output_generation,
-                ) {
+                match request_linear_fallback(&linear_fallback_requested, output_generation) {
                     DecoderReconfiguration::Applied { generation } => {
                         install_linear_fallback(
                             &appsink,
@@ -961,7 +953,10 @@ fn is_modern_dma_drm(caps: &gst::CapsRef) -> Result<bool, String> {
 /// callback. A downstream-query pad probe gives us the same safe allocation
 /// seam without raising Neomacs's minimum GStreamer ABI.
 fn advertise_required_video_meta(query: &mut gst::query::Allocation) {
-    if query.find_allocation_meta::<gst_video::VideoMeta>().is_none() {
+    if query
+        .find_allocation_meta::<gst_video::VideoMeta>()
+        .is_none()
+    {
         query.add_allocation_meta::<gst_video::VideoMeta>(None);
     }
 }
@@ -1003,11 +998,9 @@ fn decode_sample(
             renderer_drm_device,
             pipeline_drm_topology.decoder,
         ) {
-            (
-                VideoDecoderKind::Hardware,
-                Some(renderer),
-                PipelineDrmIdentity::Single(decoder),
-            ) if renderer == decoder => {
+            (VideoDecoderKind::Hardware, Some(renderer), PipelineDrmIdentity::Single(decoder))
+                if renderer == decoder =>
+            {
                 VideoDecodeResidency::HardwareDecoderReportsRendererDevice
             }
             (VideoDecoderKind::Hardware, _, _) => VideoDecodeResidency::HardwareUnverified,
@@ -1625,4 +1618,5 @@ fn frame_format_from_fourcc(fourcc: u32) -> Result<VideoFrameFormat, String> {
 }
 
 #[cfg(test)]
+#[path = "decoder/tests/decoder_test.rs"]
 mod tests;
diff --git a/crates/neomacs-video/src/platform/linux/decoder/tests/mod.rs b/crates/neomacs-video/src/platform/linux/decoder/tests/decoder_test.rs
similarity index 96%
rename from crates/neomacs-video/src/platform/linux/decoder/tests/mod.rs
rename to crates/neomacs-video/src/platform/linux/decoder/tests/decoder_test.rs
index e919c7662d..9851ac83f5 100644
--- a/crates/neomacs-video/src/platform/linux/decoder/tests/mod.rs
+++ b/crates/neomacs-video/src/platform/linux/decoder/tests/decoder_test.rs
@@ -2,10 +2,9 @@ use super::{
     DmaBufMemoryLayout, DmaDrmNegotiation, NativeVideoFormatSupport, ParsedDrmFormat,
     PipelineDrmIdentity, PipelineDrmTopology, advertise_required_video_meta,
     classify_pipeline_error, decoder_kind_from_factory_class, dma_buf_compositor_import,
-    frame_format_from_fourcc,
-    missing_video_plugin, preferred_sink_caps, rejected_dma_drm_format,
-    reject_incomplete_fallback_at_eos, request_linear_fallback, retain_unready_decoder_writes,
-    rotation_from_gstreamer_tag,
+    frame_format_from_fourcc, missing_video_plugin, preferred_sink_caps,
+    reject_incomplete_fallback_at_eos, rejected_dma_drm_format, request_linear_fallback,
+    retain_unready_decoder_writes, rotation_from_gstreamer_tag,
 };
 use crate::backend::{DecoderOutputGeneration, DecoderReconfiguration};
 use crate::sampling::LinuxDrmDevice;
@@ -176,10 +175,7 @@ fn sink_caps_accept_modifier_bearing_dma_drm_then_validate_the_sample() {
         DmaDrmNegotiation::Preferred,
     );
     assert_eq!(
-        caps.structure(0)
-            .unwrap()
-            .get::<String>("format")
-            .unwrap(),
+        caps.structure(0).unwrap().get::<String>("format").unwrap(),
         "DMA_DRM"
     );
     let legacy_formats = caps
@@ -299,10 +295,7 @@ fn import_rejection_has_one_generation_checked_fallback() {
         "a queued frame from the old output generation must not consume another retry"
     );
     assert_eq!(
-        request_linear_fallback(
-            &requested,
-            DecoderOutputGeneration::INITIAL.next()
-        ),
+        request_linear_fallback(&requested, DecoderOutputGeneration::INITIAL.next()),
         DecoderReconfiguration::Unsupported,
         "failure of the explicit fallback tier is terminal"
     );
diff --git a/crates/neomacs-video/src/platform/linux/dmabuf.rs b/crates/neomacs-video/src/platform/linux/dmabuf.rs
index 55b356bd36..40536bea32 100644
--- a/crates/neomacs-video/src/platform/linux/dmabuf.rs
+++ b/crates/neomacs-video/src/platform/linux/dmabuf.rs
@@ -313,6 +313,7 @@ fn sampled_format(fourcc: u32) -> Option<(vk::Format, wgpu::TextureFormat)> {
 }
 
 #[cfg(test)]
+#[path = "dmabuf/tests/dmabuf_test.rs"]
 mod tests;
 
 unsafe fn modifier_plane_count(
diff --git a/crates/neomacs-video/src/platform/linux/dmabuf/tests/mod.rs b/crates/neomacs-video/src/platform/linux/dmabuf/tests/dmabuf_test.rs
similarity index 100%
rename from crates/neomacs-video/src/platform/linux/dmabuf/tests/mod.rs
rename to crates/neomacs-video/src/platform/linux/dmabuf/tests/dmabuf_test.rs
diff --git a/crates/neomacs-video/src/platform/linux/frame.rs b/crates/neomacs-video/src/platform/linux/frame.rs
index 4833082633..670fc2a13d 100644
--- a/crates/neomacs-video/src/platform/linux/frame.rs
+++ b/crates/neomacs-video/src/platform/linux/frame.rs
@@ -108,4 +108,5 @@ pub(super) fn dmabuf_cache_key(
 }
 
 #[cfg(test)]
+#[path = "frame/tests/frame_test.rs"]
 mod tests;
diff --git a/crates/neomacs-video/src/platform/linux/frame/tests/mod.rs b/crates/neomacs-video/src/platform/linux/frame/tests/frame_test.rs
similarity index 100%
rename from crates/neomacs-video/src/platform/linux/frame/tests/mod.rs
rename to crates/neomacs-video/src/platform/linux/frame/tests/frame_test.rs
diff --git a/crates/neomacs-webview/src/load_state.rs b/crates/neomacs-webview/src/load_state.rs
index ec15fff19b..81ed0773d5 100644
--- a/crates/neomacs-webview/src/load_state.rs
+++ b/crates/neomacs-webview/src/load_state.rs
@@ -221,4 +221,5 @@ impl PageLoadState {
 }
 
 #[cfg(test)]
+#[path = "load_state/tests/load_state_test.rs"]
 mod tests;
diff --git a/crates/neomacs-webview/src/load_state/tests/mod.rs b/crates/neomacs-webview/src/load_state/tests/load_state_test.rs
similarity index 100%
rename from crates/neomacs-webview/src/load_state/tests/mod.rs
rename to crates/neomacs-webview/src/load_state/tests/load_state_test.rs
diff --git a/crates/neomacs-webview/src/platform/linux/display.rs b/crates/neomacs-webview/src/platform/linux/display.rs
index e1ba826576..56a51bb3f4 100644
--- a/crates/neomacs-webview/src/platform/linux/display.rs
+++ b/crates/neomacs-webview/src/platform/linux/display.rs
@@ -232,4 +232,5 @@ pub struct DmaBufPlane {
 }
 
 #[cfg(test)]
+#[path = "display/tests/display_test.rs"]
 mod tests;
diff --git a/crates/neomacs-webview/src/platform/linux/display/tests/mod.rs b/crates/neomacs-webview/src/platform/linux/display/tests/display_test.rs
similarity index 100%
rename from crates/neomacs-webview/src/platform/linux/display/tests/mod.rs
rename to crates/neomacs-webview/src/platform/linux/display/tests/display_test.rs
diff --git a/crates/neomacs-webview/src/platform/linux/sys.rs b/crates/neomacs-webview/src/platform/linux/sys.rs
index 2bfe1b26e0..bdddd71c0a 100644
--- a/crates/neomacs-webview/src/platform/linux/sys.rs
+++ b/crates/neomacs-webview/src/platform/linux/sys.rs
@@ -76,4 +76,5 @@ pub mod webkit {
 }
 
 #[cfg(test)]
+#[path = "sys/tests/sys_test.rs"]
 mod tests;
diff --git a/crates/neomacs-webview/src/platform/linux/sys/tests/mod.rs b/crates/neomacs-webview/src/platform/linux/sys/tests/sys_test.rs
similarity index 100%
rename from crates/neomacs-webview/src/platform/linux/sys/tests/mod.rs
rename to crates/neomacs-webview/src/platform/linux/sys/tests/sys_test.rs
diff --git a/crates/neomacs-webview/src/platform/macos/focus.rs b/crates/neomacs-webview/src/platform/macos/focus.rs
index 71f29cc62d..fcc32d9a99 100644
--- a/crates/neomacs-webview/src/platform/macos/focus.rs
+++ b/crates/neomacs-webview/src/platform/macos/focus.rs
@@ -145,4 +145,5 @@ pub(super) fn focus_transition(
 }
 
 #[cfg(test)]
+#[path = "focus/tests/focus_test.rs"]
 mod tests;
diff --git a/crates/neomacs-webview/src/platform/macos/focus/tests/mod.rs b/crates/neomacs-webview/src/platform/macos/focus/tests/focus_test.rs
similarity index 100%
rename from crates/neomacs-webview/src/platform/macos/focus/tests/mod.rs
rename to crates/neomacs-webview/src/platform/macos/focus/tests/focus_test.rs
diff --git a/crates/neomacs/src/bin/neomacsclient.rs b/crates/neomacs/src/bin/neomacsclient.rs
index e9b2441fab..7046d56e21 100644
--- a/crates/neomacs/src/bin/neomacsclient.rs
+++ b/crates/neomacs/src/bin/neomacsclient.rs
@@ -1124,7 +1124,7 @@ fn alternate_editor_tokens(editor: &str) -> Vec<&str> {
 }
 
 #[cfg(test)]
-#[path = "neomacsclient/tests/timeout_tests.rs"]
+#[path = "neomacsclient/tests/timeout_test.rs"]
 mod timeout_tests;
 
 #[cfg(test)]
@@ -1132,11 +1132,11 @@ mod timeout_tests;
 mod test_support;
 
 #[cfg(test)]
-#[path = "neomacsclient/tests/transport_tests.rs"]
+#[path = "neomacsclient/tests/transport_test.rs"]
 mod transport_tests;
 
 #[cfg(test)]
-#[path = "neomacsclient/tests/alternate_editor_tests.rs"]
+#[path = "neomacsclient/tests/alternate_editor_test.rs"]
 mod alternate_editor_tests;
 
 fn fail_or_alternate(prog: &str, options: &Options, message: &str) -> Result<(), String> {
diff --git a/crates/neomacs/src/bin/neomacsclient/tests/alternate_editor_tests.rs b/crates/neomacs/src/bin/neomacsclient/tests/alternate_editor_test.rs
similarity index 100%
rename from crates/neomacs/src/bin/neomacsclient/tests/alternate_editor_tests.rs
rename to crates/neomacs/src/bin/neomacsclient/tests/alternate_editor_test.rs
diff --git a/crates/neomacs/src/bin/neomacsclient/tests/timeout_tests.rs b/crates/neomacs/src/bin/neomacsclient/tests/timeout_test.rs
similarity index 100%
rename from crates/neomacs/src/bin/neomacsclient/tests/timeout_tests.rs
rename to crates/neomacs/src/bin/neomacsclient/tests/timeout_test.rs
diff --git a/crates/neomacs/src/bin/neomacsclient/tests/transport_tests.rs b/crates/neomacs/src/bin/neomacsclient/tests/transport_test.rs
similarity index 100%
rename from crates/neomacs/src/bin/neomacsclient/tests/transport_tests.rs
rename to crates/neomacs/src/bin/neomacsclient/tests/transport_test.rs
diff --git a/crates/neomacs/src/build_info.rs b/crates/neomacs/src/build_info.rs
index 548a6b815d..5930695751 100644
--- a/crates/neomacs/src/build_info.rs
+++ b/crates/neomacs/src/build_info.rs
@@ -155,4 +155,5 @@ pub(crate) fn write_build_provenance(output: &mut String) {
 }
 
 #[cfg(test)]
+#[path = "build_info/tests/build_info_test.rs"]
 mod tests;
diff --git a/crates/neomacs/src/build_info/tests/mod.rs b/crates/neomacs/src/build_info/tests/build_info_test.rs
similarity index 100%
rename from crates/neomacs/src/build_info/tests/mod.rs
rename to crates/neomacs/src/build_info/tests/build_info_test.rs
diff --git a/crates/neomacs/src/daemon.rs b/crates/neomacs/src/daemon.rs
index 05c96448fb..60744a69f5 100644
--- a/crates/neomacs/src/daemon.rs
+++ b/crates/neomacs/src/daemon.rs
@@ -253,5 +253,5 @@ pub(super) fn restart(args: &[OsString]) -> ! {
 }
 
 #[cfg(test)]
-#[path = "daemon/tests/mod.rs"]
+#[path = "daemon/tests/daemon_test.rs"]
 mod tests;
diff --git a/crates/neomacs/src/daemon/tests/mod.rs b/crates/neomacs/src/daemon/tests/daemon_test.rs
similarity index 100%
rename from crates/neomacs/src/daemon/tests/mod.rs
rename to crates/neomacs/src/daemon/tests/daemon_test.rs
diff --git a/crates/neomacs/src/input_bridge.rs b/crates/neomacs/src/input_bridge.rs
index 6c1fc5579a..8f2c18feb9 100644
--- a/crates/neomacs/src/input_bridge.rs
+++ b/crates/neomacs/src/input_bridge.rs
@@ -511,4 +511,5 @@ fn convert_single_display_event(event: &DisplayEvent) -> Option<KbInputEvent> {
 }
 
 #[cfg(test)]
+#[path = "input_bridge/tests/input_bridge_test.rs"]
 mod tests;
diff --git a/crates/neomacs/src/input_bridge/tests/mod.rs b/crates/neomacs/src/input_bridge/tests/input_bridge_test.rs
similarity index 100%
rename from crates/neomacs/src/input_bridge/tests/mod.rs
rename to crates/neomacs/src/input_bridge/tests/input_bridge_test.rs
diff --git a/crates/neomacs/src/tests/frame_snapshot_policy.rs b/crates/neomacs/src/tests/frame_snapshot_policy_test.rs
similarity index 100%
rename from crates/neomacs/src/tests/frame_snapshot_policy.rs
rename to crates/neomacs/src/tests/frame_snapshot_policy_test.rs
diff --git a/crates/neomacs/src/tests/main_test.rs b/crates/neomacs/src/tests/main_test.rs
index 79ed823262..4bdaea5e37 100644
--- a/crates/neomacs/src/tests/main_test.rs
+++ b/crates/neomacs/src/tests/main_test.rs
@@ -89,7 +89,7 @@ use std::time::{Duration, Instant};
 mod platform_fonts;
 
 #[cfg(test)]
-#[path = "frame_snapshot_policy.rs"]
+#[path = "frame_snapshot_policy_test.rs"]
 mod frame_snapshot_policy;
 
 fn gui_display() -> BootstrapDisplayConfig {
diff --git a/crates/neomacs/src/tests/tty_output_test.rs b/crates/neomacs/src/tests/tty_output_test.rs
new file mode 100644
index 0000000000..1784344b5a
--- /dev/null
+++ b/crates/neomacs/src/tests/tty_output_test.rs
@@ -0,0 +1,279 @@
+use super::*;
+struct Database(std::collections::BTreeMap<&'static str, &'static [u8]>);
+impl TerminalCapabilityDatabase for Database {
+    fn get_string(&mut self, cap: StringCapability<'_>) -> Option<Vec<u8>> {
+        match cap {
+            StringCapability::Termcap(name) => self.0.get(name).map(|bytes| bytes.to_vec()),
+            _ => None,
+        }
+    }
+    fn get_termcap_number(&mut self, _: &str) -> Option<i32> {
+        None
+    }
+    fn get_flag(&mut self, cap: super::super::terminal_capabilities::FlagCapability<'_>) -> bool {
+        match cap {
+            super::super::terminal_capabilities::FlagCapability::Termcap(name) => {
+                self.0.contains_key(name)
+            }
+            _ => false,
+        }
+    }
+}
+#[test]
+fn standout_closes_before_plain_text_with_dedicated_or_borrowed_exit() {
+    for (enter, exit) in [("so", "se"), ("us", "ue"), ("so", "me")] {
+        let mut database = Database(
+            [
+                ("cm", b"G%p1%d,%p2%d;".as_slice()),
+                (enter, b"ON"),
+                (exit, b"OFF"),
+            ]
+            .into(),
+        );
+        let caps = Capabilities::from_database(&mut database, "").unwrap();
+        let mut row = cells("AB");
+        row[0].attrs.inverse = true;
+        let mut bytes = Output::default();
+        encode_cells(&mut bytes, &row, &caps.attributes);
+        assert_eq!(bytes.bytes, b"ONAOFFB", "{enter}/{exit}");
+    }
+}
+
+#[test]
+fn native_padded_output_keeps_literal_text_and_scales_clear_screen() {
+    if super::super::terminal_capabilities::tests::run_native_fixture_child() {
+        return;
+    }
+    let mut caps = Capabilities::load("neo-app-padding").unwrap();
+    assert!(caps.ansi && caps.needs_padding);
+    // npc uses a sleep rather than baud-dependent padding bytes.
+    let file = tempfile::tempfile().unwrap();
+    caps.attach(&file).unwrap();
+    let mut output = Vec::new();
+    caps.enter(2).write_to(&mut output, &caps).unwrap();
+    assert_eq!(output, b"CLEAR\x1b[?2004h");
+    output.clear();
+    let mut row = cells("A$<10/>B");
+    row[0].attrs.inverse = true;
+    let mut painter = TerminfoPainter {
+        output: &mut output,
+        caps: &caps,
+        bytes: Output::default(),
+        width: 0,
+        height: 0,
+    };
+    painter.begin(8, 1).unwrap();
+    painter.row(0, &row).unwrap();
+    painter.finish(None).unwrap();
+    assert_eq!(output, b"OFF\x1b[1;1HONAOFF$<10/>B");
+    output.clear();
+    // ANSI cursor spelling with padding still uses the native painter.
+    render_to(&mut TtyRif::new(8, 1), &mut output, &caps).unwrap();
+    assert!(!output.windows(2).any(|pair| pair == b"$<"));
+    output.clear();
+    caps.leave().write_to(&mut output, &caps).unwrap();
+    assert_eq!(output, b"OFF\x1b[?2004l");
+}
+
+#[test]
+fn vt52_output_and_lifecycle_use_native_capabilities() {
+    let mut database = Database(
+        [
+            ("cm", b"\x1bY%p1%' '%+%c%p2%' '%+%c".as_slice()),
+            ("ti", b"ENTER"),
+            ("te", b"LEAVE"),
+            ("ks", b"KEYS"),
+            ("ke", b"NORMAL"),
+        ]
+        .into(),
+    );
+    let caps = Capabilities::from_database(&mut database, "").unwrap();
+    assert!(!caps.ansi);
+    assert_eq!(caps.enter(24).bytes, b"ENTERKEYS");
+    assert_eq!(caps.leave().bytes, b"NORMALLEAVE");
+    let mut output = Vec::new();
+    let mut painter = TerminfoPainter {
+        output: &mut output,
+        caps: &caps,
+        bytes: Output::default(),
+        width: 0,
+        height: 0,
+    };
+    painter.begin(80, 24).unwrap();
+    let cell = TtyCell {
+        ch: 'A',
+        ..TtyCell::default()
+    };
+    painter.row(1, &[cell]).unwrap();
+    painter
+        .finish(Some((1, 2, TerminalCursorShape::Block)))
+        .unwrap();
+    assert_eq!(output, b"\x1bY! A\x1bY!\"");
+}
+#[test]
+fn relative_cursor_entry_is_usable_without_ansi_addressing() {
+    let mut database = Database(
+        [
+            ("ho", b"HOME".as_slice()),
+            ("up", b"U"),
+            ("do", b"D"),
+            ("le", b"L"),
+            ("nd", b"R"),
+        ]
+        .into(),
+    );
+    let caps = Capabilities::from_database(&mut database, "").unwrap();
+    let mut bytes = Output::default();
+    caps.goto(&mut bytes, 2, 3, 80, 24).unwrap();
+    assert_eq!(bytes.bytes, b"HOMEDDRRR");
+    database.0.remove("up");
+    assert!(Capabilities::from_database(&mut database, "").is_err());
+}
+fn paint_bottom(database: &mut Database, cells: &[TtyCell]) -> io::Result<Vec<u8>> {
+    let caps = Capabilities::from_database(database, "").unwrap();
+    let mut output = Vec::new();
+    let mut painter = TerminfoPainter {
+        output: &mut output,
+        caps: &caps,
+        bytes: Output::default(),
+        width: 0,
+        height: 0,
+    };
+    painter.begin(cells.len(), 1)?;
+    painter.row(0, cells)?;
+    painter.finish(None)?;
+    Ok(output)
+}
+fn cells(text: &str) -> Vec<TtyCell> {
+    text.chars()
+        .map(|ch| TtyCell {
+            ch,
+            ..TtyCell::default()
+        })
+        .collect()
+}
+#[test]
+fn bottom_right_uses_insert_or_erase_without_scrolling() {
+    let mut database = Database(
+        [
+            ("cm", b"G%p1%d,%p2%d;".as_slice()),
+            ("am", b""),
+            ("ic", b"I"),
+            ("ip", b"P"),
+            ("ce", b"E"),
+        ]
+        .into(),
+    );
+    assert_eq!(
+        paint_bottom(&mut database, &cells("ABC")).unwrap(),
+        b"G0,0;BCG0,0;IAP"
+    );
+    database.0.remove("ic");
+    assert_eq!(
+        paint_bottom(&mut database, &cells("AB ")).unwrap(),
+        b"G0,0;ABG0,2;E"
+    );
+    assert!(paint_bottom(&mut database, &cells("ABC")).is_err());
+    database.0.insert("im", b"BEGIN");
+    database.0.insert("ei", b"END");
+    assert_eq!(
+        paint_bottom(&mut database, &cells("ABC")).unwrap(),
+        b"ENDG0,0;BCG0,0;BEGINAPEND"
+    );
+    database.0.insert("ic", b"I");
+    assert_eq!(
+        paint_bottom(&mut database, &cells("ABC")).unwrap(),
+        b"ENDG0,0;BCG0,0;BEGINIAPEND"
+    );
+}
+#[test]
+fn bottom_right_inserts_the_full_width_of_a_wide_first_glyph() {
+    let mut database = Database(
+        [
+            ("cm", b"G%p1%d,%p2%d;".as_slice()),
+            ("am", b""),
+            ("IC", b"I%p1%d;"),
+        ]
+        .into(),
+    );
+    let mut row = cells("界 AB");
+    row[1].padding = true;
+    assert_eq!(
+        paint_bottom(&mut database, &row).unwrap(),
+        "G0,0;ABG0,0;I2;界".as_bytes()
+    );
+}
+#[test]
+fn relative_motion_uses_termcap_aliases_and_requires_a_safe_anchor() {
+    let mut database = Database(
+        [
+            ("up", b"U".as_slice()),
+            ("nl", b"D"),
+            ("bc", b"L"),
+            ("nd", b"R"),
+        ]
+        .into(),
+    );
+    let caps = Capabilities::from_database(&mut database, "").unwrap();
+    let mut output = Output::default();
+    caps.goto(&mut output, 1, 1, 2, 2).unwrap();
+    assert_eq!(output.bytes, b"UULLDR");
+    database.0.insert("bs", b"");
+    let caps = Capabilities::from_database(&mut database, "").unwrap();
+    assert_eq!(caps.control("le"), b"\x08");
+    database.0.insert("bw", b"");
+    assert!(Capabilities::from_database(&mut database, "").is_err());
+    database.0.insert("cr", b"C");
+    assert!(Capabilities::from_database(&mut database, "").is_ok());
+}
+#[test]
+fn retry_exits_modes_left_active_by_a_partial_write() {
+    struct PartialWriter {
+        bytes: Vec<u8>,
+        fail: bool,
+    }
+    impl Write for PartialWriter {
+        fn write(&mut self, bytes: &[u8]) -> io::Result<usize> {
+            if self.fail {
+                if let Some(end) = bytes.windows(5).position(|part| part == b"BEGIN") {
+                    self.bytes.extend_from_slice(&bytes[..end + 5]);
+                    return Ok(end + 5);
+                }
+                return Err(io::Error::other("disconnected after entering insert mode"));
+            }
+            self.bytes.extend_from_slice(bytes);
+            Ok(bytes.len())
+        }
+        fn flush(&mut self) -> io::Result<()> {
+            Ok(())
+        }
+    }
+    let mut database = Database(
+        [
+            ("cm", b"G%p1%d,%p2%d;".as_slice()),
+            ("am", b""),
+            ("im", b"BEGIN"),
+            ("ei", b"END"),
+            ("me", b"RESET"),
+        ]
+        .into(),
+    );
+    let caps = Capabilities::from_database(&mut database, "").unwrap();
+    let mut rif = TtyRif::new(3, 1);
+    let mut writer = PartialWriter {
+        bytes: Vec::new(),
+        fail: true,
+    };
+    assert!(paint_to(&mut rif, &mut writer, &caps).is_err());
+    assert!(writer.bytes.ends_with(b"BEGIN"));
+    writer.fail = false;
+    writer.bytes.clear();
+    paint_to(&mut rif, &mut writer, &caps).unwrap();
+    assert!(writer.bytes.starts_with(b"ENDRESETG0,0;"));
+    assert!(writer.bytes.windows(9).any(|part| part == b"BEGIN END"));
+}
+#[test]
+fn missing_terminal_description_is_an_initialization_error() {
+    assert!(Capabilities::load("").is_err());
+    assert!(Capabilities::load("neo-certainly-no-such-terminal-363").is_err());
+}
diff --git a/crates/neomacs/src/tty_output.rs b/crates/neomacs/src/tty_output.rs
index 4c477aae1f..f356dd532e 100644
--- a/crates/neomacs/src/tty_output.rs
+++ b/crates/neomacs/src/tty_output.rs
@@ -473,287 +473,5 @@ pub(crate) fn popup_line(row: usize, col: usize, text: &str) -> io::Result<()> {
 }
 
 #[cfg(all(test, not(windows)))]
-mod tests {
-    use super::*;
-    struct Database(std::collections::BTreeMap<&'static str, &'static [u8]>);
-    impl TerminalCapabilityDatabase for Database {
-        fn get_string(&mut self, cap: StringCapability<'_>) -> Option<Vec<u8>> {
-            match cap {
-                StringCapability::Termcap(name) => self.0.get(name).map(|bytes| bytes.to_vec()),
-                _ => None,
-            }
-        }
-        fn get_termcap_number(&mut self, _: &str) -> Option<i32> {
-            None
-        }
-        fn get_flag(
-            &mut self,
-            cap: super::super::terminal_capabilities::FlagCapability<'_>,
-        ) -> bool {
-            match cap {
-                super::super::terminal_capabilities::FlagCapability::Termcap(name) => {
-                    self.0.contains_key(name)
-                }
-                _ => false,
-            }
-        }
-    }
-    #[test]
-    fn standout_closes_before_plain_text_with_dedicated_or_borrowed_exit() {
-        for (enter, exit) in [("so", "se"), ("us", "ue"), ("so", "me")] {
-            let mut database = Database(
-                [
-                    ("cm", b"G%p1%d,%p2%d;".as_slice()),
-                    (enter, b"ON"),
-                    (exit, b"OFF"),
-                ]
-                .into(),
-            );
-            let caps = Capabilities::from_database(&mut database, "").unwrap();
-            let mut row = cells("AB");
-            row[0].attrs.inverse = true;
-            let mut bytes = Output::default();
-            encode_cells(&mut bytes, &row, &caps.attributes);
-            assert_eq!(bytes.bytes, b"ONAOFFB", "{enter}/{exit}");
-        }
-    }
-
-    #[test]
-    fn native_padded_output_keeps_literal_text_and_scales_clear_screen() {
-        if super::super::terminal_capabilities::tests::run_native_fixture_child() {
-            return;
-        }
-        let mut caps = Capabilities::load("neo-app-padding").unwrap();
-        assert!(caps.ansi && caps.needs_padding);
-        // npc uses a sleep rather than baud-dependent padding bytes.
-        let file = tempfile::tempfile().unwrap();
-        caps.attach(&file).unwrap();
-        let mut output = Vec::new();
-        caps.enter(2).write_to(&mut output, &caps).unwrap();
-        assert_eq!(output, b"CLEAR\x1b[?2004h");
-        output.clear();
-        let mut row = cells("A$<10/>B");
-        row[0].attrs.inverse = true;
-        let mut painter = TerminfoPainter {
-            output: &mut output,
-            caps: &caps,
-            bytes: Output::default(),
-            width: 0,
-            height: 0,
-        };
-        painter.begin(8, 1).unwrap();
-        painter.row(0, &row).unwrap();
-        painter.finish(None).unwrap();
-        assert_eq!(output, b"OFF\x1b[1;1HONAOFF$<10/>B");
-        output.clear();
-        // ANSI cursor spelling with padding still uses the native painter.
-        render_to(&mut TtyRif::new(8, 1), &mut output, &caps).unwrap();
-        assert!(!output.windows(2).any(|pair| pair == b"$<"));
-        output.clear();
-        caps.leave().write_to(&mut output, &caps).unwrap();
-        assert_eq!(output, b"OFF\x1b[?2004l");
-    }
-
-    #[test]
-    fn vt52_output_and_lifecycle_use_native_capabilities() {
-        let mut database = Database(
-            [
-                ("cm", b"\x1bY%p1%' '%+%c%p2%' '%+%c".as_slice()),
-                ("ti", b"ENTER"),
-                ("te", b"LEAVE"),
-                ("ks", b"KEYS"),
-                ("ke", b"NORMAL"),
-            ]
-            .into(),
-        );
-        let caps = Capabilities::from_database(&mut database, "").unwrap();
-        assert!(!caps.ansi);
-        assert_eq!(caps.enter(24).bytes, b"ENTERKEYS");
-        assert_eq!(caps.leave().bytes, b"NORMALLEAVE");
-        let mut output = Vec::new();
-        let mut painter = TerminfoPainter {
-            output: &mut output,
-            caps: &caps,
-            bytes: Output::default(),
-            width: 0,
-            height: 0,
-        };
-        painter.begin(80, 24).unwrap();
-        let cell = TtyCell {
-            ch: 'A',
-            ..TtyCell::default()
-        };
-        painter.row(1, &[cell]).unwrap();
-        painter
-            .finish(Some((1, 2, TerminalCursorShape::Block)))
-            .unwrap();
-        assert_eq!(output, b"\x1bY! A\x1bY!\"");
-    }
-    #[test]
-    fn relative_cursor_entry_is_usable_without_ansi_addressing() {
-        let mut database = Database(
-            [
-                ("ho", b"HOME".as_slice()),
-                ("up", b"U"),
-                ("do", b"D"),
-                ("le", b"L"),
-                ("nd", b"R"),
-            ]
-            .into(),
-        );
-        let caps = Capabilities::from_database(&mut database, "").unwrap();
-        let mut bytes = Output::default();
-        caps.goto(&mut bytes, 2, 3, 80, 24).unwrap();
-        assert_eq!(bytes.bytes, b"HOMEDDRRR");
-        database.0.remove("up");
-        assert!(Capabilities::from_database(&mut database, "").is_err());
-    }
-    fn paint_bottom(database: &mut Database, cells: &[TtyCell]) -> io::Result<Vec<u8>> {
-        let caps = Capabilities::from_database(database, "").unwrap();
-        let mut output = Vec::new();
-        let mut painter = TerminfoPainter {
-            output: &mut output,
-            caps: &caps,
-            bytes: Output::default(),
-            width: 0,
-            height: 0,
-        };
-        painter.begin(cells.len(), 1)?;
-        painter.row(0, cells)?;
-        painter.finish(None)?;
-        Ok(output)
-    }
-    fn cells(text: &str) -> Vec<TtyCell> {
-        text.chars()
-            .map(|ch| TtyCell {
-                ch,
-                ..TtyCell::default()
-            })
-            .collect()
-    }
-    #[test]
-    fn bottom_right_uses_insert_or_erase_without_scrolling() {
-        let mut database = Database(
-            [
-                ("cm", b"G%p1%d,%p2%d;".as_slice()),
-                ("am", b""),
-                ("ic", b"I"),
-                ("ip", b"P"),
-                ("ce", b"E"),
-            ]
-            .into(),
-        );
-        assert_eq!(
-            paint_bottom(&mut database, &cells("ABC")).unwrap(),
-            b"G0,0;BCG0,0;IAP"
-        );
-        database.0.remove("ic");
-        assert_eq!(
-            paint_bottom(&mut database, &cells("AB ")).unwrap(),
-            b"G0,0;ABG0,2;E"
-        );
-        assert!(paint_bottom(&mut database, &cells("ABC")).is_err());
-        database.0.insert("im", b"BEGIN");
-        database.0.insert("ei", b"END");
-        assert_eq!(
-            paint_bottom(&mut database, &cells("ABC")).unwrap(),
-            b"ENDG0,0;BCG0,0;BEGINAPEND"
-        );
-        database.0.insert("ic", b"I");
-        assert_eq!(
-            paint_bottom(&mut database, &cells("ABC")).unwrap(),
-            b"ENDG0,0;BCG0,0;BEGINIAPEND"
-        );
-    }
-    #[test]
-    fn bottom_right_inserts_the_full_width_of_a_wide_first_glyph() {
-        let mut database = Database(
-            [
-                ("cm", b"G%p1%d,%p2%d;".as_slice()),
-                ("am", b""),
-                ("IC", b"I%p1%d;"),
-            ]
-            .into(),
-        );
-        let mut row = cells("界 AB");
-        row[1].padding = true;
-        assert_eq!(
-            paint_bottom(&mut database, &row).unwrap(),
-            "G0,0;ABG0,0;I2;界".as_bytes()
-        );
-    }
-    #[test]
-    fn relative_motion_uses_termcap_aliases_and_requires_a_safe_anchor() {
-        let mut database = Database(
-            [
-                ("up", b"U".as_slice()),
-                ("nl", b"D"),
-                ("bc", b"L"),
-                ("nd", b"R"),
-            ]
-            .into(),
-        );
-        let caps = Capabilities::from_database(&mut database, "").unwrap();
-        let mut output = Output::default();
-        caps.goto(&mut output, 1, 1, 2, 2).unwrap();
-        assert_eq!(output.bytes, b"UULLDR");
-        database.0.insert("bs", b"");
-        let caps = Capabilities::from_database(&mut database, "").unwrap();
-        assert_eq!(caps.control("le"), b"\x08");
-        database.0.insert("bw", b"");
-        assert!(Capabilities::from_database(&mut database, "").is_err());
-        database.0.insert("cr", b"C");
-        assert!(Capabilities::from_database(&mut database, "").is_ok());
-    }
-    #[test]
-    fn retry_exits_modes_left_active_by_a_partial_write() {
-        struct PartialWriter {
-            bytes: Vec<u8>,
-            fail: bool,
-        }
-        impl Write for PartialWriter {
-            fn write(&mut self, bytes: &[u8]) -> io::Result<usize> {
-                if self.fail {
-                    if let Some(end) = bytes.windows(5).position(|part| part == b"BEGIN") {
-                        self.bytes.extend_from_slice(&bytes[..end + 5]);
-                        return Ok(end + 5);
-                    }
-                    return Err(io::Error::other("disconnected after entering insert mode"));
-                }
-                self.bytes.extend_from_slice(bytes);
-                Ok(bytes.len())
-            }
-            fn flush(&mut self) -> io::Result<()> {
-                Ok(())
-            }
-        }
-        let mut database = Database(
-            [
-                ("cm", b"G%p1%d,%p2%d;".as_slice()),
-                ("am", b""),
-                ("im", b"BEGIN"),
-                ("ei", b"END"),
-                ("me", b"RESET"),
-            ]
-            .into(),
-        );
-        let caps = Capabilities::from_database(&mut database, "").unwrap();
-        let mut rif = TtyRif::new(3, 1);
-        let mut writer = PartialWriter {
-            bytes: Vec::new(),
-            fail: true,
-        };
-        assert!(paint_to(&mut rif, &mut writer, &caps).is_err());
-        assert!(writer.bytes.ends_with(b"BEGIN"));
-        writer.fail = false;
-        writer.bytes.clear();
-        paint_to(&mut rif, &mut writer, &caps).unwrap();
-        assert!(writer.bytes.starts_with(b"ENDRESETG0,0;"));
-        assert!(writer.bytes.windows(9).any(|part| part == b"BEGIN END"));
-    }
-    #[test]
-    fn missing_terminal_description_is_an_initialization_error() {
-        assert!(Capabilities::load("").is_err());
-        assert!(Capabilities::load("neo-certainly-no-such-terminal-363").is_err());
-    }
-}
+#[path = "tests/tty_output_test.rs"]
+mod tests;
diff --git a/crates/neovm-core/src/buffer/buffer.rs b/crates/neovm-core/src/buffer/buffer.rs
index 45ac8f731e..5fa9ce983e 100644
--- a/crates/neovm-core/src/buffer/buffer.rs
+++ b/crates/neovm-core/src/buffer/buffer.rs
@@ -7849,4 +7849,5 @@ impl GcTrace for BufferManager {
 // ===========================================================================
 
 #[cfg(test)]
+#[path = "buffer/tests/buffer_test.rs"]
 mod tests;
diff --git a/crates/neovm-core/src/buffer/buffer/tests/mod.rs b/crates/neovm-core/src/buffer/buffer/tests/buffer_test.rs
similarity index 99%
rename from crates/neovm-core/src/buffer/buffer/tests/mod.rs
rename to crates/neovm-core/src/buffer/buffer/tests/buffer_test.rs
index 198b09b712..b6223b154a 100644
--- a/crates/neovm-core/src/buffer/buffer/tests/mod.rs
+++ b/crates/neovm-core/src/buffer/buffer/tests/buffer_test.rs
@@ -4,9 +4,11 @@ use crate::buffer::{CharRange, LispCharPos1};
 use crate::emacs_core::value::ValueKind;
 use crate::heap_types::{LispString, OverlayData};
 
+#[path = "gnu_beg_unchanged_test.rs"]
 mod gnu_beg_unchanged_test;
 
 #[cfg(test)]
+#[path = "shared_overlay_modiff_test.rs"]
 mod shared_overlay_modiff_test;
 
 #[test]
@@ -4004,7 +4006,9 @@ fn buffer_property_overlay_and_symbol_roots_survive_collection_after_edits() {
 }
 
 #[cfg(test)]
+#[path = "transpose_anchor_test.rs"]
 mod transpose_anchor_test;
 
 #[cfg(test)]
+#[path = "foreign_marker_probe_test.rs"]
 mod foreign_marker_probe_test;
diff --git a/crates/neovm-core/src/buffer/buffer_text.rs b/crates/neovm-core/src/buffer/buffer_text.rs
index 47eb644c0f..9f04aebafd 100644
--- a/crates/neovm-core/src/buffer/buffer_text.rs
+++ b/crates/neovm-core/src/buffer/buffer_text.rs
@@ -3710,6 +3710,7 @@ fn scan_backward_bytes(
 }
 
 #[cfg(test)]
+#[path = "buffer_text/tests/buffer_text_test.rs"]
 mod tests;
 
 #[cfg(test)]
diff --git a/crates/neovm-core/src/buffer/buffer_text/tests/mod.rs b/crates/neovm-core/src/buffer/buffer_text/tests/buffer_text_test.rs
similarity index 99%
rename from crates/neovm-core/src/buffer/buffer_text/tests/mod.rs
rename to crates/neovm-core/src/buffer/buffer_text/tests/buffer_text_test.rs
index 6fd0920a37..c556cf6dc8 100644
--- a/crates/neovm-core/src/buffer/buffer_text/tests/mod.rs
+++ b/crates/neovm-core/src/buffer/buffer_text/tests/buffer_text_test.rs
@@ -9,6 +9,7 @@ use crate::emacs_core::value::Value;
 
 use super::BufferText;
 
+#[path = "reverse_scan_test.rs"]
 mod reverse_scan_test;
 
 fn implemented_kind(kind: BufferTextBackendKind) -> ImplementedBufferTextBackendKind {
@@ -1337,7 +1338,9 @@ fn anchor_table_stays_sorted_bounded_and_exact_across_a_front_insert() {
     }
 }
 
+#[path = "cow_snapshot_test.rs"]
 mod cow_snapshot_test;
+#[path = "line_index_test.rs"]
 mod line_index_test;
 
 /// A layout snapshot starts without the syntax parse cache (P3.4 S3, P3.0
diff --git a/crates/neovm-core/src/buffer/edit_transaction.rs b/crates/neovm-core/src/buffer/edit_transaction.rs
index 46031a9bb5..c29d4653d1 100644
--- a/crates/neovm-core/src/buffer/edit_transaction.rs
+++ b/crates/neovm-core/src/buffer/edit_transaction.rs
@@ -2198,5 +2198,5 @@ impl ReplaceSideEffectPolicy {
 mod tests;
 
 #[cfg(test)]
-#[path = "edit_transaction/tests/transpose_gnu.rs"]
+#[path = "edit_transaction/tests/transpose_gnu_test.rs"]
 mod transpose_gnu;
diff --git a/crates/neovm-core/src/buffer/edit_transaction/tests/transpose_gnu.rs b/crates/neovm-core/src/buffer/edit_transaction/tests/transpose_gnu_test.rs
similarity index 100%
rename from crates/neovm-core/src/buffer/edit_transaction/tests/transpose_gnu.rs
rename to crates/neovm-core/src/buffer/edit_transaction/tests/transpose_gnu_test.rs
diff --git a/crates/neovm-core/src/buffer/gap_buffer.rs b/crates/neovm-core/src/buffer/gap_buffer.rs
index 9d88bfce77..deea43c9d2 100644
--- a/crates/neovm-core/src/buffer/gap_buffer.rs
+++ b/crates/neovm-core/src/buffer/gap_buffer.rs
@@ -1315,6 +1315,7 @@ impl fmt::Debug for GapBuffer {
 // ===========================================================================
 
 #[cfg(test)]
+#[path = "gap_buffer/tests/gap_buffer_test.rs"]
 mod tests;
 
 /// Byte offset (from the START of `slice`) of the lead byte that begins the
diff --git a/crates/neovm-core/src/buffer/gap_buffer/tests/mod.rs b/crates/neovm-core/src/buffer/gap_buffer/tests/gap_buffer_test.rs
similarity index 100%
rename from crates/neovm-core/src/buffer/gap_buffer/tests/mod.rs
rename to crates/neovm-core/src/buffer/gap_buffer/tests/gap_buffer_test.rs
diff --git a/crates/neovm-core/src/buffer/overlay.rs b/crates/neovm-core/src/buffer/overlay.rs
index 4e1fc75e48..f1024133dc 100644
--- a/crates/neovm-core/src/buffer/overlay.rs
+++ b/crates/neovm-core/src/buffer/overlay.rs
@@ -2036,6 +2036,7 @@ impl GcTrace for OverlayList {
 }
 
 #[cfg(test)]
+#[path = "overlay/tests/overlay_test.rs"]
 mod tests;
 
 /// Fold a Lisp value into `hasher` by CONTENT, following conses and strings.
diff --git a/crates/neovm-core/src/buffer/overlay/tests/mod.rs b/crates/neovm-core/src/buffer/overlay/tests/overlay_test.rs
similarity index 100%
rename from crates/neovm-core/src/buffer/overlay/tests/mod.rs
rename to crates/neovm-core/src/buffer/overlay/tests/overlay_test.rs
diff --git a/crates/neovm-core/src/buffer/overlay_bplus.rs b/crates/neovm-core/src/buffer/overlay_bplus.rs
index bd186b6e31..23fdfc500d 100644
--- a/crates/neovm-core/src/buffer/overlay_bplus.rs
+++ b/crates/neovm-core/src/buffer/overlay_bplus.rs
@@ -1872,13 +1872,5 @@ where
 }
 
 #[cfg(test)]
-mod traversal_storage_tests {
-    use super::*;
-
-    #[test]
-    fn overlay_traversal_frame_keeps_the_bounded_stack_compact() {
-        // Every query carries nine frames. Node-local indexes need only
-        // represent the node's fixed fanout, not arbitrary buffer positions.
-        assert!(std::mem::size_of::<OrderedTraversalFrame>() <= 16);
-    }
-}
+#[path = "tests/overlay_bplus_traversal_storage_test.rs"]
+mod traversal_storage_tests;
diff --git a/crates/neovm-core/src/buffer/overlay_index.rs b/crates/neovm-core/src/buffer/overlay_index.rs
index 1b239ec2db..df45f1e836 100644
--- a/crates/neovm-core/src/buffer/overlay_index.rs
+++ b/crates/neovm-core/src/buffer/overlay_index.rs
@@ -1693,4 +1693,5 @@ fn ranges_overlap_region(
 }
 
 #[cfg(test)]
+#[path = "overlay_index/tests/overlay_index_test.rs"]
 mod tests;
diff --git a/crates/neovm-core/src/buffer/overlay_index/tests/local_move.rs b/crates/neovm-core/src/buffer/overlay_index/tests/local_move_test.rs
similarity index 100%
rename from crates/neovm-core/src/buffer/overlay_index/tests/local_move.rs
rename to crates/neovm-core/src/buffer/overlay_index/tests/local_move_test.rs
diff --git a/crates/neovm-core/src/buffer/overlay_index/tests/mod.rs b/crates/neovm-core/src/buffer/overlay_index/tests/overlay_index_test.rs
similarity index 99%
rename from crates/neovm-core/src/buffer/overlay_index/tests/mod.rs
rename to crates/neovm-core/src/buffer/overlay_index/tests/overlay_index_test.rs
index afa7eec135..48147f61bc 100644
--- a/crates/neovm-core/src/buffer/overlay_index/tests/mod.rs
+++ b/crates/neovm-core/src/buffer/overlay_index/tests/overlay_index_test.rs
@@ -3,6 +3,7 @@ use crate::buffer::BufferId;
 use crate::heap_types::OverlayData;
 
 #[cfg(test)]
+#[path = "local_move_test.rs"]
 mod local_move;
 
 fn overlay(start: usize, end: usize) -> Value {
diff --git a/crates/neovm-core/src/buffer/overlay_order.rs b/crates/neovm-core/src/buffer/overlay_order.rs
index 71c5becf48..7f26cb3644 100644
--- a/crates/neovm-core/src/buffer/overlay_order.rs
+++ b/crates/neovm-core/src/buffer/overlay_order.rs
@@ -601,4 +601,5 @@ where
 }
 
 #[cfg(test)]
+#[path = "overlay_order/tests/overlay_order_test.rs"]
 mod tests;
diff --git a/crates/neovm-core/src/buffer/overlay_order/tests/mod.rs b/crates/neovm-core/src/buffer/overlay_order/tests/overlay_order_test.rs
similarity index 100%
rename from crates/neovm-core/src/buffer/overlay_order/tests/mod.rs
rename to crates/neovm-core/src/buffer/overlay_order/tests/overlay_order_test.rs
diff --git a/crates/neovm-core/src/buffer/tests/overlay_bplus_traversal_storage_test.rs b/crates/neovm-core/src/buffer/tests/overlay_bplus_traversal_storage_test.rs
new file mode 100644
index 0000000000..c50e82f227
--- /dev/null
+++ b/crates/neovm-core/src/buffer/tests/overlay_bplus_traversal_storage_test.rs
@@ -0,0 +1,8 @@
+use super::*;
+
+#[test]
+fn overlay_traversal_frame_keeps_the_bounded_stack_compact() {
+    // Every query carries nine frames. Node-local indexes need only
+    // represent the node's fixed fanout, not arbitrary buffer positions.
+    assert!(std::mem::size_of::<OrderedTraversalFrame>() <= 16);
+}
diff --git a/crates/neovm-core/src/buffer/text/backend/mod.rs b/crates/neovm-core/src/buffer/text/backend/mod.rs
index e4fd7b94da..8810bb548f 100644
--- a/crates/neovm-core/src/buffer/text/backend/mod.rs
+++ b/crates/neovm-core/src/buffer/text/backend/mod.rs
@@ -1,4 +1,5 @@
 #[cfg(test)]
+#[path = "tests/conformance_test.rs"]
 mod conformance;
 mod contract;
 mod gap;
diff --git a/crates/neovm-core/src/buffer/text/backend/conformance.rs b/crates/neovm-core/src/buffer/text/backend/tests/conformance_test.rs
similarity index 100%
rename from crates/neovm-core/src/buffer/text/backend/conformance.rs
rename to crates/neovm-core/src/buffer/text/backend/tests/conformance_test.rs
diff --git a/crates/neovm-core/src/buffer/text_index.rs b/crates/neovm-core/src/buffer/text_index.rs
index 2121de3d6e..1e4b77a72c 100644
--- a/crates/neovm-core/src/buffer/text_index.rs
+++ b/crates/neovm-core/src/buffer/text_index.rs
@@ -966,5 +966,5 @@ fn cut_chunks(
 }
 
 #[cfg(test)]
-#[path = "text_index/tests/mod.rs"]
+#[path = "text_index/tests/text_index_test.rs"]
 pub(crate) mod tests;
diff --git a/crates/neovm-core/src/buffer/text_index/tests/mod.rs b/crates/neovm-core/src/buffer/text_index/tests/text_index_test.rs
similarity index 100%
rename from crates/neovm-core/src/buffer/text_index/tests/mod.rs
rename to crates/neovm-core/src/buffer/text_index/tests/text_index_test.rs
diff --git a/crates/neovm-core/src/buffer/text_props.rs b/crates/neovm-core/src/buffer/text_props.rs
index f566c7ef8c..bfb35c2c61 100644
--- a/crates/neovm-core/src/buffer/text_props.rs
+++ b/crates/neovm-core/src/buffer/text_props.rs
@@ -5041,4 +5041,5 @@ impl GcTrace for TextPropertyTable {
 // ===========================================================================
 
 #[cfg(test)]
+#[path = "text_props/tests/text_props_test.rs"]
 mod tests;
diff --git a/crates/neovm-core/src/buffer/text_props/tests/source_slice_graft.rs b/crates/neovm-core/src/buffer/text_props/tests/source_slice_graft_test.rs
similarity index 100%
rename from crates/neovm-core/src/buffer/text_props/tests/source_slice_graft.rs
rename to crates/neovm-core/src/buffer/text_props/tests/source_slice_graft_test.rs
diff --git a/crates/neovm-core/src/buffer/text_props/tests/mod.rs b/crates/neovm-core/src/buffer/text_props/tests/text_props_test.rs
similarity index 99%
rename from crates/neovm-core/src/buffer/text_props/tests/mod.rs
rename to crates/neovm-core/src/buffer/text_props/tests/text_props_test.rs
index 966bf24163..3f5f9df8bd 100644
--- a/crates/neovm-core/src/buffer/text_props/tests/mod.rs
+++ b/crates/neovm-core/src/buffer/text_props/tests/text_props_test.rs
@@ -1,12 +1,15 @@
 use super::*;
 
 #[cfg(test)]
+#[path = "source_slice_graft_test.rs"]
 mod source_slice_graft;
 
 #[cfg(test)]
+#[path = "watched_prop_demand_test.rs"]
 mod watched_prop_demand;
 
 #[cfg(test)]
+#[path = "watched_prop_demand_knob_test.rs"]
 mod watched_prop_demand_knob;
 
 fn char_pos(pos: usize) -> CharPos0 {
diff --git a/crates/neovm-core/src/buffer/text_props/tests/watched_prop_demand_knob.rs b/crates/neovm-core/src/buffer/text_props/tests/watched_prop_demand_knob_test.rs
similarity index 100%
rename from crates/neovm-core/src/buffer/text_props/tests/watched_prop_demand_knob.rs
rename to crates/neovm-core/src/buffer/text_props/tests/watched_prop_demand_knob_test.rs
diff --git a/crates/neovm-core/src/buffer/text_props/tests/watched_prop_demand.rs b/crates/neovm-core/src/buffer/text_props/tests/watched_prop_demand_test.rs
similarity index 100%
rename from crates/neovm-core/src/buffer/text_props/tests/watched_prop_demand.rs
rename to crates/neovm-core/src/buffer/text_props/tests/watched_prop_demand_test.rs
diff --git a/crates/neovm-core/src/buffer/undo.rs b/crates/neovm-core/src/buffer/undo.rs
index 70af323bdc..6a3af11a40 100644
--- a/crates/neovm-core/src/buffer/undo.rs
+++ b/crates/neovm-core/src/buffer/undo.rs
@@ -590,4 +590,5 @@ pub fn truncate_undo_list(undo_list: Value, limits: &UndoLimits) -> Value {
 // ===========================================================================
 
 #[cfg(test)]
+#[path = "undo/tests/undo_test.rs"]
 mod tests;
diff --git a/crates/neovm-core/src/buffer/undo/tests/mod.rs b/crates/neovm-core/src/buffer/undo/tests/undo_test.rs
similarity index 100%
rename from crates/neovm-core/src/buffer/undo/tests/mod.rs
rename to crates/neovm-core/src/buffer/undo/tests/undo_test.rs
diff --git a/crates/neovm-core/src/display_evaluation.rs b/crates/neovm-core/src/display_evaluation.rs
index 3c44fe5f57..3d86e0809b 100644
--- a/crates/neovm-core/src/display_evaluation.rs
+++ b/crates/neovm-core/src/display_evaluation.rs
@@ -52,4 +52,5 @@ impl Context {
 }
 
 #[cfg(test)]
+#[path = "display_evaluation/tests/display_evaluation_test.rs"]
 mod tests;
diff --git a/crates/neovm-core/src/display_evaluation/tests/mod.rs b/crates/neovm-core/src/display_evaluation/tests/display_evaluation_test.rs
similarity index 100%
rename from crates/neovm-core/src/display_evaluation/tests/mod.rs
rename to crates/neovm-core/src/display_evaluation/tests/display_evaluation_test.rs
diff --git a/crates/neovm-core/src/emacs_core/commands/abbrev/mod.rs b/crates/neovm-core/src/emacs_core/commands/abbrev/mod.rs
index 330301e335..d10cfc033c 100644
--- a/crates/neovm-core/src/emacs_core/commands/abbrev/mod.rs
+++ b/crates/neovm-core/src/emacs_core/commands/abbrev/mod.rs
@@ -1133,5 +1133,5 @@ pub(crate) fn builtin_insert_abbrev_table_description(
 // Tests
 // ===========================================================================
 #[cfg(test)]
-#[path = "tests/mod.rs"]
+#[path = "tests/abbrev_test.rs"]
 mod tests;
diff --git a/crates/neovm-core/src/emacs_core/commands/abbrev/tests/mod.rs b/crates/neovm-core/src/emacs_core/commands/abbrev/tests/abbrev_test.rs
similarity index 100%
rename from crates/neovm-core/src/emacs_core/commands/abbrev/tests/mod.rs
rename to crates/neovm-core/src/emacs_core/commands/abbrev/tests/abbrev_test.rs
diff --git a/crates/neovm-core/src/emacs_core/commands/interactive/mod.rs b/crates/neovm-core/src/emacs_core/commands/interactive/mod.rs
index 0a6182e7b7..0b42d328f8 100644
--- a/crates/neovm-core/src/emacs_core/commands/interactive/mod.rs
+++ b/crates/neovm-core/src/emacs_core/commands/interactive/mod.rs
@@ -4683,5 +4683,5 @@ fn where_is_binding_prefix_keymap(obarray: &Obarray, binding: &Value) -> Option<
 // Tests
 // ---------------------------------------------------------------------------
 #[cfg(test)]
-#[path = "tests/mod.rs"]
+#[path = "tests/interactive_test.rs"]
 mod tests;
diff --git a/crates/neovm-core/src/emacs_core/commands/interactive/tests/mod.rs b/crates/neovm-core/src/emacs_core/commands/interactive/tests/interactive_test.rs
similarity index 100%
rename from crates/neovm-core/src/emacs_core/commands/interactive/tests/mod.rs
rename to crates/neovm-core/src/emacs_core/commands/interactive/tests/interactive_test.rs
diff --git a/crates/neovm-core/src/emacs_core/commands/kbd/mod.rs b/crates/neovm-core/src/emacs_core/commands/kbd/mod.rs
index 22ac8f7365..9700c0e45b 100644
--- a/crates/neovm-core/src/emacs_core/commands/kbd/mod.rs
+++ b/crates/neovm-core/src/emacs_core/commands/kbd/mod.rs
@@ -535,5 +535,5 @@ fn resolve_control_char(ch: char) -> Option<i64> {
     None
 }
 #[cfg(test)]
-#[path = "tests/mod.rs"]
+#[path = "tests/kbd_test.rs"]
 mod tests;
diff --git a/crates/neovm-core/src/emacs_core/commands/kbd/tests/mod.rs b/crates/neovm-core/src/emacs_core/commands/kbd/tests/kbd_test.rs
similarity index 100%
rename from crates/neovm-core/src/emacs_core/commands/kbd/tests/mod.rs
rename to crates/neovm-core/src/emacs_core/commands/kbd/tests/kbd_test.rs
diff --git a/crates/neovm-core/src/emacs_core/commands/keyboard/mod.rs b/crates/neovm-core/src/emacs_core/commands/keyboard/mod.rs
index 9d46cf2cb1..439cdd063e 100644
--- a/crates/neovm-core/src/emacs_core/commands/keyboard/mod.rs
+++ b/crates/neovm-core/src/emacs_core/commands/keyboard/mod.rs
@@ -10,4 +10,5 @@
 pub mod pure;
 
 #[cfg(test)]
+#[path = "tests/keyboard_test.rs"]
 mod tests;
diff --git a/crates/neovm-core/src/emacs_core/commands/keyboard/pure.rs b/crates/neovm-core/src/emacs_core/commands/keyboard/pure.rs
index df78935718..26d9df1610 100644
--- a/crates/neovm-core/src/emacs_core/commands/keyboard/pure.rs
+++ b/crates/neovm-core/src/emacs_core/commands/keyboard/pure.rs
@@ -702,5 +702,5 @@ pub(crate) fn register_bootstrap_vars(obarray: &mut crate::emacs_core::symbol::O
     obarray.make_special("emulation-mode-map-alists");
 }
 #[cfg(test)]
-#[path = "tests/pure.rs"]
+#[path = "tests/pure_test.rs"]
 mod tests;
diff --git a/crates/neovm-core/src/emacs_core/commands/keyboard/tests/mod.rs b/crates/neovm-core/src/emacs_core/commands/keyboard/tests/keyboard_test.rs
similarity index 100%
rename from crates/neovm-core/src/emacs_core/commands/keyboard/tests/mod.rs
rename to crates/neovm-core/src/emacs_core/commands/keyboard/tests/keyboard_test.rs
diff --git a/crates/neovm-core/src/emacs_core/commands/keyboard/tests/pure.rs b/crates/neovm-core/src/emacs_core/commands/keyboard/tests/pure_test.rs
similarity index 100%
rename from crates/neovm-core/src/emacs_core/commands/keyboard/tests/pure.rs
rename to crates/neovm-core/src/emacs_core/commands/keyboard/tests/pure_test.rs
diff --git a/crates/neovm-core/src/emacs_core/commands/keymap/mod.rs b/crates/neovm-core/src/emacs_core/commands/keymap/mod.rs
index f90a4a8088..bd76a9fab5 100644
--- a/crates/neovm-core/src/emacs_core/commands/keymap/mod.rs
+++ b/crates/neovm-core/src/emacs_core/commands/keymap/mod.rs
@@ -4304,5 +4304,5 @@ pub fn list_keymap_for_each_binding_recursive<F>(
 // Tests
 // ---------------------------------------------------------------------------
 #[cfg(test)]
-#[path = "tests/mod.rs"]
+#[path = "tests/keymap_test.rs"]
 mod tests;
diff --git a/crates/neovm-core/src/emacs_core/commands/keymap/tests/mod.rs b/crates/neovm-core/src/emacs_core/commands/keymap/tests/keymap_test.rs
similarity index 100%
rename from crates/neovm-core/src/emacs_core/commands/keymap/tests/mod.rs
rename to crates/neovm-core/src/emacs_core/commands/keymap/tests/keymap_test.rs
diff --git a/crates/neovm-core/src/emacs_core/commands/kmacro/mod.rs b/crates/neovm-core/src/emacs_core/commands/kmacro/mod.rs
index 2b4eea279e..2b64c86744 100644
--- a/crates/neovm-core/src/emacs_core/commands/kmacro/mod.rs
+++ b/crates/neovm-core/src/emacs_core/commands/kmacro/mod.rs
@@ -461,5 +461,5 @@ fn resolve_macro_events(eval: &super::eval::Context, value: &Value) -> Result<Ve
 // Tests
 // ===========================================================================
 #[cfg(test)]
-#[path = "tests/mod.rs"]
+#[path = "tests/kmacro_test.rs"]
 mod tests;
diff --git a/crates/neovm-core/src/emacs_core/commands/kmacro/tests/mod.rs b/crates/neovm-core/src/emacs_core/commands/kmacro/tests/kmacro_test.rs
similarity index 100%
rename from crates/neovm-core/src/emacs_core/commands/kmacro/tests/mod.rs
rename to crates/neovm-core/src/emacs_core/commands/kmacro/tests/kmacro_test.rs
diff --git a/crates/neovm-core/src/emacs_core/commands/minibuffer/mod.rs b/crates/neovm-core/src/emacs_core/commands/minibuffer/mod.rs
index 7f897ee7e3..47e19c94d9 100644
--- a/crates/neovm-core/src/emacs_core/commands/minibuffer/mod.rs
+++ b/crates/neovm-core/src/emacs_core/commands/minibuffer/mod.rs
@@ -3117,5 +3117,5 @@ pub(crate) fn builtin_flex_cost_gotoh(
 // Tests
 // ---------------------------------------------------------------------------
 #[cfg(test)]
-#[path = "tests/mod.rs"]
+#[path = "tests/minibuffer_test.rs"]
 mod tests;
diff --git a/crates/neovm-core/src/emacs_core/commands/minibuffer/tests/compare_case_table.rs b/crates/neovm-core/src/emacs_core/commands/minibuffer/tests/compare_case_table_test.rs
similarity index 100%
rename from crates/neovm-core/src/emacs_core/commands/minibuffer/tests/compare_case_table.rs
rename to crates/neovm-core/src/emacs_core/commands/minibuffer/tests/compare_case_table_test.rs
diff --git a/crates/neovm-core/src/emacs_core/commands/minibuffer/tests/mod.rs b/crates/neovm-core/src/emacs_core/commands/minibuffer/tests/minibuffer_test.rs
similarity index 99%
rename from crates/neovm-core/src/emacs_core/commands/minibuffer/tests/mod.rs
rename to crates/neovm-core/src/emacs_core/commands/minibuffer/tests/minibuffer_test.rs
index e93ba3481d..b0cfb3eda4 100644
--- a/crates/neovm-core/src/emacs_core/commands/minibuffer/tests/mod.rs
+++ b/crates/neovm-core/src/emacs_core/commands/minibuffer/tests/minibuffer_test.rs
@@ -1993,4 +1993,5 @@ fn test_completion_answers_an_obarray_like_gnu() {
 }
 
 #[cfg(test)]
+#[path = "compare_case_table_test.rs"]
 mod compare_case_table;
diff --git a/crates/neovm-core/src/emacs_core/commands/register/mod.rs b/crates/neovm-core/src/emacs_core/commands/register/mod.rs
index f9daf11299..cec5d113aa 100644
--- a/crates/neovm-core/src/emacs_core/commands/register/mod.rs
+++ b/crates/neovm-core/src/emacs_core/commands/register/mod.rs
@@ -537,5 +537,5 @@ pub(crate) fn builtin_set_register(
 // Tests
 // ===========================================================================
 #[cfg(test)]
-#[path = "tests/mod.rs"]
+#[path = "tests/register_test.rs"]
 mod tests;
diff --git a/crates/neovm-core/src/emacs_core/commands/register/tests/mod.rs b/crates/neovm-core/src/emacs_core/commands/register/tests/register_test.rs
similarity index 100%
rename from crates/neovm-core/src/emacs_core/commands/register/tests/mod.rs
rename to crates/neovm-core/src/emacs_core/commands/register/tests/register_test.rs
diff --git a/crates/neovm-core/src/emacs_core/display/display/mod.rs b/crates/neovm-core/src/emacs_core/display/display/mod.rs
index bf7b52e576..ee332d5ba3 100644
--- a/crates/neovm-core/src/emacs_core/display/display/mod.rs
+++ b/crates/neovm-core/src/emacs_core/display/display/mod.rs
@@ -3251,5 +3251,5 @@ fn make_monitor_alist(frames: Value) -> Value {
     ])
 }
 #[cfg(test)]
-#[path = "tests/mod.rs"]
+#[path = "tests/display_test.rs"]
 mod tests;
diff --git a/crates/neovm-core/src/emacs_core/display/display/tests/mod.rs b/crates/neovm-core/src/emacs_core/display/display/tests/display_test.rs
similarity index 99%
rename from crates/neovm-core/src/emacs_core/display/display/tests/mod.rs
rename to crates/neovm-core/src/emacs_core/display/display/tests/display_test.rs
index ff7ac8be22..a6a4979f84 100644
--- a/crates/neovm-core/src/emacs_core/display/display/tests/mod.rs
+++ b/crates/neovm-core/src/emacs_core/display/display/tests/display_test.rs
@@ -1,10 +1,16 @@
 use crate::emacs_core::error::{FlowKind, FlowResultExt as _};
+#[path = "menu_buttons_test.rs"]
 mod menu_buttons_test;
+#[path = "menu_semantics_test.rs"]
 mod menu_semantics_test;
+#[path = "menu_submenu_test.rs"]
 mod menu_submenu_test;
+#[path = "menu_test_support.rs"]
 mod menu_test_support;
 #[cfg(test)]
+#[path = "popup_idle_redisplay_test.rs"]
 mod popup_idle_redisplay;
+#[path = "resources_test.rs"]
 mod resources_test;
 
 use super::*;
diff --git a/crates/neovm-core/src/emacs_core/display/display/tests/popup_idle_redisplay.rs b/crates/neovm-core/src/emacs_core/display/display/tests/popup_idle_redisplay_test.rs
similarity index 100%
rename from crates/neovm-core/src/emacs_core/display/display/tests/popup_idle_redisplay.rs
rename to crates/neovm-core/src/emacs_core/display/display/tests/popup_idle_redisplay_test.rs
diff --git a/crates/neovm-core/src/emacs_core/display/display_host/mod.rs b/crates/neovm-core/src/emacs_core/display/display_host/mod.rs
index c979255506..a338c82e94 100644
--- a/crates/neovm-core/src/emacs_core/display/display_host/mod.rs
+++ b/crates/neovm-core/src/emacs_core/display/display_host/mod.rs
@@ -715,5 +715,5 @@ pub trait DisplayHost {
 }
 
 #[cfg(test)]
-#[path = "tests/display_host.rs"]
+#[path = "tests/display_host_test.rs"]
 mod tests;
diff --git a/crates/neovm-core/src/emacs_core/display/display_host/tests/display_host.rs b/crates/neovm-core/src/emacs_core/display/display_host/tests/display_host_test.rs
similarity index 100%
rename from crates/neovm-core/src/emacs_core/display/display_host/tests/display_host.rs
rename to crates/neovm-core/src/emacs_core/display/display_host/tests/display_host_test.rs
diff --git a/crates/neovm-core/src/emacs_core/display/display_spec/mod.rs b/crates/neovm-core/src/emacs_core/display/display_spec/mod.rs
index 48296c5ffd..5da07dbddd 100644
--- a/crates/neovm-core/src/emacs_core/display/display_spec/mod.rs
+++ b/crates/neovm-core/src/emacs_core/display/display_spec/mod.rs
@@ -367,5 +367,5 @@ impl DisplayPropertySpecs {
 }
 
 #[cfg(test)]
-#[path = "tests/mod.rs"]
+#[path = "tests/display_spec_test.rs"]
 mod tests;
diff --git a/crates/neovm-core/src/emacs_core/display/display_spec/tests/mod.rs b/crates/neovm-core/src/emacs_core/display/display_spec/tests/display_spec_test.rs
similarity index 100%
rename from crates/neovm-core/src/emacs_core/display/display_spec/tests/mod.rs
rename to crates/neovm-core/src/emacs_core/display/display_spec/tests/display_spec_test.rs
diff --git a/crates/neovm-core/src/emacs_core/display/display_when/mod.rs b/crates/neovm-core/src/emacs_core/display/display_when/mod.rs
index 3d80d5b83a..342ecd34d6 100644
--- a/crates/neovm-core/src/emacs_core/display/display_when/mod.rs
+++ b/crates/neovm-core/src/emacs_core/display/display_when/mod.rs
@@ -242,5 +242,5 @@ impl Context {
 }
 
 #[cfg(test)]
-#[path = "tests/mod.rs"]
+#[path = "tests/display_when_test.rs"]
 mod tests;
diff --git a/crates/neovm-core/src/emacs_core/display/display_when/tests/mod.rs b/crates/neovm-core/src/emacs_core/display/display_when/tests/display_when_test.rs
similarity index 100%
rename from crates/neovm-core/src/emacs_core/display/display_when/tests/mod.rs
rename to crates/neovm-core/src/emacs_core/display/display_when/tests/display_when_test.rs
diff --git a/crates/neovm-core/src/emacs_core/display/dispnew/mod.rs b/crates/neovm-core/src/emacs_core/display/dispnew/mod.rs
index 8472e0433e..0c3cafa9cf 100644
--- a/crates/neovm-core/src/emacs_core/display/dispnew/mod.rs
+++ b/crates/neovm-core/src/emacs_core/display/dispnew/mod.rs
@@ -1,4 +1,5 @@
 pub mod pure;
 
 #[cfg(test)]
+#[path = "tests/dispnew_test.rs"]
 mod tests;
diff --git a/crates/neovm-core/src/emacs_core/display/dispnew/pure.rs b/crates/neovm-core/src/emacs_core/display/dispnew/pure.rs
index 28805082bc..2a648013e8 100644
--- a/crates/neovm-core/src/emacs_core/display/dispnew/pure.rs
+++ b/crates/neovm-core/src/emacs_core/display/dispnew/pure.rs
@@ -319,5 +319,5 @@ pub(crate) fn builtin_frame_z_order_lessp(args: Vec<Value>) -> EvalResult {
 }
 
 #[cfg(test)]
-#[path = "tests/explicit_redraw.rs"]
+#[path = "tests/explicit_redraw_test.rs"]
 mod explicit_redraw_tests;
diff --git a/crates/neovm-core/src/emacs_core/display/dispnew/tests/mod.rs b/crates/neovm-core/src/emacs_core/display/dispnew/tests/dispnew_test.rs
similarity index 99%
rename from crates/neovm-core/src/emacs_core/display/dispnew/tests/mod.rs
rename to crates/neovm-core/src/emacs_core/display/dispnew/tests/dispnew_test.rs
index 9581a0f783..b7bf72bcaa 100644
--- a/crates/neovm-core/src/emacs_core/display/dispnew/tests/mod.rs
+++ b/crates/neovm-core/src/emacs_core/display/dispnew/tests/dispnew_test.rs
@@ -3,6 +3,7 @@ use crate::emacs_core::error::{FlowKind, FlowResultExt as _};
 use crate::emacs_core::value::Value;
 
 #[cfg(test)]
+#[path = "idle_redraw_test.rs"]
 mod idle_redraw;
 
 #[test]
diff --git a/crates/neovm-core/src/emacs_core/display/dispnew/tests/explicit_redraw.rs b/crates/neovm-core/src/emacs_core/display/dispnew/tests/explicit_redraw_test.rs
similarity index 100%
rename from crates/neovm-core/src/emacs_core/display/dispnew/tests/explicit_redraw.rs
rename to crates/neovm-core/src/emacs_core/display/dispnew/tests/explicit_redraw_test.rs
diff --git a/crates/neovm-core/src/emacs_core/display/dispnew/tests/idle_redraw.rs b/crates/neovm-core/src/emacs_core/display/dispnew/tests/idle_redraw_test.rs
similarity index 100%
rename from crates/neovm-core/src/emacs_core/display/dispnew/tests/idle_redraw.rs
rename to crates/neovm-core/src/emacs_core/display/dispnew/tests/idle_redraw_test.rs
diff --git a/crates/neovm-core/src/emacs_core/display/font/mod.rs b/crates/neovm-core/src/emacs_core/display/font/mod.rs
index a03e0241c9..1abf309730 100644
--- a/crates/neovm-core/src/emacs_core/display/font/mod.rs
+++ b/crates/neovm-core/src/emacs_core/display/font/mod.rs
@@ -4153,5 +4153,5 @@ pub(crate) fn font_variation_glyphs(args: Vec<Value>) -> EvalResult {
 // Tests
 // ===========================================================================
 #[cfg(test)]
-#[path = "tests/mod.rs"]
+#[path = "tests/font_test.rs"]
 mod tests;
diff --git a/crates/neovm-core/src/emacs_core/display/font/tests/mod.rs b/crates/neovm-core/src/emacs_core/display/font/tests/font_test.rs
similarity index 99%
rename from crates/neovm-core/src/emacs_core/display/font/tests/mod.rs
rename to crates/neovm-core/src/emacs_core/display/font/tests/font_test.rs
index b33a7b567a..082004fd96 100644
--- a/crates/neovm-core/src/emacs_core/display/font/tests/mod.rs
+++ b/crates/neovm-core/src/emacs_core/display/font/tests/font_test.rs
@@ -1,5 +1,6 @@
 use super::*;
 use crate::emacs_core::error::{FlowKind, FlowRef, FlowResultExt as _};
+#[path = "system_font_test.rs"]
 mod system_font_test;
 use crate::buffer::{Buffer, CharPos0};
 use crate::emacs_core::display_host::{AvailableFontFamilyName, FontResolveRequest, FrameFontSize};
diff --git a/crates/neovm-core/src/emacs_core/display/fontset/mod.rs b/crates/neovm-core/src/emacs_core/display/fontset/mod.rs
index 1feca22929..bbec724f17 100644
--- a/crates/neovm-core/src/emacs_core/display/fontset/mod.rs
+++ b/crates/neovm-core/src/emacs_core/display/fontset/mod.rs
@@ -1368,5 +1368,5 @@ pub fn register_bootstrap_vars(obarray: &mut crate::emacs_core::symbol::Obarray)
 }
 
 #[cfg(test)]
-#[path = "tests/mod.rs"]
+#[path = "tests/fontset_test.rs"]
 mod tests;
diff --git a/crates/neovm-core/src/emacs_core/display/fontset/tests/mod.rs b/crates/neovm-core/src/emacs_core/display/fontset/tests/fontset_test.rs
similarity index 100%
rename from crates/neovm-core/src/emacs_core/display/fontset/tests/mod.rs
rename to crates/neovm-core/src/emacs_core/display/fontset/tests/fontset_test.rs
diff --git a/crates/neovm-core/src/emacs_core/display/frame/mod.rs b/crates/neovm-core/src/emacs_core/display/frame/mod.rs
index 5863172490..dc9afa4a0f 100644
--- a/crates/neovm-core/src/emacs_core/display/frame/mod.rs
+++ b/crates/neovm-core/src/emacs_core/display/frame/mod.rs
@@ -9,7 +9,7 @@ pub(crate) mod position;
 mod selection;
 pub(crate) use selection::{builtin_handle_switch_frame, builtin_select_frame};
 #[cfg(test)]
-#[path = "tests/selection.rs"]
+#[path = "tests/selection_test.rs"]
 mod selection_test;
 use position::{FrameCoordinateOrigin, FramePositionSpec, apply_frame_position};
 
diff --git a/crates/neovm-core/src/emacs_core/display/frame/tests/selection.rs b/crates/neovm-core/src/emacs_core/display/frame/tests/selection_test.rs
similarity index 100%
rename from crates/neovm-core/src/emacs_core/display/frame/tests/selection.rs
rename to crates/neovm-core/src/emacs_core/display/frame/tests/selection_test.rs
diff --git a/crates/neovm-core/src/emacs_core/display/hscroll/mod.rs b/crates/neovm-core/src/emacs_core/display/hscroll/mod.rs
index c89f4878b7..99216a8a8e 100644
--- a/crates/neovm-core/src/emacs_core/display/hscroll/mod.rs
+++ b/crates/neovm-core/src/emacs_core/display/hscroll/mod.rs
@@ -604,5 +604,5 @@ fn window_point_lisp(window: &Window) -> crate::buffer::LispCharPos1 {
 }
 
 #[cfg(test)]
-#[path = "tests/mod.rs"]
+#[path = "tests/hscroll_test.rs"]
 mod tests;
diff --git a/crates/neovm-core/src/emacs_core/display/hscroll/tests/mod.rs b/crates/neovm-core/src/emacs_core/display/hscroll/tests/hscroll_test.rs
similarity index 100%
rename from crates/neovm-core/src/emacs_core/display/hscroll/tests/mod.rs
rename to crates/neovm-core/src/emacs_core/display/hscroll/tests/hscroll_test.rs
diff --git a/crates/neovm-core/src/emacs_core/display/image/mod.rs b/crates/neovm-core/src/emacs_core/display/image/mod.rs
index 8a8486851f..40bb3cf5cf 100644
--- a/crates/neovm-core/src/emacs_core/display/image/mod.rs
+++ b/crates/neovm-core/src/emacs_core/display/image/mod.rs
@@ -1841,7 +1841,7 @@ pub(crate) fn builtin_image_transforms_p(
 // Tests
 // ---------------------------------------------------------------------------
 #[cfg(test)]
-#[path = "tests/mod.rs"]
+#[path = "tests/image_test.rs"]
 mod tests;
 
 impl Context {
diff --git a/crates/neovm-core/src/emacs_core/display/image/tests/mod.rs b/crates/neovm-core/src/emacs_core/display/image/tests/image_test.rs
similarity index 100%
rename from crates/neovm-core/src/emacs_core/display/image/tests/mod.rs
rename to crates/neovm-core/src/emacs_core/display/image/tests/image_test.rs
diff --git a/crates/neovm-core/src/emacs_core/display/image_path/mod.rs b/crates/neovm-core/src/emacs_core/display/image_path/mod.rs
index 83a3b81769..97eefa3db1 100644
--- a/crates/neovm-core/src/emacs_core/display/image_path/mod.rs
+++ b/crates/neovm-core/src/emacs_core/display/image_path/mod.rs
@@ -132,5 +132,5 @@ impl ImageFileRequest {
 }
 
 #[cfg(test)]
-#[path = "tests/mod.rs"]
+#[path = "tests/image_path_test.rs"]
 mod tests;
diff --git a/crates/neovm-core/src/emacs_core/display/image_path/tests/mod.rs b/crates/neovm-core/src/emacs_core/display/image_path/tests/image_path_test.rs
similarity index 100%
rename from crates/neovm-core/src/emacs_core/display/image_path/tests/mod.rs
rename to crates/neovm-core/src/emacs_core/display/image_path/tests/image_path_test.rs
diff --git a/crates/neovm-core/src/emacs_core/display/neo/modifiers.rs b/crates/neovm-core/src/emacs_core/display/neo/modifiers.rs
index 8a42da16ce..fc97655b71 100644
--- a/crates/neovm-core/src/emacs_core/display/neo/modifiers.rs
+++ b/crates/neovm-core/src/emacs_core/display/neo/modifiers.rs
@@ -17,6 +17,7 @@
 
 mod subrs;
 #[cfg(test)]
+#[path = "modifiers/tests/modifiers_test.rs"]
 mod tests;
 #[cfg(test)]
 pub(crate) use subrs::SUBRS;
diff --git a/crates/neovm-core/src/emacs_core/display/neo/modifiers/tests/mod.rs b/crates/neovm-core/src/emacs_core/display/neo/modifiers/tests/modifiers_test.rs
similarity index 100%
rename from crates/neovm-core/src/emacs_core/display/neo/modifiers/tests/mod.rs
rename to crates/neovm-core/src/emacs_core/display/neo/modifiers/tests/modifiers_test.rs
diff --git a/crates/neovm-core/src/emacs_core/display/neo/scroll.rs b/crates/neovm-core/src/emacs_core/display/neo/scroll.rs
index 98c61907bb..69b333247f 100644
--- a/crates/neovm-core/src/emacs_core/display/neo/scroll.rs
+++ b/crates/neovm-core/src/emacs_core/display/neo/scroll.rs
@@ -222,186 +222,5 @@ impl Context {
 }
 
 #[cfg(test)]
-mod tests {
-    use super::*;
-
-    #[test]
-    fn resolved_scroll_observer_sees_complete_commit_and_current_command_only() {
-        let mut eval = Context::new();
-        let buffer = eval.buffer_manager_mut().create_buffer("preview");
-        eval.buffer_manager_mut()
-            .get_mut(buffer)
-            .unwrap()
-            .insert("one\ntwo\nthree\n");
-        let frame = eval
-            .frame_manager_mut()
-            .create_frame("preview", 800, 600, buffer);
-        let window = eval.frame_manager().get(frame).unwrap().selected_window;
-        let calls = std::rc::Rc::new(std::cell::Cell::new(0));
-        let observed = calls.clone();
-        eval.scroll_preview_fn = Some(Box::new(move |eval, frame, window, inputs| {
-            let state = eval
-                .frame_manager()
-                .get(frame)
-                .unwrap()
-                .find_window(window)
-                .unwrap()
-                .redisplay_state()
-                .unwrap();
-            assert_eq!(state.window_start.as_i64(), 5);
-            assert_eq!(state.point.as_i64(), 5);
-            assert_eq!(state.vscroll, -4);
-            assert_eq!(inputs.len(), 1);
-            observed.set(observed.get() + 1);
-        }));
-        let update = || crate::window::WindowScrollUpdate {
-            frame,
-            window,
-            buffer,
-            start: crate::buffer::LispCharPos1::new(5),
-            point: crate::buffer::LispCharPos1::new(5),
-            hidden_top_pixels: 4,
-        };
-        update().commit(&mut eval).unwrap();
-        assert_eq!(calls.get(), 0);
-        let stream = neomacs_display_protocol::input_progress::InputStream::default();
-        let command = eval.input_progress.begin_command();
-        eval.input_progress.consumed(stream.issue().unwrap());
-        update().commit(&mut eval).unwrap();
-        assert_eq!(calls.get(), 1);
-        drop(command);
-        update().commit(&mut eval).unwrap();
-        assert_eq!(calls.get(), 1);
-    }
-
-    #[test]
-    fn compositor_pixel_scroll_policy_requires_definition_and_binding_witnesses() {
-        let mut eval = Context::new();
-        let buffer = eval.buffer_manager_mut().create_buffer("scroll-policy");
-        let frame = eval
-            .frame_manager_mut()
-            .create_frame("scroll-policy", 800, 600, buffer);
-        let window = eval.frame_manager().get(frame).unwrap().selected_window;
-        assert!(!eval.permits_compositor_pixel_scroll(window));
-        eval.eval_str("(use-global-map (make-sparse-keymap)) (setq neomacs-compositor-scrolling t pixel-scroll-precision-mode t)").unwrap();
-        for name in [
-            "pixel-scroll-precision",
-            "pixel-scroll-precision-scroll-down",
-            "pixel-scroll-precision-scroll-down-page",
-            "pixel-scroll-precision-scroll-up",
-            "pixel-scroll-precision-scroll-up-page",
-            "pixel-scroll-precision-interpolate",
-        ] {
-            eval.eval_str(&format!("(fset '{name} (lambda () nil)) (put '{name} 'neomacs--scroll-definition (symbol-function '{name}))")).unwrap();
-        }
-        eval.eval_str("(define-key (current-global-map) [wheel-up] 'pixel-scroll-precision) (define-key (current-global-map) [wheel-down] 'pixel-scroll-precision)").unwrap();
-        assert!(eval.permits_compositor_pixel_scroll(window));
-        let other_buffer = eval
-            .buffer_manager_mut()
-            .create_buffer("other-scroll-policy");
-        let other_window = eval
-            .frame_manager_mut()
-            .split_window(
-                frame,
-                window,
-                crate::window::SplitDirection::Horizontal,
-                other_buffer,
-                None,
-                crate::window::SplitPlacement::AfterTarget,
-            )
-            .unwrap();
-        assert!(eval.compositor_scrolling_enabled(other_window));
-        assert!(!eval.permits_compositor_pixel_scroll(other_window));
-        eval.buffer_manager_mut()
-            .get_mut(other_buffer)
-            .unwrap()
-            .set_buffer_local("neomacs-compositor-scrolling", Value::NIL);
-        assert!(!eval.compositor_scrolling_enabled(other_window));
-        assert!(eval.compositor_scrolling_enabled(window));
-        let publications = std::rc::Rc::new(std::cell::RefCell::new(Vec::new()));
-        let observed = publications.clone();
-        eval.redisplay_fn = Some(Box::new(move |eval| {
-            observed
-                .borrow_mut()
-                .push(eval.permits_compositor_pixel_scroll(window));
-            crate::test_utils::mock_redisplay::accept_all_frames(eval);
-        }));
-        eval.redisplay().expect("redisplay");
-        eval.redisplay().expect("redisplay");
-        assert_eq!(&*publications.borrow(), &[true]);
-        eval.eval_str("(setq neomacs-compositor-scrolling nil)")
-            .unwrap();
-        eval.redisplay().expect("redisplay");
-        assert_eq!(
-            &*publications.borrow(),
-            &[true, false],
-            "policy-only changes must publish revocation"
-        );
-        eval.eval_str("(setq neomacs-compositor-scrolling t)")
-            .unwrap();
-        eval.redisplay().expect("redisplay");
-        assert_eq!(&*publications.borrow(), &[true, false, true]);
-        eval.eval_str("(define-key (current-global-map) [wheel-down] '(menu-item \"scroll\" pixel-scroll-precision :filter ignore))").unwrap();
-        assert!(
-            !eval.permits_compositor_pixel_scroll(window),
-            "menu filters require actual dispatch"
-        );
-        eval.eval_str("(define-key (current-global-map) [wheel-down] 'ignore)")
-            .unwrap();
-        assert!(!eval.permits_compositor_pixel_scroll(window));
-        eval.eval_str("(define-key (current-global-map) [wheel-down] 'pixel-scroll-precision) (setq pre-command-hook '(ignore))").unwrap();
-        assert!(!eval.permits_compositor_pixel_scroll(window));
-        eval.eval_str("(setq pre-command-hook nil)").unwrap();
-        let local = |eval: &mut Context, name: &str, value| {
-            eval.buffer_manager_mut()
-                .get_mut(buffer)
-                .unwrap()
-                .set_buffer_local(name, value);
-        };
-        local(
-            &mut eval,
-            "pre-command-hook",
-            Value::list(vec![Value::symbol("ignore")]),
-        );
-        assert!(
-            !eval.permits_compositor_pixel_scroll(window),
-            "displayed buffer hooks veto prediction"
-        );
-        local(&mut eval, "pre-command-hook", Value::NIL);
-        eval.buffer_manager_mut()
-            .current_buffer_mut()
-            .unwrap()
-            .set_buffer_local(
-                "pre-command-hook",
-                Value::list(vec![Value::symbol("ignore")]),
-            );
-        assert!(
-            eval.permits_compositor_pixel_scroll(window),
-            "timer buffer hooks do not belong to the displayed buffer"
-        );
-        eval.eval_str("(fset 'eldoc-pre-command-refresh-echo-area (lambda () nil)) (put 'eldoc-pre-command-refresh-echo-area 'neomacs--scroll-definition (symbol-function 'eldoc-pre-command-refresh-echo-area))").unwrap();
-        local(
-            &mut eval,
-            "pre-command-hook",
-            Value::list(vec![
-                Value::symbol("eldoc-pre-command-refresh-echo-area"),
-                Value::T,
-            ]),
-        );
-        assert!(eval.permits_compositor_pixel_scroll(window));
-        local(
-            &mut eval,
-            "eldoc-last-message",
-            Value::string("documentation"),
-        );
-        assert!(!eval.permits_compositor_pixel_scroll(window));
-        local(&mut eval, "eldoc-last-message", Value::NIL);
-        eval.eval_str("(fset 'eldoc-pre-command-refresh-echo-area (lambda () t))")
-            .unwrap();
-        assert!(!eval.permits_compositor_pixel_scroll(window));
-        local(&mut eval, "pre-command-hook", Value::NIL);
-        eval.eval_str("(setq pre-command-hook nil) (fset 'pixel-scroll-precision (lambda () t))")
-            .unwrap();
-        assert!(!eval.permits_compositor_pixel_scroll(window));
-    }
-}
+#[path = "tests/scroll_test.rs"]
+mod tests;
diff --git a/crates/neovm-core/src/emacs_core/display/neo/terminal/mod.rs b/crates/neovm-core/src/emacs_core/display/neo/terminal/mod.rs
index a8e207fe19..725979b4ed 100644
--- a/crates/neovm-core/src/emacs_core/display/neo/terminal/mod.rs
+++ b/crates/neovm-core/src/emacs_core/display/neo/terminal/mod.rs
@@ -11,7 +11,7 @@ pub(crate) use subrs::SUBRS;
 pub(crate) use subrs::register_subrs;
 
 #[cfg(test)]
-#[path = "tests/mod.rs"]
+#[path = "tests/terminal_test.rs"]
 mod tests;
 
 use crate::emacs_core::display_host::{
diff --git a/crates/neovm-core/src/emacs_core/display/neo/terminal/tests/mod.rs b/crates/neovm-core/src/emacs_core/display/neo/terminal/tests/terminal_test.rs
similarity index 100%
rename from crates/neovm-core/src/emacs_core/display/neo/terminal/tests/mod.rs
rename to crates/neovm-core/src/emacs_core/display/neo/terminal/tests/terminal_test.rs
diff --git a/crates/neovm-core/src/emacs_core/display/neo/tests/scroll_test.rs b/crates/neovm-core/src/emacs_core/display/neo/tests/scroll_test.rs
new file mode 100644
index 0000000000..b9b98d23f0
--- /dev/null
+++ b/crates/neovm-core/src/emacs_core/display/neo/tests/scroll_test.rs
@@ -0,0 +1,181 @@
+use super::*;
+
+#[test]
+fn resolved_scroll_observer_sees_complete_commit_and_current_command_only() {
+    let mut eval = Context::new();
+    let buffer = eval.buffer_manager_mut().create_buffer("preview");
+    eval.buffer_manager_mut()
+        .get_mut(buffer)
+        .unwrap()
+        .insert("one\ntwo\nthree\n");
+    let frame = eval
+        .frame_manager_mut()
+        .create_frame("preview", 800, 600, buffer);
+    let window = eval.frame_manager().get(frame).unwrap().selected_window;
+    let calls = std::rc::Rc::new(std::cell::Cell::new(0));
+    let observed = calls.clone();
+    eval.scroll_preview_fn = Some(Box::new(move |eval, frame, window, inputs| {
+        let state = eval
+            .frame_manager()
+            .get(frame)
+            .unwrap()
+            .find_window(window)
+            .unwrap()
+            .redisplay_state()
+            .unwrap();
+        assert_eq!(state.window_start.as_i64(), 5);
+        assert_eq!(state.point.as_i64(), 5);
+        assert_eq!(state.vscroll, -4);
+        assert_eq!(inputs.len(), 1);
+        observed.set(observed.get() + 1);
+    }));
+    let update = || crate::window::WindowScrollUpdate {
+        frame,
+        window,
+        buffer,
+        start: crate::buffer::LispCharPos1::new(5),
+        point: crate::buffer::LispCharPos1::new(5),
+        hidden_top_pixels: 4,
+    };
+    update().commit(&mut eval).unwrap();
+    assert_eq!(calls.get(), 0);
+    let stream = neomacs_display_protocol::input_progress::InputStream::default();
+    let command = eval.input_progress.begin_command();
+    eval.input_progress.consumed(stream.issue().unwrap());
+    update().commit(&mut eval).unwrap();
+    assert_eq!(calls.get(), 1);
+    drop(command);
+    update().commit(&mut eval).unwrap();
+    assert_eq!(calls.get(), 1);
+}
+
+#[test]
+fn compositor_pixel_scroll_policy_requires_definition_and_binding_witnesses() {
+    let mut eval = Context::new();
+    let buffer = eval.buffer_manager_mut().create_buffer("scroll-policy");
+    let frame = eval
+        .frame_manager_mut()
+        .create_frame("scroll-policy", 800, 600, buffer);
+    let window = eval.frame_manager().get(frame).unwrap().selected_window;
+    assert!(!eval.permits_compositor_pixel_scroll(window));
+    eval.eval_str("(use-global-map (make-sparse-keymap)) (setq neomacs-compositor-scrolling t pixel-scroll-precision-mode t)").unwrap();
+    for name in [
+        "pixel-scroll-precision",
+        "pixel-scroll-precision-scroll-down",
+        "pixel-scroll-precision-scroll-down-page",
+        "pixel-scroll-precision-scroll-up",
+        "pixel-scroll-precision-scroll-up-page",
+        "pixel-scroll-precision-interpolate",
+    ] {
+        eval.eval_str(&format!("(fset '{name} (lambda () nil)) (put '{name} 'neomacs--scroll-definition (symbol-function '{name}))")).unwrap();
+    }
+    eval.eval_str("(define-key (current-global-map) [wheel-up] 'pixel-scroll-precision) (define-key (current-global-map) [wheel-down] 'pixel-scroll-precision)").unwrap();
+    assert!(eval.permits_compositor_pixel_scroll(window));
+    let other_buffer = eval
+        .buffer_manager_mut()
+        .create_buffer("other-scroll-policy");
+    let other_window = eval
+        .frame_manager_mut()
+        .split_window(
+            frame,
+            window,
+            crate::window::SplitDirection::Horizontal,
+            other_buffer,
+            None,
+            crate::window::SplitPlacement::AfterTarget,
+        )
+        .unwrap();
+    assert!(eval.compositor_scrolling_enabled(other_window));
+    assert!(!eval.permits_compositor_pixel_scroll(other_window));
+    eval.buffer_manager_mut()
+        .get_mut(other_buffer)
+        .unwrap()
+        .set_buffer_local("neomacs-compositor-scrolling", Value::NIL);
+    assert!(!eval.compositor_scrolling_enabled(other_window));
+    assert!(eval.compositor_scrolling_enabled(window));
+    let publications = std::rc::Rc::new(std::cell::RefCell::new(Vec::new()));
+    let observed = publications.clone();
+    eval.redisplay_fn = Some(Box::new(move |eval| {
+        observed
+            .borrow_mut()
+            .push(eval.permits_compositor_pixel_scroll(window));
+        crate::test_utils::mock_redisplay::accept_all_frames(eval);
+    }));
+    eval.redisplay().expect("redisplay");
+    eval.redisplay().expect("redisplay");
+    assert_eq!(&*publications.borrow(), &[true]);
+    eval.eval_str("(setq neomacs-compositor-scrolling nil)")
+        .unwrap();
+    eval.redisplay().expect("redisplay");
+    assert_eq!(
+        &*publications.borrow(),
+        &[true, false],
+        "policy-only changes must publish revocation"
+    );
+    eval.eval_str("(setq neomacs-compositor-scrolling t)")
+        .unwrap();
+    eval.redisplay().expect("redisplay");
+    assert_eq!(&*publications.borrow(), &[true, false, true]);
+    eval.eval_str("(define-key (current-global-map) [wheel-down] '(menu-item \"scroll\" pixel-scroll-precision :filter ignore))").unwrap();
+    assert!(
+        !eval.permits_compositor_pixel_scroll(window),
+        "menu filters require actual dispatch"
+    );
+    eval.eval_str("(define-key (current-global-map) [wheel-down] 'ignore)")
+        .unwrap();
+    assert!(!eval.permits_compositor_pixel_scroll(window));
+    eval.eval_str("(define-key (current-global-map) [wheel-down] 'pixel-scroll-precision) (setq pre-command-hook '(ignore))").unwrap();
+    assert!(!eval.permits_compositor_pixel_scroll(window));
+    eval.eval_str("(setq pre-command-hook nil)").unwrap();
+    let local = |eval: &mut Context, name: &str, value| {
+        eval.buffer_manager_mut()
+            .get_mut(buffer)
+            .unwrap()
+            .set_buffer_local(name, value);
+    };
+    local(
+        &mut eval,
+        "pre-command-hook",
+        Value::list(vec![Value::symbol("ignore")]),
+    );
+    assert!(
+        !eval.permits_compositor_pixel_scroll(window),
+        "displayed buffer hooks veto prediction"
+    );
+    local(&mut eval, "pre-command-hook", Value::NIL);
+    eval.buffer_manager_mut()
+        .current_buffer_mut()
+        .unwrap()
+        .set_buffer_local(
+            "pre-command-hook",
+            Value::list(vec![Value::symbol("ignore")]),
+        );
+    assert!(
+        eval.permits_compositor_pixel_scroll(window),
+        "timer buffer hooks do not belong to the displayed buffer"
+    );
+    eval.eval_str("(fset 'eldoc-pre-command-refresh-echo-area (lambda () nil)) (put 'eldoc-pre-command-refresh-echo-area 'neomacs--scroll-definition (symbol-function 'eldoc-pre-command-refresh-echo-area))").unwrap();
+    local(
+        &mut eval,
+        "pre-command-hook",
+        Value::list(vec![
+            Value::symbol("eldoc-pre-command-refresh-echo-area"),
+            Value::T,
+        ]),
+    );
+    assert!(eval.permits_compositor_pixel_scroll(window));
+    local(
+        &mut eval,
+        "eldoc-last-message",
+        Value::string("documentation"),
+    );
+    assert!(!eval.permits_compositor_pixel_scroll(window));
+    local(&mut eval, "eldoc-last-message", Value::NIL);
+    eval.eval_str("(fset 'eldoc-pre-command-refresh-echo-area (lambda () t))")
+        .unwrap();
+    assert!(!eval.permits_compositor_pixel_scroll(window));
+    local(&mut eval, "pre-command-hook", Value::NIL);
+    eval.eval_str("(setq pre-command-hook nil) (fset 'pixel-scroll-precision (lambda () t))")
+        .unwrap();
+    assert!(!eval.permits_compositor_pixel_scroll(window));
+}
diff --git a/crates/neovm-core/src/emacs_core/display/shader_surface/tests/runtime.rs b/crates/neovm-core/src/emacs_core/display/shader_surface/tests/runtime_test.rs
similarity index 100%
rename from crates/neovm-core/src/emacs_core/display/shader_surface/tests/runtime.rs
rename to crates/neovm-core/src/emacs_core/display/shader_surface/tests/runtime_test.rs
diff --git a/crates/neovm-core/src/emacs_core/display/terminal/mod.rs b/crates/neovm-core/src/emacs_core/display/terminal/mod.rs
index 63507ec763..516e2b1728 100644
--- a/crates/neovm-core/src/emacs_core/display/terminal/mod.rs
+++ b/crates/neovm-core/src/emacs_core/display/terminal/mod.rs
@@ -2,4 +2,5 @@ mod config;
 pub mod pure;
 
 #[cfg(test)]
+#[path = "tests/terminal_test.rs"]
 mod tests;
diff --git a/crates/neovm-core/src/emacs_core/display/terminal/pure.rs b/crates/neovm-core/src/emacs_core/display/terminal/pure.rs
index 57cbbf3d2c..42e6c0bfdc 100644
--- a/crates/neovm-core/src/emacs_core/display/terminal/pure.rs
+++ b/crates/neovm-core/src/emacs_core/display/terminal/pure.rs
@@ -1685,9 +1685,9 @@ pub(crate) fn builtin_delete_terminal(
 }
 
 #[cfg(test)]
-#[path = "tests/gc_context_migration.rs"]
+#[path = "tests/gc_context_migration_test.rs"]
 mod gc_context_migration_tests;
 
 #[cfg(test)]
-#[path = "tests/registry_reinstall.rs"]
+#[path = "tests/registry_reinstall_test.rs"]
 mod registry_reinstall_tests;
diff --git a/crates/neovm-core/src/emacs_core/display/terminal/tests/gc_context_migration.rs b/crates/neovm-core/src/emacs_core/display/terminal/tests/gc_context_migration_test.rs
similarity index 100%
rename from crates/neovm-core/src/emacs_core/display/terminal/tests/gc_context_migration.rs
rename to crates/neovm-core/src/emacs_core/display/terminal/tests/gc_context_migration_test.rs
diff --git a/crates/neovm-core/src/emacs_core/display/terminal/tests/gc_heap_ownership.rs b/crates/neovm-core/src/emacs_core/display/terminal/tests/gc_heap_ownership_test.rs
similarity index 100%
rename from crates/neovm-core/src/emacs_core/display/terminal/tests/gc_heap_ownership.rs
rename to crates/neovm-core/src/emacs_core/display/terminal/tests/gc_heap_ownership_test.rs
diff --git a/crates/neovm-core/src/emacs_core/display/terminal/tests/idle_redisplay.rs b/crates/neovm-core/src/emacs_core/display/terminal/tests/idle_redisplay_test.rs
similarity index 100%
rename from crates/neovm-core/src/emacs_core/display/terminal/tests/idle_redisplay.rs
rename to crates/neovm-core/src/emacs_core/display/terminal/tests/idle_redisplay_test.rs
diff --git a/crates/neovm-core/src/emacs_core/display/terminal/tests/registry_reinstall.rs b/crates/neovm-core/src/emacs_core/display/terminal/tests/registry_reinstall_test.rs
similarity index 100%
rename from crates/neovm-core/src/emacs_core/display/terminal/tests/registry_reinstall.rs
rename to crates/neovm-core/src/emacs_core/display/terminal/tests/registry_reinstall_test.rs
diff --git a/crates/neovm-core/src/emacs_core/display/terminal/tests/mod.rs b/crates/neovm-core/src/emacs_core/display/terminal/tests/terminal_test.rs
similarity index 99%
rename from crates/neovm-core/src/emacs_core/display/terminal/tests/mod.rs
rename to crates/neovm-core/src/emacs_core/display/terminal/tests/terminal_test.rs
index b461680fe1..a2f8f1c2c4 100644
--- a/crates/neovm-core/src/emacs_core/display/terminal/tests/mod.rs
+++ b/crates/neovm-core/src/emacs_core/display/terminal/tests/terminal_test.rs
@@ -6,6 +6,7 @@ use std::cell::RefCell;
 use std::rc::Rc;
 
 #[cfg(test)]
+#[path = "idle_redisplay_test.rs"]
 mod idle_redisplay;
 
 struct RecordingTerminalHost {
@@ -1071,4 +1072,5 @@ fn frame_initial_p(eval: &mut Context, designator: Value) -> Result<Value, Strin
     builtin_frame_initial_p(eval, vec![designator]).map_err(|flow| format!("{flow:?}"))
 }
 
+#[path = "gc_heap_ownership_test.rs"]
 mod gc_heap_ownership;
diff --git a/crates/neovm-core/src/emacs_core/display/video/tests/runtime.rs b/crates/neovm-core/src/emacs_core/display/video/tests/runtime_test.rs
similarity index 100%
rename from crates/neovm-core/src/emacs_core/display/video/tests/runtime.rs
rename to crates/neovm-core/src/emacs_core/display/video/tests/runtime_test.rs
diff --git a/crates/neovm-core/src/emacs_core/display/window_cmds/mod.rs b/crates/neovm-core/src/emacs_core/display/window_cmds/mod.rs
index 2424135282..f0cba54359 100644
--- a/crates/neovm-core/src/emacs_core/display/window_cmds/mod.rs
+++ b/crates/neovm-core/src/emacs_core/display/window_cmds/mod.rs
@@ -8132,8 +8132,9 @@ pub(crate) fn builtin_force_window_update(
 // Tests
 // ===========================================================================
 #[cfg(test)]
+#[path = "tests/window_cmds_test.rs"]
 mod tests;
 
 #[cfg(test)]
-#[path = "tests/selection_chrome.rs"]
+#[path = "tests/selection_chrome_test.rs"]
 mod selection_chrome_tests;
diff --git a/crates/neovm-core/src/emacs_core/display/window_cmds/tests/core_hook_defaults.rs b/crates/neovm-core/src/emacs_core/display/window_cmds/tests/core_hook_defaults_test.rs
similarity index 100%
rename from crates/neovm-core/src/emacs_core/display/window_cmds/tests/core_hook_defaults.rs
rename to crates/neovm-core/src/emacs_core/display/window_cmds/tests/core_hook_defaults_test.rs
diff --git a/crates/neovm-core/src/emacs_core/display/window_cmds/tests/core_hook_restore.rs b/crates/neovm-core/src/emacs_core/display/window_cmds/tests/core_hook_restore_test.rs
similarity index 100%
rename from crates/neovm-core/src/emacs_core/display/window_cmds/tests/core_hook_restore.rs
rename to crates/neovm-core/src/emacs_core/display/window_cmds/tests/core_hook_restore_test.rs
diff --git a/crates/neovm-core/src/emacs_core/display/window_cmds/tests/selection_chrome.rs b/crates/neovm-core/src/emacs_core/display/window_cmds/tests/selection_chrome_test.rs
similarity index 100%
rename from crates/neovm-core/src/emacs_core/display/window_cmds/tests/selection_chrome.rs
rename to crates/neovm-core/src/emacs_core/display/window_cmds/tests/selection_chrome_test.rs
diff --git a/crates/neovm-core/src/emacs_core/display/window_cmds/tests/mod.rs b/crates/neovm-core/src/emacs_core/display/window_cmds/tests/window_cmds_test.rs
similarity index 99%
rename from crates/neovm-core/src/emacs_core/display/window_cmds/tests/mod.rs
rename to crates/neovm-core/src/emacs_core/display/window_cmds/tests/window_cmds_test.rs
index 80a2cdc5ec..fd2e93a9dc 100644
--- a/crates/neovm-core/src/emacs_core/display/window_cmds/tests/mod.rs
+++ b/crates/neovm-core/src/emacs_core/display/window_cmds/tests/window_cmds_test.rs
@@ -15,13 +15,18 @@ use std::rc::Rc;
 use std::time::{Duration, SystemTime, UNIX_EPOCH};
 
 #[cfg(test)]
+#[path = "core_hook_defaults_test.rs"]
 mod core_hook_defaults;
 
 #[cfg(test)]
+#[path = "core_hook_restore_test.rs"]
 mod core_hook_restore;
 
+#[path = "body_geometry_test.rs"]
 mod body_geometry_test;
+#[path = "frame_position_test.rs"]
 mod frame_position_test;
+#[path = "frame_resize_test.rs"]
 mod frame_resize_test;
 
 #[test]
diff --git a/crates/neovm-core/src/emacs_core/display/window_cmds/tests/window_system_preload.rs b/crates/neovm-core/src/emacs_core/display/window_cmds/tests/window_system_preload_test.rs
similarity index 100%
rename from crates/neovm-core/src/emacs_core/display/window_cmds/tests/window_system_preload.rs
rename to crates/neovm-core/src/emacs_core/display/window_cmds/tests/window_system_preload_test.rs
diff --git a/crates/neovm-core/src/emacs_core/display/window_edge_drag/mod.rs b/crates/neovm-core/src/emacs_core/display/window_edge_drag/mod.rs
index a71c423f4d..836fe8610e 100644
--- a/crates/neovm-core/src/emacs_core/display/window_edge_drag/mod.rs
+++ b/crates/neovm-core/src/emacs_core/display/window_edge_drag/mod.rs
@@ -129,5 +129,5 @@ impl crate::emacs_core::Context {
 }
 
 #[cfg(test)]
-#[path = "tests/mod.rs"]
+#[path = "tests/window_edge_drag_test.rs"]
 mod tests;
diff --git a/crates/neovm-core/src/emacs_core/display/window_edge_drag/tests/mod.rs b/crates/neovm-core/src/emacs_core/display/window_edge_drag/tests/window_edge_drag_test.rs
similarity index 100%
rename from crates/neovm-core/src/emacs_core/display/window_edge_drag/tests/mod.rs
rename to crates/neovm-core/src/emacs_core/display/window_edge_drag/tests/window_edge_drag_test.rs
diff --git a/crates/neovm-core/src/emacs_core/display/xdisp/mod.rs b/crates/neovm-core/src/emacs_core/display/xdisp/mod.rs
index d39dac00a1..dcfd2e6ade 100644
--- a/crates/neovm-core/src/emacs_core/display/xdisp/mod.rs
+++ b/crates/neovm-core/src/emacs_core/display/xdisp/mod.rs
@@ -747,17 +747,8 @@ impl RowEdge {
 }
 
 #[cfg(test)]
-mod row_edge_tests {
-    use super::*;
-
-    #[test]
-    fn tty_row_edge_reserves_one_column_for_the_edge_glyph() {
-        assert_eq!(RowEdge::tty(80, 9.0, LineWrap::Truncate).x, 711.0);
-        assert_eq!(RowEdge::tty(80, 9.0, LineWrap::WindowWrap).x, 711.0);
-        // A one-column body cannot go below one usable column.
-        assert_eq!(RowEdge::tty(1, 9.0, LineWrap::Truncate).x, 9.0);
-    }
-}
+#[path = "tests/xdisp_row_edge_test.rs"]
+mod row_edge_tests;
 
 impl LineWrap {
     /// Whether a display line is a whole logical line.
@@ -9989,33 +9980,33 @@ pub(crate) fn builtin_buffer_text_pixel_size(
 }
 
 #[cfg(test)]
-#[path = "tests/mod.rs"]
+#[path = "tests/xdisp_test.rs"]
 mod tests;
 
 #[cfg(test)]
-#[path = "tests/mode_line_gc_roots.rs"]
+#[path = "tests/mode_line_gc_roots_test.rs"]
 mod mode_line_gc_roots;
 
 #[cfg(test)]
-#[path = "tests/mode_line_multibyte_identity.rs"]
+#[path = "tests/mode_line_multibyte_identity_test.rs"]
 mod mode_line_multibyte_identity;
 
 #[cfg(test)]
-#[path = "tests/mode_line_incremental_roots.rs"]
+#[path = "tests/mode_line_incremental_roots_test.rs"]
 mod mode_line_incremental_roots;
 
 #[cfg(test)]
-#[path = "tests/mode_line_live_spine.rs"]
+#[path = "tests/mode_line_live_spine_test.rs"]
 mod mode_line_live_spine;
 
 #[cfg(test)]
-#[path = "tests/mode_line_flow.rs"]
+#[path = "tests/mode_line_flow_test.rs"]
 mod mode_line_flow;
 
 #[cfg(test)]
-#[path = "tests/mode_line_outer_flow.rs"]
+#[path = "tests/mode_line_outer_flow_test.rs"]
 mod mode_line_outer_flow;
 
 #[cfg(test)]
-#[path = "tests/mode_line_outer_handlers.rs"]
+#[path = "tests/mode_line_outer_handlers_test.rs"]
 mod mode_line_outer_handlers;
diff --git a/crates/neovm-core/src/emacs_core/display/xdisp/mode_line_numeric_padding.rs b/crates/neovm-core/src/emacs_core/display/xdisp/mode_line_numeric_padding.rs
index 8c148d6b0d..c503c33e15 100644
--- a/crates/neovm-core/src/emacs_core/display/xdisp/mode_line_numeric_padding.rs
+++ b/crates/neovm-core/src/emacs_core/display/xdisp/mode_line_numeric_padding.rs
@@ -111,5 +111,5 @@ impl PaddingRanges {
 }
 
 #[cfg(test)]
-#[path = "tests/numeric_padding_default_policy.rs"]
+#[path = "tests/numeric_padding_default_policy_test.rs"]
 mod numeric_padding_default_policy_tests;
diff --git a/crates/neovm-core/src/emacs_core/display/xdisp/motion/mod.rs b/crates/neovm-core/src/emacs_core/display/xdisp/motion/mod.rs
index bf651b5742..25a1e9ddc0 100644
--- a/crates/neovm-core/src/emacs_core/display/xdisp/motion/mod.rs
+++ b/crates/neovm-core/src/emacs_core/display/xdisp/motion/mod.rs
@@ -546,5 +546,5 @@ fn vertical_motion_on_rows(
 }
 
 #[cfg(test)]
-#[path = "tests/mod.rs"]
+#[path = "tests/motion_test.rs"]
 mod tests;
diff --git a/crates/neovm-core/src/emacs_core/display/xdisp/motion/tests/mod.rs b/crates/neovm-core/src/emacs_core/display/xdisp/motion/tests/motion_test.rs
similarity index 100%
rename from crates/neovm-core/src/emacs_core/display/xdisp/motion/tests/mod.rs
rename to crates/neovm-core/src/emacs_core/display/xdisp/motion/tests/motion_test.rs
diff --git a/crates/neovm-core/src/emacs_core/display/xdisp/tests/mode_line_flow.rs b/crates/neovm-core/src/emacs_core/display/xdisp/tests/mode_line_flow_test.rs
similarity index 100%
rename from crates/neovm-core/src/emacs_core/display/xdisp/tests/mode_line_flow.rs
rename to crates/neovm-core/src/emacs_core/display/xdisp/tests/mode_line_flow_test.rs
diff --git a/crates/neovm-core/src/emacs_core/display/xdisp/tests/mode_line_gc_roots.rs b/crates/neovm-core/src/emacs_core/display/xdisp/tests/mode_line_gc_roots_test.rs
similarity index 100%
rename from crates/neovm-core/src/emacs_core/display/xdisp/tests/mode_line_gc_roots.rs
rename to crates/neovm-core/src/emacs_core/display/xdisp/tests/mode_line_gc_roots_test.rs
diff --git a/crates/neovm-core/src/emacs_core/display/xdisp/tests/mode_line_incremental_lifetimes.rs b/crates/neovm-core/src/emacs_core/display/xdisp/tests/mode_line_incremental_lifetimes_test.rs
similarity index 100%
rename from crates/neovm-core/src/emacs_core/display/xdisp/tests/mode_line_incremental_lifetimes.rs
rename to crates/neovm-core/src/emacs_core/display/xdisp/tests/mode_line_incremental_lifetimes_test.rs
diff --git a/crates/neovm-core/src/emacs_core/display/xdisp/tests/mode_line_incremental_roots.rs b/crates/neovm-core/src/emacs_core/display/xdisp/tests/mode_line_incremental_roots_test.rs
similarity index 100%
rename from crates/neovm-core/src/emacs_core/display/xdisp/tests/mode_line_incremental_roots.rs
rename to crates/neovm-core/src/emacs_core/display/xdisp/tests/mode_line_incremental_roots_test.rs
diff --git a/crates/neovm-core/src/emacs_core/display/xdisp/tests/mode_line_live_spine.rs b/crates/neovm-core/src/emacs_core/display/xdisp/tests/mode_line_live_spine_test.rs
similarity index 100%
rename from crates/neovm-core/src/emacs_core/display/xdisp/tests/mode_line_live_spine.rs
rename to crates/neovm-core/src/emacs_core/display/xdisp/tests/mode_line_live_spine_test.rs
diff --git a/crates/neovm-core/src/emacs_core/display/xdisp/tests/mode_line_multibyte_identity.rs b/crates/neovm-core/src/emacs_core/display/xdisp/tests/mode_line_multibyte_identity_test.rs
similarity index 100%
rename from crates/neovm-core/src/emacs_core/display/xdisp/tests/mode_line_multibyte_identity.rs
rename to crates/neovm-core/src/emacs_core/display/xdisp/tests/mode_line_multibyte_identity_test.rs
diff --git a/crates/neovm-core/src/emacs_core/display/xdisp/tests/mode_line_outer_flow.rs b/crates/neovm-core/src/emacs_core/display/xdisp/tests/mode_line_outer_flow_test.rs
similarity index 100%
rename from crates/neovm-core/src/emacs_core/display/xdisp/tests/mode_line_outer_flow.rs
rename to crates/neovm-core/src/emacs_core/display/xdisp/tests/mode_line_outer_flow_test.rs
diff --git a/crates/neovm-core/src/emacs_core/display/xdisp/tests/mode_line_outer_handlers.rs b/crates/neovm-core/src/emacs_core/display/xdisp/tests/mode_line_outer_handlers_test.rs
similarity index 100%
rename from crates/neovm-core/src/emacs_core/display/xdisp/tests/mode_line_outer_handlers.rs
rename to crates/neovm-core/src/emacs_core/display/xdisp/tests/mode_line_outer_handlers_test.rs
diff --git a/crates/neovm-core/src/emacs_core/display/xdisp/tests/numeric_padding_default_policy.rs b/crates/neovm-core/src/emacs_core/display/xdisp/tests/numeric_padding_default_policy_test.rs
similarity index 100%
rename from crates/neovm-core/src/emacs_core/display/xdisp/tests/numeric_padding_default_policy.rs
rename to crates/neovm-core/src/emacs_core/display/xdisp/tests/numeric_padding_default_policy_test.rs
diff --git a/crates/neovm-core/src/emacs_core/display/xdisp/tests/xdisp_row_edge_test.rs b/crates/neovm-core/src/emacs_core/display/xdisp/tests/xdisp_row_edge_test.rs
new file mode 100644
index 0000000000..b1c3d9b939
--- /dev/null
+++ b/crates/neovm-core/src/emacs_core/display/xdisp/tests/xdisp_row_edge_test.rs
@@ -0,0 +1,9 @@
+use super::*;
+
+#[test]
+fn tty_row_edge_reserves_one_column_for_the_edge_glyph() {
+    assert_eq!(RowEdge::tty(80, 9.0, LineWrap::Truncate).x, 711.0);
+    assert_eq!(RowEdge::tty(80, 9.0, LineWrap::WindowWrap).x, 711.0);
+    // A one-column body cannot go below one usable column.
+    assert_eq!(RowEdge::tty(1, 9.0, LineWrap::Truncate).x, 9.0);
+}
diff --git a/crates/neovm-core/src/emacs_core/display/xdisp/tests/mod.rs b/crates/neovm-core/src/emacs_core/display/xdisp/tests/xdisp_test.rs
similarity index 99%
rename from crates/neovm-core/src/emacs_core/display/xdisp/tests/mod.rs
rename to crates/neovm-core/src/emacs_core/display/xdisp/tests/xdisp_test.rs
index 13318e4e4c..420ec2a2d7 100644
--- a/crates/neovm-core/src/emacs_core/display/xdisp/tests/mod.rs
+++ b/crates/neovm-core/src/emacs_core/display/xdisp/tests/xdisp_test.rs
@@ -15,27 +15,35 @@ use crate::emacs_core::value::{
 };
 use malachite::Integer;
 
+#[path = "approx_window_text_test.rs"]
 mod approx_window_text_test;
 
 #[cfg(test)]
+#[path = "mode_line_prop_borrow_test.rs"]
 mod mode_line_prop_borrow_test;
 
 #[cfg(test)]
+#[path = "mode_line_plain_field_test.rs"]
 mod mode_line_plain_field_test;
 
 #[cfg(test)]
+#[path = "mode_line_numeric_padding_test.rs"]
 mod mode_line_numeric_padding_test;
 
 #[cfg(test)]
+#[path = "mode_line_incremental_lifetimes_test.rs"]
 mod mode_line_incremental_lifetimes;
 
 #[cfg(test)]
+#[path = "posn_extent_fixture_test.rs"]
 mod posn_extent_fixture_test;
 
 #[cfg(test)]
+#[path = "posn_boundary_anchor_test.rs"]
 mod posn_boundary_anchor_test;
 
 #[cfg(test)]
+#[path = "posn_frame_pool_test.rs"]
 mod posn_frame_pool_test;
 use posn_extent_fixture_test::{PosnExtentFixtureGuard, install_accepted_tty_fixture_rows};
 
@@ -7645,4 +7653,5 @@ fn window_text_pixel_size_reports_gnus_negative_width_for_a_retracted_from_row()
 }
 
 #[cfg(test)]
+#[path = "mode_line_min_width_boundary_test.rs"]
 mod mode_line_min_width_boundary_test;
diff --git a/crates/neovm-core/src/emacs_core/display/xfaces/mod.rs b/crates/neovm-core/src/emacs_core/display/xfaces/mod.rs
index fdb611a42b..5e5c689496 100644
--- a/crates/neovm-core/src/emacs_core/display/xfaces/mod.rs
+++ b/crates/neovm-core/src/emacs_core/display/xfaces/mod.rs
@@ -4808,11 +4808,11 @@ pub(crate) fn builtin_x_load_color_file(args: Vec<Value>) -> EvalResult {
 }
 
 #[cfg(test)]
-#[path = "tests/mod.rs"]
+#[path = "tests/xfaces_test.rs"]
 mod tests;
 
 #[cfg(test)]
-#[path = "tests/builtins.rs"]
+#[path = "tests/builtins_test.rs"]
 mod builtins_test;
 
 #[cfg(test)]
@@ -4824,5 +4824,5 @@ mod font_size_test;
 mod font_remapping_test;
 
 #[cfg(test)]
-#[path = "tests/gc_tls_ownership.rs"]
+#[path = "tests/gc_tls_ownership_test.rs"]
 mod gc_tls_ownership_tests;
diff --git a/crates/neovm-core/src/emacs_core/display/xfaces/tests/builtins.rs b/crates/neovm-core/src/emacs_core/display/xfaces/tests/builtins_test.rs
similarity index 100%
rename from crates/neovm-core/src/emacs_core/display/xfaces/tests/builtins.rs
rename to crates/neovm-core/src/emacs_core/display/xfaces/tests/builtins_test.rs
diff --git a/crates/neovm-core/src/emacs_core/display/xfaces/tests/gc_tls_ownership.rs b/crates/neovm-core/src/emacs_core/display/xfaces/tests/gc_tls_ownership_test.rs
similarity index 100%
rename from crates/neovm-core/src/emacs_core/display/xfaces/tests/gc_tls_ownership.rs
rename to crates/neovm-core/src/emacs_core/display/xfaces/tests/gc_tls_ownership_test.rs
diff --git a/crates/neovm-core/src/emacs_core/display/xfaces/tests/mod.rs b/crates/neovm-core/src/emacs_core/display/xfaces/tests/xfaces_test.rs
similarity index 100%
rename from crates/neovm-core/src/emacs_core/display/xfaces/tests/mod.rs
rename to crates/neovm-core/src/emacs_core/display/xfaces/tests/xfaces_test.rs
diff --git a/crates/neovm-core/src/emacs_core/display/xwidget/tests/runtime.rs b/crates/neovm-core/src/emacs_core/display/xwidget/tests/runtime_test.rs
similarity index 100%
rename from crates/neovm-core/src/emacs_core/display/xwidget/tests/runtime.rs
rename to crates/neovm-core/src/emacs_core/display/xwidget/tests/runtime_test.rs
diff --git a/crates/neovm-core/src/emacs_core/editing/bookmark/mod.rs b/crates/neovm-core/src/emacs_core/editing/bookmark/mod.rs
index 67a73702d1..d1389ba86b 100644
--- a/crates/neovm-core/src/emacs_core/editing/bookmark/mod.rs
+++ b/crates/neovm-core/src/emacs_core/editing/bookmark/mod.rs
@@ -922,5 +922,5 @@ pub(crate) fn builtin_bookmark_load(
 // Tests
 // ===========================================================================
 #[cfg(test)]
-#[path = "tests/mod.rs"]
+#[path = "tests/bookmark_test.rs"]
 mod tests;
diff --git a/crates/neovm-core/src/emacs_core/editing/bookmark/tests/mod.rs b/crates/neovm-core/src/emacs_core/editing/bookmark/tests/bookmark_test.rs
similarity index 100%
rename from crates/neovm-core/src/emacs_core/editing/bookmark/tests/mod.rs
rename to crates/neovm-core/src/emacs_core/editing/bookmark/tests/bookmark_test.rs
diff --git a/crates/neovm-core/src/emacs_core/editing/buffer/mod.rs b/crates/neovm-core/src/emacs_core/editing/buffer/mod.rs
index b1e99c22d6..d3a039631c 100644
--- a/crates/neovm-core/src/emacs_core/editing/buffer/mod.rs
+++ b/crates/neovm-core/src/emacs_core/editing/buffer/mod.rs
@@ -5793,5 +5793,5 @@ pub(crate) fn builtin_overlay_properties_in_buffers(
 }
 
 #[cfg(test)]
-#[path = "tests/mod.rs"]
+#[path = "tests/buffer_test.rs"]
 mod tests;
diff --git a/crates/neovm-core/src/emacs_core/editing/buffer/tests/mod.rs b/crates/neovm-core/src/emacs_core/editing/buffer/tests/buffer_test.rs
similarity index 99%
rename from crates/neovm-core/src/emacs_core/editing/buffer/tests/mod.rs
rename to crates/neovm-core/src/emacs_core/editing/buffer/tests/buffer_test.rs
index 4db9539998..3dd3d59da8 100644
--- a/crates/neovm-core/src/emacs_core/editing/buffer/tests/mod.rs
+++ b/crates/neovm-core/src/emacs_core/editing/buffer/tests/buffer_test.rs
@@ -2,6 +2,7 @@ use crate::emacs_core::format_eval_result;
 use crate::emacs_core::value::Value;
 
 #[cfg(test)]
+#[path = "set_buffer_multibyte_gnu_test.rs"]
 mod set_buffer_multibyte_gnu;
 
 /// GNU `Fget_truename_buffer` (src/buffer.c:524-539) returns the live buffer
@@ -422,4 +423,5 @@ fn every_insert_door_reads_the_string_after_the_change_hook_like_gnu() {
 }
 
 #[cfg(test)]
+#[path = "gdn_primitives_test.rs"]
 mod gdn_primitives;
diff --git a/crates/neovm-core/src/emacs_core/editing/buffer/tests/gdn_primitives.rs b/crates/neovm-core/src/emacs_core/editing/buffer/tests/gdn_primitives_test.rs
similarity index 100%
rename from crates/neovm-core/src/emacs_core/editing/buffer/tests/gdn_primitives.rs
rename to crates/neovm-core/src/emacs_core/editing/buffer/tests/gdn_primitives_test.rs
diff --git a/crates/neovm-core/src/emacs_core/editing/buffer/tests/set_buffer_multibyte_gnu.rs b/crates/neovm-core/src/emacs_core/editing/buffer/tests/set_buffer_multibyte_gnu_test.rs
similarity index 100%
rename from crates/neovm-core/src/emacs_core/editing/buffer/tests/set_buffer_multibyte_gnu.rs
rename to crates/neovm-core/src/emacs_core/editing/buffer/tests/set_buffer_multibyte_gnu_test.rs
diff --git a/crates/neovm-core/src/emacs_core/editing/dired/mod.rs b/crates/neovm-core/src/emacs_core/editing/dired/mod.rs
index f8b300399c..5f0eaaef05 100644
--- a/crates/neovm-core/src/emacs_core/editing/dired/mod.rs
+++ b/crates/neovm-core/src/emacs_core/editing/dired/mod.rs
@@ -1605,5 +1605,5 @@ pub fn register_bootstrap_vars(obarray: &mut crate::emacs_core::symbol::Obarray)
 // ---------------------------------------------------------------------------
 
 #[cfg(test)]
-#[path = "tests/mod.rs"]
+#[path = "tests/dired_test.rs"]
 mod tests;
diff --git a/crates/neovm-core/src/emacs_core/editing/dired/tests/compare_case_table.rs b/crates/neovm-core/src/emacs_core/editing/dired/tests/compare_case_table_test.rs
similarity index 100%
rename from crates/neovm-core/src/emacs_core/editing/dired/tests/compare_case_table.rs
rename to crates/neovm-core/src/emacs_core/editing/dired/tests/compare_case_table_test.rs
diff --git a/crates/neovm-core/src/emacs_core/editing/dired/tests/mod.rs b/crates/neovm-core/src/emacs_core/editing/dired/tests/dired_test.rs
similarity index 99%
rename from crates/neovm-core/src/emacs_core/editing/dired/tests/mod.rs
rename to crates/neovm-core/src/emacs_core/editing/dired/tests/dired_test.rs
index 4acdeb004d..be8617e9e4 100644
--- a/crates/neovm-core/src/emacs_core/editing/dired/tests/mod.rs
+++ b/crates/neovm-core/src/emacs_core/editing/dired/tests/dired_test.rs
@@ -1392,4 +1392,5 @@ fn file_attributes_resolves_names_only_for_the_string_id_format_like_gnu() {
 }
 
 #[cfg(test)]
+#[path = "compare_case_table_test.rs"]
 mod compare_case_table;
diff --git a/crates/neovm-core/src/emacs_core/editing/editfns/mod.rs b/crates/neovm-core/src/emacs_core/editing/editfns/mod.rs
index 2ef01b82a5..0b7224ecd0 100644
--- a/crates/neovm-core/src/emacs_core/editing/editfns/mod.rs
+++ b/crates/neovm-core/src/emacs_core/editing/editfns/mod.rs
@@ -2377,5 +2377,5 @@ pub(crate) fn builtin_translate_region_internal(
 }
 
 #[cfg(test)]
-#[path = "tests/mod.rs"]
+#[path = "tests/editfns_test.rs"]
 mod tests;
diff --git a/crates/neovm-core/src/emacs_core/editing/editfns/tests/mod.rs b/crates/neovm-core/src/emacs_core/editing/editfns/tests/editfns_test.rs
similarity index 100%
rename from crates/neovm-core/src/emacs_core/editing/editfns/tests/mod.rs
rename to crates/neovm-core/src/emacs_core/editing/editfns/tests/editfns_test.rs
diff --git a/crates/neovm-core/src/emacs_core/editing/indent/mod.rs b/crates/neovm-core/src/emacs_core/editing/indent/mod.rs
index 6604f1ec87..c41779a0cd 100644
--- a/crates/neovm-core/src/emacs_core/editing/indent/mod.rs
+++ b/crates/neovm-core/src/emacs_core/editing/indent/mod.rs
@@ -2733,5 +2733,5 @@ pub(crate) fn line_number_display_width(
 }
 
 #[cfg(test)]
-#[path = "tests/mod.rs"]
+#[path = "tests/indent_test.rs"]
 mod tests;
diff --git a/crates/neovm-core/src/emacs_core/editing/indent/tests/mod.rs b/crates/neovm-core/src/emacs_core/editing/indent/tests/indent_test.rs
similarity index 100%
rename from crates/neovm-core/src/emacs_core/editing/indent/tests/mod.rs
rename to crates/neovm-core/src/emacs_core/editing/indent/tests/indent_test.rs
diff --git a/crates/neovm-core/src/emacs_core/editing/marker/mod.rs b/crates/neovm-core/src/emacs_core/editing/marker/mod.rs
index 9fb92c0f74..75f4336aff 100644
--- a/crates/neovm-core/src/emacs_core/editing/marker/mod.rs
+++ b/crates/neovm-core/src/emacs_core/editing/marker/mod.rs
@@ -962,5 +962,5 @@ pub(crate) fn builtin_mark_marker(eval: &mut super::eval::Context, args: Vec<Val
 // Tests
 // ---------------------------------------------------------------------------
 #[cfg(test)]
-#[path = "tests/mod.rs"]
+#[path = "tests/marker_test.rs"]
 mod tests;
diff --git a/crates/neovm-core/src/emacs_core/editing/marker/tests/mod.rs b/crates/neovm-core/src/emacs_core/editing/marker/tests/marker_test.rs
similarity index 100%
rename from crates/neovm-core/src/emacs_core/editing/marker/tests/mod.rs
rename to crates/neovm-core/src/emacs_core/editing/marker/tests/marker_test.rs
diff --git a/crates/neovm-core/src/emacs_core/editing/mode/mod.rs b/crates/neovm-core/src/emacs_core/editing/mode/mod.rs
index 60e3b075da..47d8bc8e5a 100644
--- a/crates/neovm-core/src/emacs_core/editing/mode/mod.rs
+++ b/crates/neovm-core/src/emacs_core/editing/mode/mod.rs
@@ -817,9 +817,9 @@ impl GcTrace for ModeRegistry {
 // Tests
 // ---------------------------------------------------------------------------
 #[cfg(test)]
-#[path = "tests/mod.rs"]
+#[path = "tests/mode_test.rs"]
 mod tests;
 
 #[cfg(test)]
-#[path = "tests/custom_type_gc.rs"]
+#[path = "tests/custom_type_gc_test.rs"]
 mod custom_type_gc;
diff --git a/crates/neovm-core/src/emacs_core/editing/mode/tests/custom_type_gc.rs b/crates/neovm-core/src/emacs_core/editing/mode/tests/custom_type_gc_test.rs
similarity index 100%
rename from crates/neovm-core/src/emacs_core/editing/mode/tests/custom_type_gc.rs
rename to crates/neovm-core/src/emacs_core/editing/mode/tests/custom_type_gc_test.rs
diff --git a/crates/neovm-core/src/emacs_core/editing/mode/tests/mod.rs b/crates/neovm-core/src/emacs_core/editing/mode/tests/mode_test.rs
similarity index 100%
rename from crates/neovm-core/src/emacs_core/editing/mode/tests/mod.rs
rename to crates/neovm-core/src/emacs_core/editing/mode/tests/mode_test.rs
diff --git a/crates/neovm-core/src/emacs_core/editing/navigation/mod.rs b/crates/neovm-core/src/emacs_core/editing/navigation/mod.rs
index 86585b94c9..b5516fb089 100644
--- a/crates/neovm-core/src/emacs_core/editing/navigation/mod.rs
+++ b/crates/neovm-core/src/emacs_core/editing/navigation/mod.rs
@@ -1487,5 +1487,5 @@ pub(crate) fn builtin_region_end(eval: &mut super::eval::Context, args: Vec<Valu
 // Tests
 // ===========================================================================
 #[cfg(test)]
-#[path = "tests/mod.rs"]
+#[path = "tests/navigation_test.rs"]
 mod tests;
diff --git a/crates/neovm-core/src/emacs_core/editing/navigation/tests/line_index.rs b/crates/neovm-core/src/emacs_core/editing/navigation/tests/line_index_test.rs
similarity index 100%
rename from crates/neovm-core/src/emacs_core/editing/navigation/tests/line_index.rs
rename to crates/neovm-core/src/emacs_core/editing/navigation/tests/line_index_test.rs
diff --git a/crates/neovm-core/src/emacs_core/editing/navigation/tests/mod.rs b/crates/neovm-core/src/emacs_core/editing/navigation/tests/navigation_test.rs
similarity index 99%
rename from crates/neovm-core/src/emacs_core/editing/navigation/tests/mod.rs
rename to crates/neovm-core/src/emacs_core/editing/navigation/tests/navigation_test.rs
index e1654e2f1c..8066ac1c97 100644
--- a/crates/neovm-core/src/emacs_core/editing/navigation/tests/mod.rs
+++ b/crates/neovm-core/src/emacs_core/editing/navigation/tests/navigation_test.rs
@@ -1157,5 +1157,7 @@ fn test_forward_char_honors_narrowing_beginning() {
     assert_eq!(pos, 3);
 }
 
+#[path = "line_index_test.rs"]
 mod line_index;
+#[path = "selective_display_gnu_test.rs"]
 mod selective_display_gnu;
diff --git a/crates/neovm-core/src/emacs_core/editing/navigation/tests/selective_display_gnu.rs b/crates/neovm-core/src/emacs_core/editing/navigation/tests/selective_display_gnu_test.rs
similarity index 100%
rename from crates/neovm-core/src/emacs_core/editing/navigation/tests/selective_display_gnu.rs
rename to crates/neovm-core/src/emacs_core/editing/navigation/tests/selective_display_gnu_test.rs
diff --git a/crates/neovm-core/src/emacs_core/editing/rect/mod.rs b/crates/neovm-core/src/emacs_core/editing/rect/mod.rs
index b245c4d8a7..90ce01fcf9 100644
--- a/crates/neovm-core/src/emacs_core/editing/rect/mod.rs
+++ b/crates/neovm-core/src/emacs_core/editing/rect/mod.rs
@@ -269,5 +269,5 @@ pub(crate) fn builtin_extract_rectangle_line(args: Vec<Value>) -> EvalResult {
 // Tests
 // ---------------------------------------------------------------------------
 #[cfg(test)]
-#[path = "tests/mod.rs"]
+#[path = "tests/rect_test.rs"]
 mod tests;
diff --git a/crates/neovm-core/src/emacs_core/editing/rect/tests/mod.rs b/crates/neovm-core/src/emacs_core/editing/rect/tests/rect_test.rs
similarity index 100%
rename from crates/neovm-core/src/emacs_core/editing/rect/tests/mod.rs
rename to crates/neovm-core/src/emacs_core/editing/rect/tests/rect_test.rs
diff --git a/crates/neovm-core/src/emacs_core/editing/undo/mod.rs b/crates/neovm-core/src/emacs_core/editing/undo/mod.rs
index efd05f79ee..464f20b794 100644
--- a/crates/neovm-core/src/emacs_core/editing/undo/mod.rs
+++ b/crates/neovm-core/src/emacs_core/editing/undo/mod.rs
@@ -247,5 +247,5 @@ pub(crate) fn set_last_boundary_cause_explicit(ctx: &mut super::eval::Context) -
 // Tests
 // ---------------------------------------------------------------------------
 #[cfg(test)]
-#[path = "tests/mod.rs"]
+#[path = "tests/undo_test.rs"]
 mod tests;
diff --git a/crates/neovm-core/src/emacs_core/editing/undo/tests/kill_ring.rs b/crates/neovm-core/src/emacs_core/editing/undo/tests/kill_ring_test.rs
similarity index 100%
rename from crates/neovm-core/src/emacs_core/editing/undo/tests/kill_ring.rs
rename to crates/neovm-core/src/emacs_core/editing/undo/tests/kill_ring_test.rs
diff --git a/crates/neovm-core/src/emacs_core/editing/undo/tests/mod.rs b/crates/neovm-core/src/emacs_core/editing/undo/tests/undo_test.rs
similarity index 100%
rename from crates/neovm-core/src/emacs_core/editing/undo/tests/mod.rs
rename to crates/neovm-core/src/emacs_core/editing/undo/tests/undo_test.rs
diff --git a/crates/neovm-core/src/emacs_core/lisp/advice/mod.rs b/crates/neovm-core/src/emacs_core/lisp/advice/mod.rs
index eec873b328..c666227f47 100644
--- a/crates/neovm-core/src/emacs_core/lisp/advice/mod.rs
+++ b/crates/neovm-core/src/emacs_core/lisp/advice/mod.rs
@@ -248,5 +248,5 @@ pub(crate) fn builtin_get_variable_watchers(
 // Tests
 // ---------------------------------------------------------------------------
 #[cfg(test)]
-#[path = "tests/mod.rs"]
+#[path = "tests/advice_test.rs"]
 mod tests;
diff --git a/crates/neovm-core/src/emacs_core/lisp/advice/tests/mod.rs b/crates/neovm-core/src/emacs_core/lisp/advice/tests/advice_test.rs
similarity index 100%
rename from crates/neovm-core/src/emacs_core/lisp/advice/tests/mod.rs
rename to crates/neovm-core/src/emacs_core/lisp/advice/tests/advice_test.rs
diff --git a/crates/neovm-core/src/emacs_core/lisp/autoload/mod.rs b/crates/neovm-core/src/emacs_core/lisp/autoload/mod.rs
index ac1b279879..bbd49a4a85 100644
--- a/crates/neovm-core/src/emacs_core/lisp/autoload/mod.rs
+++ b/crates/neovm-core/src/emacs_core/lisp/autoload/mod.rs
@@ -741,5 +741,5 @@ impl GcTrace for AutoloadManager {
 // Tests
 // ---------------------------------------------------------------------------
 #[cfg(test)]
-#[path = "tests/mod.rs"]
+#[path = "tests/autoload_test.rs"]
 mod tests;
diff --git a/crates/neovm-core/src/emacs_core/lisp/autoload/tests/mod.rs b/crates/neovm-core/src/emacs_core/lisp/autoload/tests/autoload_test.rs
similarity index 100%
rename from crates/neovm-core/src/emacs_core/lisp/autoload/tests/mod.rs
rename to crates/neovm-core/src/emacs_core/lisp/autoload/tests/autoload_test.rs
diff --git a/crates/neovm-core/src/emacs_core/lisp/cl_lib/mod.rs b/crates/neovm-core/src/emacs_core/lisp/cl_lib/mod.rs
index 4d0ab9c812..69719d7e07 100644
--- a/crates/neovm-core/src/emacs_core/lisp/cl_lib/mod.rs
+++ b/crates/neovm-core/src/emacs_core/lisp/cl_lib/mod.rs
@@ -1235,5 +1235,5 @@ pub(crate) fn builtin_seq_every_p(eval: &mut super::eval::Context, args: Vec<Val
 // Tests
 // ===========================================================================
 #[cfg(test)]
-#[path = "tests/mod.rs"]
+#[path = "tests/cl_lib_test.rs"]
 mod tests;
diff --git a/crates/neovm-core/src/emacs_core/lisp/cl_lib/tests/mod.rs b/crates/neovm-core/src/emacs_core/lisp/cl_lib/tests/cl_lib_test.rs
similarity index 100%
rename from crates/neovm-core/src/emacs_core/lisp/cl_lib/tests/mod.rs
rename to crates/neovm-core/src/emacs_core/lisp/cl_lib/tests/cl_lib_test.rs
diff --git a/crates/neovm-core/src/emacs_core/lisp/custom/mod.rs b/crates/neovm-core/src/emacs_core/lisp/custom/mod.rs
index 1154dc5f0b..ab75bc448a 100644
--- a/crates/neovm-core/src/emacs_core/lisp/custom/mod.rs
+++ b/crates/neovm-core/src/emacs_core/lisp/custom/mod.rs
@@ -667,5 +667,5 @@ pub(crate) fn builtin_kill_local_variable_impl(
 // Tests
 // ---------------------------------------------------------------------------
 #[cfg(test)]
-#[path = "tests/mod.rs"]
+#[path = "tests/custom_test.rs"]
 mod tests;
diff --git a/crates/neovm-core/src/emacs_core/lisp/custom/tests/mod.rs b/crates/neovm-core/src/emacs_core/lisp/custom/tests/custom_test.rs
similarity index 100%
rename from crates/neovm-core/src/emacs_core/lisp/custom/tests/mod.rs
rename to crates/neovm-core/src/emacs_core/lisp/custom/tests/custom_test.rs
diff --git a/crates/neovm-core/src/emacs_core/lisp/doc/mod.rs b/crates/neovm-core/src/emacs_core/lisp/doc/mod.rs
index 7683392d3c..4d2dd10a06 100644
--- a/crates/neovm-core/src/emacs_core/lisp/doc/mod.rs
+++ b/crates/neovm-core/src/emacs_core/lisp/doc/mod.rs
@@ -954,5 +954,5 @@ pub(crate) fn builtin_snarf_documentation(
 // Tests
 // ---------------------------------------------------------------------------
 #[cfg(test)]
-#[path = "tests/mod.rs"]
+#[path = "tests/doc_test.rs"]
 mod tests;
diff --git a/crates/neovm-core/src/emacs_core/lisp/doc/tests/mod.rs b/crates/neovm-core/src/emacs_core/lisp/doc/tests/doc_test.rs
similarity index 100%
rename from crates/neovm-core/src/emacs_core/lisp/doc/tests/mod.rs
rename to crates/neovm-core/src/emacs_core/lisp/doc/tests/doc_test.rs
diff --git a/crates/neovm-core/src/emacs_core/lisp/load/mod.rs b/crates/neovm-core/src/emacs_core/lisp/load/mod.rs
index 9f9e5a6a04..b06048f0b7 100644
--- a/crates/neovm-core/src/emacs_core/lisp/load/mod.rs
+++ b/crates/neovm-core/src/emacs_core/lisp/load/mod.rs
@@ -6807,8 +6807,8 @@ pub(crate) fn expand_tilde(path: &str) -> String {
 }
 
 #[cfg(test)]
-#[path = "tests/eager_failure.rs"]
+#[path = "tests/eager_failure_test.rs"]
 mod eager_failure_tests;
 #[cfg(test)]
-#[path = "tests/mod.rs"]
+#[path = "tests/load_test.rs"]
 mod tests;
diff --git a/crates/neovm-core/src/emacs_core/lisp/load/tests/eager_failure.rs b/crates/neovm-core/src/emacs_core/lisp/load/tests/eager_failure_test.rs
similarity index 100%
rename from crates/neovm-core/src/emacs_core/lisp/load/tests/eager_failure.rs
rename to crates/neovm-core/src/emacs_core/lisp/load/tests/eager_failure_test.rs
diff --git a/crates/neovm-core/src/emacs_core/lisp/load/tests/mod.rs b/crates/neovm-core/src/emacs_core/lisp/load/tests/load_test.rs
similarity index 100%
rename from crates/neovm-core/src/emacs_core/lisp/load/tests/mod.rs
rename to crates/neovm-core/src/emacs_core/lisp/load/tests/load_test.rs
diff --git a/crates/neovm-core/src/emacs_core/lisp/load/tests/stale_bytecode.rs b/crates/neovm-core/src/emacs_core/lisp/load/tests/stale_bytecode_test.rs
similarity index 100%
rename from crates/neovm-core/src/emacs_core/lisp/load/tests/stale_bytecode.rs
rename to crates/neovm-core/src/emacs_core/lisp/load/tests/stale_bytecode_test.rs
diff --git a/crates/neovm-core/src/emacs_core/lisp/lread/mod.rs b/crates/neovm-core/src/emacs_core/lisp/lread/mod.rs
index 1f956e5ed3..c0d4d09755 100644
--- a/crates/neovm-core/src/emacs_core/lisp/lread/mod.rs
+++ b/crates/neovm-core/src/emacs_core/lisp/lread/mod.rs
@@ -1489,5 +1489,5 @@ fn integer_access_predicate_matches(candidate: &LispString, mask: i64) -> bool {
 // Tests
 // ---------------------------------------------------------------------------
 #[cfg(test)]
-#[path = "tests/mod.rs"]
+#[path = "tests/lread_test.rs"]
 mod tests;
diff --git a/crates/neovm-core/src/emacs_core/lisp/lread/tests/mod.rs b/crates/neovm-core/src/emacs_core/lisp/lread/tests/lread_test.rs
similarity index 100%
rename from crates/neovm-core/src/emacs_core/lisp/lread/tests/mod.rs
rename to crates/neovm-core/src/emacs_core/lisp/lread/tests/lread_test.rs
diff --git a/crates/neovm-core/src/emacs_core/lisp/native/builtins/arithmetic.rs b/crates/neovm-core/src/emacs_core/lisp/native/builtins/arithmetic.rs
index 3320692c90..5cafa819a2 100644
--- a/crates/neovm-core/src/emacs_core/lisp/native/builtins/arithmetic.rs
+++ b/crates/neovm-core/src/emacs_core/lisp/native/builtins/arithmetic.rs
@@ -2525,33 +2525,33 @@ pub(crate) fn builtin_isnan(args: Vec<Value>) -> EvalResult {
 }
 
 #[cfg(test)]
-#[path = "tests/arithmetic_minmax_compare.rs"]
+#[path = "tests/arithmetic_minmax_compare_test.rs"]
 mod arithmetic_minmax_compare_test;
 
 #[cfg(test)]
-#[path = "tests/arithmetic_rounding_nil_divisor.rs"]
+#[path = "tests/arithmetic_rounding_nil_divisor_test.rs"]
 mod arithmetic_rounding_nil_divisor_test;
 
 #[cfg(test)]
-#[path = "tests/arithmetic_ash_overflow.rs"]
+#[path = "tests/arithmetic_ash_overflow_test.rs"]
 mod arithmetic_ash_overflow_test;
 
 #[cfg(test)]
-#[path = "tests/arithmetic_bignum_borrowed.rs"]
+#[path = "tests/arithmetic_bignum_borrowed_test.rs"]
 mod arithmetic_bignum_borrowed_test;
 
 #[cfg(test)]
-#[path = "tests/arithmetic_rounding_float_exact.rs"]
+#[path = "tests/arithmetic_rounding_float_exact_test.rs"]
 mod arithmetic_rounding_float_exact_test;
 
 #[cfg(test)]
-#[path = "tests/arithmetic_limb_kernels.rs"]
+#[path = "tests/arithmetic_limb_kernels_test.rs"]
 mod arithmetic_limb_kernels_test;
 
 #[cfg(test)]
-#[path = "tests/arithmetic_integer_value.rs"]
+#[path = "tests/arithmetic_integer_value_test.rs"]
 mod arithmetic_integer_value_test;
 
 #[cfg(test)]
-#[path = "tests/arithmetic_rounding_capture.rs"]
+#[path = "tests/arithmetic_rounding_capture_test.rs"]
 mod arithmetic_rounding_capture_test;
diff --git a/crates/neovm-core/src/emacs_core/lisp/native/builtins/collections.rs b/crates/neovm-core/src/emacs_core/lisp/native/builtins/collections.rs
index bd2a58aeb6..fed641d0ae 100644
--- a/crates/neovm-core/src/emacs_core/lisp/native/builtins/collections.rs
+++ b/crates/neovm-core/src/emacs_core/lisp/native/builtins/collections.rs
@@ -1639,9 +1639,9 @@ pub(crate) fn plist_member_eq_swp(args: Vec<Value>, symbols_with_pos_enabled: bo
 }
 
 #[cfg(test)]
-#[path = "tests/aset_string_in_place.rs"]
+#[path = "tests/aset_string_in_place_test.rs"]
 mod aset_string_in_place_test;
 
 #[cfg(test)]
-#[path = "tests/gc_tls_collections.rs"]
+#[path = "tests/gc_tls_collections_test.rs"]
 mod gc_tls_ownership_tests;
diff --git a/crates/neovm-core/src/emacs_core/lisp/native/builtins/cons_list.rs b/crates/neovm-core/src/emacs_core/lisp/native/builtins/cons_list.rs
index 2666c1c5a4..97a2cc8f28 100644
--- a/crates/neovm-core/src/emacs_core/lisp/native/builtins/cons_list.rs
+++ b/crates/neovm-core/src/emacs_core/lisp/native/builtins/cons_list.rs
@@ -1908,7 +1908,7 @@ fn copy_list_sequence_scan<const OBSERVED: bool>(arg: Value) -> EvalResult {
 }
 
 #[cfg(test)]
-#[path = "tests/copy_sequence_capture.rs"]
+#[path = "tests/copy_sequence_capture_test.rs"]
 mod copy_sequence_capture;
 
 // ===========================================================================
@@ -2248,9 +2248,9 @@ fn builtin_nconc_slice_values_scan<const OBSERVED: bool>(args: &[Value]) -> Eval
 // ===========================================================================
 
 #[cfg(test)]
-#[path = "tests/collection_scan_capture.rs"]
+#[path = "tests/collection_scan_capture_test.rs"]
 mod collection_scan_capture;
 
 #[cfg(test)]
-#[path = "tests/gdn_equality.rs"]
+#[path = "tests/gdn_equality_test.rs"]
 mod gdn_equality;
diff --git a/crates/neovm-core/src/emacs_core/lisp/native/builtins/file_notify/delivery.rs b/crates/neovm-core/src/emacs_core/lisp/native/builtins/file_notify/delivery.rs
index a8c9d3be03..132c9780fb 100644
--- a/crates/neovm-core/src/emacs_core/lisp/native/builtins/file_notify/delivery.rs
+++ b/crates/neovm-core/src/emacs_core/lisp/native/builtins/file_notify/delivery.rs
@@ -267,5 +267,5 @@ fn merge_ordered<T, Control>(
 }
 
 #[cfg(test)]
-#[path = "tests/delivery.rs"]
+#[path = "tests/delivery_test.rs"]
 mod tests;
diff --git a/crates/neovm-core/src/emacs_core/lisp/native/builtins/file_notify/mod.rs b/crates/neovm-core/src/emacs_core/lisp/native/builtins/file_notify/mod.rs
index 61abba87ef..67c270d610 100644
--- a/crates/neovm-core/src/emacs_core/lisp/native/builtins/file_notify/mod.rs
+++ b/crates/neovm-core/src/emacs_core/lisp/native/builtins/file_notify/mod.rs
@@ -43,14 +43,14 @@ std::cfg_select! {
 }
 
 #[cfg(all(test, target_os = "linux"))]
-#[path = "tests/linux.rs"]
+#[path = "tests/linux_test.rs"]
 mod linux_test;
 
 #[cfg(all(
     test,
     any(target_os = "linux", target_os = "macos", target_os = "windows")
 ))]
-#[path = "tests/native_runtime.rs"]
+#[path = "tests/native_runtime_test.rs"]
 mod native_runtime_test;
 
 thread_local! {
@@ -144,9 +144,9 @@ pub(crate) fn drain_file_notify_events(
 }
 
 #[cfg(test)]
-#[path = "tests/mod.rs"]
+#[path = "tests/file_notify_test.rs"]
 mod tests;
 
 #[cfg(test)]
-#[path = "tests/gc_tls_ownership.rs"]
+#[path = "tests/gc_tls_ownership_test.rs"]
 mod gc_tls_ownership_tests;
diff --git a/crates/neovm-core/src/emacs_core/lisp/native/builtins/file_notify/model.rs b/crates/neovm-core/src/emacs_core/lisp/native/builtins/file_notify/model.rs
index 2ab0931112..c281524dad 100644
--- a/crates/neovm-core/src/emacs_core/lisp/native/builtins/file_notify/model.rs
+++ b/crates/neovm-core/src/emacs_core/lisp/native/builtins/file_notify/model.rs
@@ -289,5 +289,5 @@ pub(super) trait Backend {
 }
 
 #[cfg(test)]
-#[path = "tests/model.rs"]
+#[path = "tests/model_test.rs"]
 mod tests;
diff --git a/crates/neovm-core/src/emacs_core/lisp/native/builtins/file_notify/platform/linux/mod.rs b/crates/neovm-core/src/emacs_core/lisp/native/builtins/file_notify/platform/linux/mod.rs
index ff508b32f3..98070d69d4 100644
--- a/crates/neovm-core/src/emacs_core/lisp/native/builtins/file_notify/platform/linux/mod.rs
+++ b/crates/neovm-core/src/emacs_core/lisp/native/builtins/file_notify/platform/linux/mod.rs
@@ -23,7 +23,7 @@ mod worker;
 pub(crate) use lisp::{inotify_add_watch, inotify_rm_watch, inotify_valid_p};
 
 #[cfg(test)]
-#[path = "tests/linux.rs"]
+#[path = "tests/linux_test.rs"]
 mod linux_test;
 
 use worker::{NativeEvent, Worker, WorkerControl};
diff --git a/crates/neovm-core/src/emacs_core/lisp/native/builtins/file_notify/platform/linux/tests/linux.rs b/crates/neovm-core/src/emacs_core/lisp/native/builtins/file_notify/platform/linux/tests/linux_test.rs
similarity index 100%
rename from crates/neovm-core/src/emacs_core/lisp/native/builtins/file_notify/platform/linux/tests/linux.rs
rename to crates/neovm-core/src/emacs_core/lisp/native/builtins/file_notify/platform/linux/tests/linux_test.rs
diff --git a/crates/neovm-core/src/emacs_core/lisp/native/builtins/file_notify/platform/linux/tests/worker.rs b/crates/neovm-core/src/emacs_core/lisp/native/builtins/file_notify/platform/linux/tests/worker_test.rs
similarity index 100%
rename from crates/neovm-core/src/emacs_core/lisp/native/builtins/file_notify/platform/linux/tests/worker.rs
rename to crates/neovm-core/src/emacs_core/lisp/native/builtins/file_notify/platform/linux/tests/worker_test.rs
diff --git a/crates/neovm-core/src/emacs_core/lisp/native/builtins/file_notify/platform/linux/worker.rs b/crates/neovm-core/src/emacs_core/lisp/native/builtins/file_notify/platform/linux/worker.rs
index c13f2c3c9e..a942035636 100644
--- a/crates/neovm-core/src/emacs_core/lisp/native/builtins/file_notify/platform/linux/worker.rs
+++ b/crates/neovm-core/src/emacs_core/lisp/native/builtins/file_notify/platform/linux/worker.rs
@@ -24,7 +24,7 @@ use std::thread::JoinHandle;
 const INOTIFY_KEY: usize = 1;
 
 #[cfg(test)]
-#[path = "tests/worker.rs"]
+#[path = "tests/worker_test.rs"]
 mod worker_test;
 
 #[cfg(test)]
diff --git a/crates/neovm-core/src/emacs_core/lisp/native/builtins/file_notify/platform/macos/mod.rs b/crates/neovm-core/src/emacs_core/lisp/native/builtins/file_notify/platform/macos/mod.rs
index 481c062af4..b99385e09b 100644
--- a/crates/neovm-core/src/emacs_core/lisp/native/builtins/file_notify/platform/macos/mod.rs
+++ b/crates/neovm-core/src/emacs_core/lisp/native/builtins/file_notify/platform/macos/mod.rs
@@ -847,5 +847,5 @@ mod lisp;
 pub(crate) use lisp::{kqueue_add_watch, kqueue_rm_watch, kqueue_valid_p};
 
 #[cfg(test)]
-#[path = "tests/macos.rs"]
+#[path = "tests/macos_test.rs"]
 mod macos_test;
diff --git a/crates/neovm-core/src/emacs_core/lisp/native/builtins/file_notify/platform/macos/tests/macos.rs b/crates/neovm-core/src/emacs_core/lisp/native/builtins/file_notify/platform/macos/tests/macos_test.rs
similarity index 100%
rename from crates/neovm-core/src/emacs_core/lisp/native/builtins/file_notify/platform/macos/tests/macos.rs
rename to crates/neovm-core/src/emacs_core/lisp/native/builtins/file_notify/platform/macos/tests/macos_test.rs
diff --git a/crates/neovm-core/src/emacs_core/lisp/native/builtins/file_notify/platform/tests/unsupported.rs b/crates/neovm-core/src/emacs_core/lisp/native/builtins/file_notify/platform/tests/unsupported_test.rs
similarity index 100%
rename from crates/neovm-core/src/emacs_core/lisp/native/builtins/file_notify/platform/tests/unsupported.rs
rename to crates/neovm-core/src/emacs_core/lisp/native/builtins/file_notify/platform/tests/unsupported_test.rs
diff --git a/crates/neovm-core/src/emacs_core/lisp/native/builtins/file_notify/platform/unsupported.rs b/crates/neovm-core/src/emacs_core/lisp/native/builtins/file_notify/platform/unsupported.rs
index bc928ef2e2..d5cb91d4b3 100644
--- a/crates/neovm-core/src/emacs_core/lisp/native/builtins/file_notify/platform/unsupported.rs
+++ b/crates/neovm-core/src/emacs_core/lisp/native/builtins/file_notify/platform/unsupported.rs
@@ -67,5 +67,5 @@ impl Backend for UnsupportedBackend {
 }
 
 #[cfg(test)]
-#[path = "tests/unsupported.rs"]
+#[path = "tests/unsupported_test.rs"]
 mod tests;
diff --git a/crates/neovm-core/src/emacs_core/lisp/native/builtins/file_notify/platform/windows/mod.rs b/crates/neovm-core/src/emacs_core/lisp/native/builtins/file_notify/platform/windows/mod.rs
index 59aebe4401..6c550e2a25 100644
--- a/crates/neovm-core/src/emacs_core/lisp/native/builtins/file_notify/platform/windows/mod.rs
+++ b/crates/neovm-core/src/emacs_core/lisp/native/builtins/file_notify/platform/windows/mod.rs
@@ -322,5 +322,5 @@ mod native {
 pub(super) use native::W32NotifyBackend;
 
 #[cfg(test)]
-#[path = "tests/windows.rs"]
+#[path = "tests/windows_test.rs"]
 mod windows_test;
diff --git a/crates/neovm-core/src/emacs_core/lisp/native/builtins/file_notify/platform/windows/tests/windows.rs b/crates/neovm-core/src/emacs_core/lisp/native/builtins/file_notify/platform/windows/tests/windows_test.rs
similarity index 100%
rename from crates/neovm-core/src/emacs_core/lisp/native/builtins/file_notify/platform/windows/tests/windows.rs
rename to crates/neovm-core/src/emacs_core/lisp/native/builtins/file_notify/platform/windows/tests/windows_test.rs
diff --git a/crates/neovm-core/src/emacs_core/lisp/native/builtins/file_notify/tests/delivery.rs b/crates/neovm-core/src/emacs_core/lisp/native/builtins/file_notify/tests/delivery_test.rs
similarity index 100%
rename from crates/neovm-core/src/emacs_core/lisp/native/builtins/file_notify/tests/delivery.rs
rename to crates/neovm-core/src/emacs_core/lisp/native/builtins/file_notify/tests/delivery_test.rs
diff --git a/crates/neovm-core/src/emacs_core/lisp/native/builtins/file_notify/tests/mod.rs b/crates/neovm-core/src/emacs_core/lisp/native/builtins/file_notify/tests/file_notify_test.rs
similarity index 100%
rename from crates/neovm-core/src/emacs_core/lisp/native/builtins/file_notify/tests/mod.rs
rename to crates/neovm-core/src/emacs_core/lisp/native/builtins/file_notify/tests/file_notify_test.rs
diff --git a/crates/neovm-core/src/emacs_core/lisp/native/builtins/file_notify/tests/gc_tls_ownership.rs b/crates/neovm-core/src/emacs_core/lisp/native/builtins/file_notify/tests/gc_tls_ownership_test.rs
similarity index 100%
rename from crates/neovm-core/src/emacs_core/lisp/native/builtins/file_notify/tests/gc_tls_ownership.rs
rename to crates/neovm-core/src/emacs_core/lisp/native/builtins/file_notify/tests/gc_tls_ownership_test.rs
diff --git a/crates/neovm-core/src/emacs_core/lisp/native/builtins/file_notify/tests/linux.rs b/crates/neovm-core/src/emacs_core/lisp/native/builtins/file_notify/tests/linux_test.rs
similarity index 100%
rename from crates/neovm-core/src/emacs_core/lisp/native/builtins/file_notify/tests/linux.rs
rename to crates/neovm-core/src/emacs_core/lisp/native/builtins/file_notify/tests/linux_test.rs
diff --git a/crates/neovm-core/src/emacs_core/lisp/native/builtins/file_notify/tests/model.rs b/crates/neovm-core/src/emacs_core/lisp/native/builtins/file_notify/tests/model_test.rs
similarity index 100%
rename from crates/neovm-core/src/emacs_core/lisp/native/builtins/file_notify/tests/model.rs
rename to crates/neovm-core/src/emacs_core/lisp/native/builtins/file_notify/tests/model_test.rs
diff --git a/crates/neovm-core/src/emacs_core/lisp/native/builtins/file_notify/tests/native_runtime.rs b/crates/neovm-core/src/emacs_core/lisp/native/builtins/file_notify/tests/native_runtime_test.rs
similarity index 100%
rename from crates/neovm-core/src/emacs_core/lisp/native/builtins/file_notify/tests/native_runtime.rs
rename to crates/neovm-core/src/emacs_core/lisp/native/builtins/file_notify/tests/native_runtime_test.rs
diff --git a/crates/neovm-core/src/emacs_core/lisp/native/builtins/fringe_bitmap.rs b/crates/neovm-core/src/emacs_core/lisp/native/builtins/fringe_bitmap.rs
index 7b221376ec..85584e8b10 100644
--- a/crates/neovm-core/src/emacs_core/lisp/native/builtins/fringe_bitmap.rs
+++ b/crates/neovm-core/src/emacs_core/lisp/native/builtins/fringe_bitmap.rs
@@ -277,5 +277,5 @@ pub(crate) fn fit_rows_to_height(rows: Vec<u16>, height: Option<u8>) -> (Vec<u16
 }
 
 #[cfg(test)]
-#[path = "tests/fringe_bitmap.rs"]
+#[path = "tests/fringe_bitmap_test.rs"]
 mod tests;
diff --git a/crates/neovm-core/src/emacs_core/lisp/native/builtins/from_value.rs b/crates/neovm-core/src/emacs_core/lisp/native/builtins/from_value.rs
index 542db5c9c5..21f2c931e4 100644
--- a/crates/neovm-core/src/emacs_core/lisp/native/builtins/from_value.rs
+++ b/crates/neovm-core/src/emacs_core/lisp/native/builtins/from_value.rs
@@ -274,5 +274,5 @@ macro_rules! typed_subr {
 pub(crate) use typed_subr;
 
 #[cfg(test)]
-#[path = "tests/from_value.rs"]
+#[path = "tests/from_value_test.rs"]
 mod tests;
diff --git a/crates/neovm-core/src/emacs_core/lisp/native/builtins/higher_order.rs b/crates/neovm-core/src/emacs_core/lisp/native/builtins/higher_order.rs
index 3a25bfbaf5..f7e9b18c5e 100644
--- a/crates/neovm-core/src/emacs_core/lisp/native/builtins/higher_order.rs
+++ b/crates/neovm-core/src/emacs_core/lisp/native/builtins/higher_order.rs
@@ -21,7 +21,7 @@ fn sort_capture_enabled() -> bool {
 type MapResultVec = SmallVec<[Value; 8]>;
 
 #[cfg(test)]
-#[path = "tests/higher_order_capture.rs"]
+#[path = "tests/higher_order_capture_test.rs"]
 mod higher_order_capture;
 
 pub(crate) fn gnu_mapconcat_unfilled_slot_value() -> Value {
@@ -363,11 +363,11 @@ where
 }
 
 #[cfg(test)]
-#[path = "tests/map_resume.rs"]
+#[path = "tests/map_resume_test.rs"]
 mod map_resume;
 
 #[cfg(test)]
-#[path = "tests/map_resume_capture.rs"]
+#[path = "tests/map_resume_capture_test.rs"]
 mod map_resume_capture;
 
 #[inline]
@@ -1867,9 +1867,9 @@ fn merge_hi(
 
 #[cfg(test)]
 #[cfg(feature = "jit")]
-#[path = "tests/higher_order_callback_policy.rs"]
+#[path = "tests/higher_order_callback_policy_test.rs"]
 mod higher_order_callback_policy;
 
 #[cfg(all(test, feature = "jit"))]
-#[path = "tests/mapcar_activation.rs"]
+#[path = "tests/mapcar_activation_test.rs"]
 mod mapcar_activation;
diff --git a/crates/neovm-core/src/emacs_core/lisp/native/builtins/hooks.rs b/crates/neovm-core/src/emacs_core/lisp/native/builtins/hooks.rs
index b9f3017714..6b48af031e 100644
--- a/crates/neovm-core/src/emacs_core/lisp/native/builtins/hooks.rs
+++ b/crates/neovm-core/src/emacs_core/lisp/native/builtins/hooks.rs
@@ -2096,5 +2096,5 @@ pub(crate) fn builtin_featurep(eval: &mut super::eval::Context, args: Vec<Value>
 }
 
 #[cfg(test)]
-#[path = "tests/gc_tls_window_configuration.rs"]
+#[path = "tests/gc_tls_window_configuration_test.rs"]
 mod gc_tls_ownership_tests;
diff --git a/crates/neovm-core/src/emacs_core/lisp/native/builtins/hooks/redisplay_gnu.rs b/crates/neovm-core/src/emacs_core/lisp/native/builtins/hooks/redisplay_gnu.rs
index 294824f56e..94f68beb4a 100644
--- a/crates/neovm-core/src/emacs_core/lisp/native/builtins/hooks/redisplay_gnu.rs
+++ b/crates/neovm-core/src/emacs_core/lisp/native/builtins/hooks/redisplay_gnu.rs
@@ -764,5 +764,5 @@ pub(super) fn run_configuration(eval: &mut super::eval::Context, frame: FrameId)
 }
 
 #[cfg(test)]
-#[path = "redisplay_gnu/tests/default_read.rs"]
+#[path = "redisplay_gnu/tests/default_read_test.rs"]
 mod default_read_tests;
diff --git a/crates/neovm-core/src/emacs_core/lisp/native/builtins/hooks/redisplay_gnu/tests/default_read.rs b/crates/neovm-core/src/emacs_core/lisp/native/builtins/hooks/redisplay_gnu/tests/default_read_test.rs
similarity index 100%
rename from crates/neovm-core/src/emacs_core/lisp/native/builtins/hooks/redisplay_gnu/tests/default_read.rs
rename to crates/neovm-core/src/emacs_core/lisp/native/builtins/hooks/redisplay_gnu/tests/default_read_test.rs
diff --git a/crates/neovm-core/src/emacs_core/lisp/native/builtins/hooks/tests/window_configuration_redisplay.rs b/crates/neovm-core/src/emacs_core/lisp/native/builtins/hooks/tests/window_configuration_redisplay_test.rs
similarity index 100%
rename from crates/neovm-core/src/emacs_core/lisp/native/builtins/hooks/tests/window_configuration_redisplay.rs
rename to crates/neovm-core/src/emacs_core/lisp/native/builtins/hooks/tests/window_configuration_redisplay_test.rs
diff --git a/crates/neovm-core/src/emacs_core/lisp/native/builtins/hooks/window_configuration_redisplay.rs b/crates/neovm-core/src/emacs_core/lisp/native/builtins/hooks/window_configuration_redisplay.rs
index e0b16e8312..68dc6efd24 100644
--- a/crates/neovm-core/src/emacs_core/lisp/native/builtins/hooks/window_configuration_redisplay.rs
+++ b/crates/neovm-core/src/emacs_core/lisp/native/builtins/hooks/window_configuration_redisplay.rs
@@ -95,5 +95,5 @@ fn keep_live_source(saved: &mut crate::window::Window, live: &crate::window::Win
 }
 
 #[cfg(test)]
-#[path = "tests/window_configuration_redisplay.rs"]
+#[path = "tests/window_configuration_redisplay_test.rs"]
 mod tests;
diff --git a/crates/neovm-core/src/emacs_core/lisp/native/builtins/keymaps.rs b/crates/neovm-core/src/emacs_core/lisp/native/builtins/keymaps.rs
index 9c6a4c41d0..45cb545193 100644
--- a/crates/neovm-core/src/emacs_core/lisp/native/builtins/keymaps.rs
+++ b/crates/neovm-core/src/emacs_core/lisp/native/builtins/keymaps.rs
@@ -1478,5 +1478,5 @@ pub(crate) fn builtin_recent_keys_impl(
 }
 
 #[cfg(test)]
-#[path = "tests/keymaps.rs"]
+#[path = "tests/keymaps_test.rs"]
 mod tests;
diff --git a/crates/neovm-core/src/emacs_core/lisp/native/builtins/leaves/mod.rs b/crates/neovm-core/src/emacs_core/lisp/native/builtins/leaves/mod.rs
index 33571025c4..cc51813938 100644
--- a/crates/neovm-core/src/emacs_core/lisp/native/builtins/leaves/mod.rs
+++ b/crates/neovm-core/src/emacs_core/lisp/native/builtins/leaves/mod.rs
@@ -517,5 +517,5 @@ pub(crate) fn string_lessp(ctx: &Context, a: Value, b: Value) -> LeafResult {
 }
 
 #[cfg(test)]
-#[path = "tests/equivalence.rs"]
+#[path = "tests/equivalence_test.rs"]
 mod equivalence_tests;
diff --git a/crates/neovm-core/src/emacs_core/lisp/native/builtins/leaves/tests/equivalence.rs b/crates/neovm-core/src/emacs_core/lisp/native/builtins/leaves/tests/equivalence_test.rs
similarity index 100%
rename from crates/neovm-core/src/emacs_core/lisp/native/builtins/leaves/tests/equivalence.rs
rename to crates/neovm-core/src/emacs_core/lisp/native/builtins/leaves/tests/equivalence_test.rs
diff --git a/crates/neovm-core/src/emacs_core/lisp/native/builtins/mod.rs b/crates/neovm-core/src/emacs_core/lisp/native/builtins/mod.rs
index 56bc73c706..db13fec879 100644
--- a/crates/neovm-core/src/emacs_core/lisp/native/builtins/mod.rs
+++ b/crates/neovm-core/src/emacs_core/lisp/native/builtins/mod.rs
@@ -647,64 +647,65 @@ pub(crate) fn dispatch_builtin_without_eval_state(
 }
 
 #[cfg(test)]
+#[path = "tests/builtins_test.rs"]
 mod tests;
 
 #[cfg(test)]
-#[path = "tests/fixed_arity_hot_subrs.rs"]
+#[path = "tests/fixed_arity_hot_subrs_test.rs"]
 mod fixed_arity_hot_subrs;
 #[cfg(test)]
-#[path = "tests/replace_region_contents.rs"]
+#[path = "tests/replace_region_contents_test.rs"]
 mod replace_region_contents_test;
 
 #[cfg(test)]
-#[path = "tests/closure_slot_identity.rs"]
+#[path = "tests/closure_slot_identity_test.rs"]
 mod closure_slot_identity_test;
 #[cfg(test)]
-#[path = "tests/make_byte_code_literals.rs"]
+#[path = "tests/make_byte_code_literals_test.rs"]
 mod make_byte_code_literals_test;
 #[cfg(test)]
-#[path = "tests/make_closure_instance.rs"]
+#[path = "tests/make_closure_instance_test.rs"]
 mod make_closure_instance_test;
 
 #[cfg(test)]
-#[path = "tests/obarray_growth.rs"]
+#[path = "tests/obarray_growth_test.rs"]
 mod obarray_growth_test;
 #[cfg(test)]
-#[path = "tests/obarray_order.rs"]
+#[path = "tests/obarray_order_test.rs"]
 mod obarray_order_test;
 
 #[cfg(test)]
-#[path = "tests/assoc_callbacks.rs"]
+#[path = "tests/assoc_callbacks_test.rs"]
 mod assoc_callbacks_test;
 #[cfg(test)]
-#[path = "tests/predicate_walk_gc.rs"]
+#[path = "tests/predicate_walk_gc_test.rs"]
 mod predicate_walk_gc_test;
 #[cfg(test)]
-#[path = "tests/sort_capture.rs"]
+#[path = "tests/sort_capture_test.rs"]
 mod sort_capture_test;
 
 #[cfg(test)]
-#[path = "tests/lisp_only_predicates_and_aliases.rs"]
+#[path = "tests/lisp_only_predicates_and_aliases_test.rs"]
 mod lisp_only_predicates_and_aliases_test;
 
 #[cfg(test)]
-#[path = "tests/lisp_only_undo_commands.rs"]
+#[path = "tests/lisp_only_undo_commands_test.rs"]
 mod lisp_only_undo_commands_test;
 
 #[cfg(test)]
-#[path = "tests/process_launchers_are_lisp_only.rs"]
+#[path = "tests/process_launchers_are_lisp_only_test.rs"]
 mod process_launchers_are_lisp_only_test;
 
 #[cfg(test)]
-#[path = "tests/lisp_only_misc_names.rs"]
+#[path = "tests/lisp_only_misc_names_test.rs"]
 mod lisp_only_misc_names_test;
 
 #[cfg(test)]
-#[path = "tests/lisp_only_window_frame_names.rs"]
+#[path = "tests/lisp_only_window_frame_names_test.rs"]
 mod lisp_only_window_frame_names_test;
 
 #[cfg(test)]
-#[path = "tests/rust_subrs_shadowed_by_lisp.rs"]
+#[path = "tests/rust_subrs_shadowed_by_lisp_test.rs"]
 mod rust_subrs_shadowed_by_lisp_test;
 
 // -----------------------------------------------------------------------
diff --git a/crates/neovm-core/src/emacs_core/lisp/native/builtins/search.rs b/crates/neovm-core/src/emacs_core/lisp/native/builtins/search.rs
index 4383d8c078..5c6a87cff3 100644
--- a/crates/neovm-core/src/emacs_core/lisp/native/builtins/search.rs
+++ b/crates/neovm-core/src/emacs_core/lisp/native/builtins/search.rs
@@ -3518,15 +3518,15 @@ pub(crate) fn builtin_replace_match(
 }
 
 #[cfg(test)]
-#[path = "tests/search.rs"]
+#[path = "tests/search_test.rs"]
 mod tests;
 
 #[cfg(test)]
-#[path = "tests/search_frontend.rs"]
+#[path = "tests/search_frontend_test.rs"]
 mod search_frontend_tests;
 
 #[cfg(test)]
-#[path = "search/tests/gc_tls_ownership.rs"]
+#[path = "search/tests/gc_tls_ownership_test.rs"]
 mod gc_tls_ownership;
 
 #[cfg(test)]
diff --git a/crates/neovm-core/src/emacs_core/lisp/native/builtins/search/tests/gc_tls_ownership.rs b/crates/neovm-core/src/emacs_core/lisp/native/builtins/search/tests/gc_tls_ownership_test.rs
similarity index 100%
rename from crates/neovm-core/src/emacs_core/lisp/native/builtins/search/tests/gc_tls_ownership.rs
rename to crates/neovm-core/src/emacs_core/lisp/native/builtins/search/tests/gc_tls_ownership_test.rs
diff --git a/crates/neovm-core/src/emacs_core/lisp/native/builtins/strings.rs b/crates/neovm-core/src/emacs_core/lisp/native/builtins/strings.rs
index f7e2f90644..8311b0d7f2 100644
--- a/crates/neovm-core/src/emacs_core/lisp/native/builtins/strings.rs
+++ b/crates/neovm-core/src/emacs_core/lisp/native/builtins/strings.rs
@@ -371,7 +371,7 @@ fn substring_impl(name: &str, args: &[Value], preserve_props: bool) -> EvalResul
 }
 
 #[cfg(test)]
-#[path = "tests/strings.rs"]
+#[path = "tests/strings_test.rs"]
 mod tests;
 
 pub(crate) fn builtin_substring(args: Vec<Value>) -> EvalResult {
diff --git a/crates/neovm-core/src/emacs_core/lisp/native/builtins/tests/arithmetic_ash_overflow.rs b/crates/neovm-core/src/emacs_core/lisp/native/builtins/tests/arithmetic_ash_overflow_test.rs
similarity index 100%
rename from crates/neovm-core/src/emacs_core/lisp/native/builtins/tests/arithmetic_ash_overflow.rs
rename to crates/neovm-core/src/emacs_core/lisp/native/builtins/tests/arithmetic_ash_overflow_test.rs
diff --git a/crates/neovm-core/src/emacs_core/lisp/native/builtins/tests/arithmetic_bignum_borrowed.rs b/crates/neovm-core/src/emacs_core/lisp/native/builtins/tests/arithmetic_bignum_borrowed_test.rs
similarity index 100%
rename from crates/neovm-core/src/emacs_core/lisp/native/builtins/tests/arithmetic_bignum_borrowed.rs
rename to crates/neovm-core/src/emacs_core/lisp/native/builtins/tests/arithmetic_bignum_borrowed_test.rs
diff --git a/crates/neovm-core/src/emacs_core/lisp/native/builtins/tests/arithmetic_integer_value.rs b/crates/neovm-core/src/emacs_core/lisp/native/builtins/tests/arithmetic_integer_value_test.rs
similarity index 100%
rename from crates/neovm-core/src/emacs_core/lisp/native/builtins/tests/arithmetic_integer_value.rs
rename to crates/neovm-core/src/emacs_core/lisp/native/builtins/tests/arithmetic_integer_value_test.rs
diff --git a/crates/neovm-core/src/emacs_core/lisp/native/builtins/tests/arithmetic_limb_kernels.rs b/crates/neovm-core/src/emacs_core/lisp/native/builtins/tests/arithmetic_limb_kernels_test.rs
similarity index 100%
rename from crates/neovm-core/src/emacs_core/lisp/native/builtins/tests/arithmetic_limb_kernels.rs
rename to crates/neovm-core/src/emacs_core/lisp/native/builtins/tests/arithmetic_limb_kernels_test.rs
diff --git a/crates/neovm-core/src/emacs_core/lisp/native/builtins/tests/arithmetic_minmax_compare.rs b/crates/neovm-core/src/emacs_core/lisp/native/builtins/tests/arithmetic_minmax_compare_test.rs
similarity index 100%
rename from crates/neovm-core/src/emacs_core/lisp/native/builtins/tests/arithmetic_minmax_compare.rs
rename to crates/neovm-core/src/emacs_core/lisp/native/builtins/tests/arithmetic_minmax_compare_test.rs
diff --git a/crates/neovm-core/src/emacs_core/lisp/native/builtins/tests/arithmetic_rounding_capture.rs b/crates/neovm-core/src/emacs_core/lisp/native/builtins/tests/arithmetic_rounding_capture_test.rs
similarity index 100%
rename from crates/neovm-core/src/emacs_core/lisp/native/builtins/tests/arithmetic_rounding_capture.rs
rename to crates/neovm-core/src/emacs_core/lisp/native/builtins/tests/arithmetic_rounding_capture_test.rs
diff --git a/crates/neovm-core/src/emacs_core/lisp/native/builtins/tests/arithmetic_rounding_float_exact.rs b/crates/neovm-core/src/emacs_core/lisp/native/builtins/tests/arithmetic_rounding_float_exact_test.rs
similarity index 100%
rename from crates/neovm-core/src/emacs_core/lisp/native/builtins/tests/arithmetic_rounding_float_exact.rs
rename to crates/neovm-core/src/emacs_core/lisp/native/builtins/tests/arithmetic_rounding_float_exact_test.rs
diff --git a/crates/neovm-core/src/emacs_core/lisp/native/builtins/tests/arithmetic_rounding_nil_divisor.rs b/crates/neovm-core/src/emacs_core/lisp/native/builtins/tests/arithmetic_rounding_nil_divisor_test.rs
similarity index 100%
rename from crates/neovm-core/src/emacs_core/lisp/native/builtins/tests/arithmetic_rounding_nil_divisor.rs
rename to crates/neovm-core/src/emacs_core/lisp/native/builtins/tests/arithmetic_rounding_nil_divisor_test.rs
diff --git a/crates/neovm-core/src/emacs_core/lisp/native/builtins/tests/aset_string_in_place.rs b/crates/neovm-core/src/emacs_core/lisp/native/builtins/tests/aset_string_in_place_test.rs
similarity index 100%
rename from crates/neovm-core/src/emacs_core/lisp/native/builtins/tests/aset_string_in_place.rs
rename to crates/neovm-core/src/emacs_core/lisp/native/builtins/tests/aset_string_in_place_test.rs
diff --git a/crates/neovm-core/src/emacs_core/lisp/native/builtins/tests/assoc_callbacks.rs b/crates/neovm-core/src/emacs_core/lisp/native/builtins/tests/assoc_callbacks_test.rs
similarity index 100%
rename from crates/neovm-core/src/emacs_core/lisp/native/builtins/tests/assoc_callbacks.rs
rename to crates/neovm-core/src/emacs_core/lisp/native/builtins/tests/assoc_callbacks_test.rs
diff --git a/crates/neovm-core/src/emacs_core/lisp/native/builtins/tests/mod.rs b/crates/neovm-core/src/emacs_core/lisp/native/builtins/tests/builtins_test.rs
similarity index 100%
rename from crates/neovm-core/src/emacs_core/lisp/native/builtins/tests/mod.rs
rename to crates/neovm-core/src/emacs_core/lisp/native/builtins/tests/builtins_test.rs
diff --git a/crates/neovm-core/src/emacs_core/lisp/native/builtins/tests/closure_slot_identity.rs b/crates/neovm-core/src/emacs_core/lisp/native/builtins/tests/closure_slot_identity_test.rs
similarity index 100%
rename from crates/neovm-core/src/emacs_core/lisp/native/builtins/tests/closure_slot_identity.rs
rename to crates/neovm-core/src/emacs_core/lisp/native/builtins/tests/closure_slot_identity_test.rs
diff --git a/crates/neovm-core/src/emacs_core/lisp/native/builtins/tests/collection_scan_capture.rs b/crates/neovm-core/src/emacs_core/lisp/native/builtins/tests/collection_scan_capture_test.rs
similarity index 100%
rename from crates/neovm-core/src/emacs_core/lisp/native/builtins/tests/collection_scan_capture.rs
rename to crates/neovm-core/src/emacs_core/lisp/native/builtins/tests/collection_scan_capture_test.rs
diff --git a/crates/neovm-core/src/emacs_core/lisp/native/builtins/tests/copy_sequence_capture.rs b/crates/neovm-core/src/emacs_core/lisp/native/builtins/tests/copy_sequence_capture_test.rs
similarity index 100%
rename from crates/neovm-core/src/emacs_core/lisp/native/builtins/tests/copy_sequence_capture.rs
rename to crates/neovm-core/src/emacs_core/lisp/native/builtins/tests/copy_sequence_capture_test.rs
diff --git a/crates/neovm-core/src/emacs_core/lisp/native/builtins/tests/fixed_arity_hot_subrs.rs b/crates/neovm-core/src/emacs_core/lisp/native/builtins/tests/fixed_arity_hot_subrs_test.rs
similarity index 100%
rename from crates/neovm-core/src/emacs_core/lisp/native/builtins/tests/fixed_arity_hot_subrs.rs
rename to crates/neovm-core/src/emacs_core/lisp/native/builtins/tests/fixed_arity_hot_subrs_test.rs
diff --git a/crates/neovm-core/src/emacs_core/lisp/native/builtins/tests/fringe_bitmap.rs b/crates/neovm-core/src/emacs_core/lisp/native/builtins/tests/fringe_bitmap_test.rs
similarity index 100%
rename from crates/neovm-core/src/emacs_core/lisp/native/builtins/tests/fringe_bitmap.rs
rename to crates/neovm-core/src/emacs_core/lisp/native/builtins/tests/fringe_bitmap_test.rs
diff --git a/crates/neovm-core/src/emacs_core/lisp/native/builtins/tests/from_value.rs b/crates/neovm-core/src/emacs_core/lisp/native/builtins/tests/from_value_test.rs
similarity index 100%
rename from crates/neovm-core/src/emacs_core/lisp/native/builtins/tests/from_value.rs
rename to crates/neovm-core/src/emacs_core/lisp/native/builtins/tests/from_value_test.rs
diff --git a/crates/neovm-core/src/emacs_core/lisp/native/builtins/tests/gc_tls_collections.rs b/crates/neovm-core/src/emacs_core/lisp/native/builtins/tests/gc_tls_collections_test.rs
similarity index 100%
rename from crates/neovm-core/src/emacs_core/lisp/native/builtins/tests/gc_tls_collections.rs
rename to crates/neovm-core/src/emacs_core/lisp/native/builtins/tests/gc_tls_collections_test.rs
diff --git a/crates/neovm-core/src/emacs_core/lisp/native/builtins/tests/gc_tls_window_configuration.rs b/crates/neovm-core/src/emacs_core/lisp/native/builtins/tests/gc_tls_window_configuration_test.rs
similarity index 100%
rename from crates/neovm-core/src/emacs_core/lisp/native/builtins/tests/gc_tls_window_configuration.rs
rename to crates/neovm-core/src/emacs_core/lisp/native/builtins/tests/gc_tls_window_configuration_test.rs
diff --git a/crates/neovm-core/src/emacs_core/lisp/native/builtins/tests/gdn_equality.rs b/crates/neovm-core/src/emacs_core/lisp/native/builtins/tests/gdn_equality_test.rs
similarity index 100%
rename from crates/neovm-core/src/emacs_core/lisp/native/builtins/tests/gdn_equality.rs
rename to crates/neovm-core/src/emacs_core/lisp/native/builtins/tests/gdn_equality_test.rs
diff --git a/crates/neovm-core/src/emacs_core/lisp/native/builtins/tests/higher_order_callback_policy.rs b/crates/neovm-core/src/emacs_core/lisp/native/builtins/tests/higher_order_callback_policy_test.rs
similarity index 100%
rename from crates/neovm-core/src/emacs_core/lisp/native/builtins/tests/higher_order_callback_policy.rs
rename to crates/neovm-core/src/emacs_core/lisp/native/builtins/tests/higher_order_callback_policy_test.rs
diff --git a/crates/neovm-core/src/emacs_core/lisp/native/builtins/tests/higher_order_capture.rs b/crates/neovm-core/src/emacs_core/lisp/native/builtins/tests/higher_order_capture_test.rs
similarity index 100%
rename from crates/neovm-core/src/emacs_core/lisp/native/builtins/tests/higher_order_capture.rs
rename to crates/neovm-core/src/emacs_core/lisp/native/builtins/tests/higher_order_capture_test.rs
diff --git a/crates/neovm-core/src/emacs_core/lisp/native/builtins/tests/keymaps.rs b/crates/neovm-core/src/emacs_core/lisp/native/builtins/tests/keymaps_test.rs
similarity index 100%
rename from crates/neovm-core/src/emacs_core/lisp/native/builtins/tests/keymaps.rs
rename to crates/neovm-core/src/emacs_core/lisp/native/builtins/tests/keymaps_test.rs
diff --git a/crates/neovm-core/src/emacs_core/lisp/native/builtins/tests/lisp_only_misc_names.rs b/crates/neovm-core/src/emacs_core/lisp/native/builtins/tests/lisp_only_misc_names_test.rs
similarity index 100%
rename from crates/neovm-core/src/emacs_core/lisp/native/builtins/tests/lisp_only_misc_names.rs
rename to crates/neovm-core/src/emacs_core/lisp/native/builtins/tests/lisp_only_misc_names_test.rs
diff --git a/crates/neovm-core/src/emacs_core/lisp/native/builtins/tests/lisp_only_predicates_and_aliases.rs b/crates/neovm-core/src/emacs_core/lisp/native/builtins/tests/lisp_only_predicates_and_aliases_test.rs
similarity index 100%
rename from crates/neovm-core/src/emacs_core/lisp/native/builtins/tests/lisp_only_predicates_and_aliases.rs
rename to crates/neovm-core/src/emacs_core/lisp/native/builtins/tests/lisp_only_predicates_and_aliases_test.rs
diff --git a/crates/neovm-core/src/emacs_core/lisp/native/builtins/tests/lisp_only_undo_commands.rs b/crates/neovm-core/src/emacs_core/lisp/native/builtins/tests/lisp_only_undo_commands_test.rs
similarity index 100%
rename from crates/neovm-core/src/emacs_core/lisp/native/builtins/tests/lisp_only_undo_commands.rs
rename to crates/neovm-core/src/emacs_core/lisp/native/builtins/tests/lisp_only_undo_commands_test.rs
diff --git a/crates/neovm-core/src/emacs_core/lisp/native/builtins/tests/lisp_only_window_frame_names.rs b/crates/neovm-core/src/emacs_core/lisp/native/builtins/tests/lisp_only_window_frame_names_test.rs
similarity index 100%
rename from crates/neovm-core/src/emacs_core/lisp/native/builtins/tests/lisp_only_window_frame_names.rs
rename to crates/neovm-core/src/emacs_core/lisp/native/builtins/tests/lisp_only_window_frame_names_test.rs
diff --git a/crates/neovm-core/src/emacs_core/lisp/native/builtins/tests/make_byte_code_literals.rs b/crates/neovm-core/src/emacs_core/lisp/native/builtins/tests/make_byte_code_literals_test.rs
similarity index 100%
rename from crates/neovm-core/src/emacs_core/lisp/native/builtins/tests/make_byte_code_literals.rs
rename to crates/neovm-core/src/emacs_core/lisp/native/builtins/tests/make_byte_code_literals_test.rs
diff --git a/crates/neovm-core/src/emacs_core/lisp/native/builtins/tests/make_closure_instance.rs b/crates/neovm-core/src/emacs_core/lisp/native/builtins/tests/make_closure_instance_test.rs
similarity index 100%
rename from crates/neovm-core/src/emacs_core/lisp/native/builtins/tests/make_closure_instance.rs
rename to crates/neovm-core/src/emacs_core/lisp/native/builtins/tests/make_closure_instance_test.rs
diff --git a/crates/neovm-core/src/emacs_core/lisp/native/builtins/tests/map_resume_capture.rs b/crates/neovm-core/src/emacs_core/lisp/native/builtins/tests/map_resume_capture_test.rs
similarity index 100%
rename from crates/neovm-core/src/emacs_core/lisp/native/builtins/tests/map_resume_capture.rs
rename to crates/neovm-core/src/emacs_core/lisp/native/builtins/tests/map_resume_capture_test.rs
diff --git a/crates/neovm-core/src/emacs_core/lisp/native/builtins/tests/map_resume.rs b/crates/neovm-core/src/emacs_core/lisp/native/builtins/tests/map_resume_test.rs
similarity index 100%
rename from crates/neovm-core/src/emacs_core/lisp/native/builtins/tests/map_resume.rs
rename to crates/neovm-core/src/emacs_core/lisp/native/builtins/tests/map_resume_test.rs
diff --git a/crates/neovm-core/src/emacs_core/lisp/native/builtins/tests/mapcar_activation.rs b/crates/neovm-core/src/emacs_core/lisp/native/builtins/tests/mapcar_activation_test.rs
similarity index 100%
rename from crates/neovm-core/src/emacs_core/lisp/native/builtins/tests/mapcar_activation.rs
rename to crates/neovm-core/src/emacs_core/lisp/native/builtins/tests/mapcar_activation_test.rs
diff --git a/crates/neovm-core/src/emacs_core/lisp/native/builtins/tests/obarray_growth.rs b/crates/neovm-core/src/emacs_core/lisp/native/builtins/tests/obarray_growth_test.rs
similarity index 100%
rename from crates/neovm-core/src/emacs_core/lisp/native/builtins/tests/obarray_growth.rs
rename to crates/neovm-core/src/emacs_core/lisp/native/builtins/tests/obarray_growth_test.rs
diff --git a/crates/neovm-core/src/emacs_core/lisp/native/builtins/tests/obarray_order.rs b/crates/neovm-core/src/emacs_core/lisp/native/builtins/tests/obarray_order_test.rs
similarity index 100%
rename from crates/neovm-core/src/emacs_core/lisp/native/builtins/tests/obarray_order.rs
rename to crates/neovm-core/src/emacs_core/lisp/native/builtins/tests/obarray_order_test.rs
diff --git a/crates/neovm-core/src/emacs_core/lisp/native/builtins/tests/predicate_walk_gc.rs b/crates/neovm-core/src/emacs_core/lisp/native/builtins/tests/predicate_walk_gc_test.rs
similarity index 100%
rename from crates/neovm-core/src/emacs_core/lisp/native/builtins/tests/predicate_walk_gc.rs
rename to crates/neovm-core/src/emacs_core/lisp/native/builtins/tests/predicate_walk_gc_test.rs
diff --git a/crates/neovm-core/src/emacs_core/lisp/native/builtins/tests/process_launchers_are_lisp_only.rs b/crates/neovm-core/src/emacs_core/lisp/native/builtins/tests/process_launchers_are_lisp_only_test.rs
similarity index 100%
rename from crates/neovm-core/src/emacs_core/lisp/native/builtins/tests/process_launchers_are_lisp_only.rs
rename to crates/neovm-core/src/emacs_core/lisp/native/builtins/tests/process_launchers_are_lisp_only_test.rs
diff --git a/crates/neovm-core/src/emacs_core/lisp/native/builtins/tests/replace_region_contents.rs b/crates/neovm-core/src/emacs_core/lisp/native/builtins/tests/replace_region_contents_test.rs
similarity index 100%
rename from crates/neovm-core/src/emacs_core/lisp/native/builtins/tests/replace_region_contents.rs
rename to crates/neovm-core/src/emacs_core/lisp/native/builtins/tests/replace_region_contents_test.rs
diff --git a/crates/neovm-core/src/emacs_core/lisp/native/builtins/tests/rust_subrs_shadowed_by_lisp.rs b/crates/neovm-core/src/emacs_core/lisp/native/builtins/tests/rust_subrs_shadowed_by_lisp_test.rs
similarity index 100%
rename from crates/neovm-core/src/emacs_core/lisp/native/builtins/tests/rust_subrs_shadowed_by_lisp.rs
rename to crates/neovm-core/src/emacs_core/lisp/native/builtins/tests/rust_subrs_shadowed_by_lisp_test.rs
diff --git a/crates/neovm-core/src/emacs_core/lisp/native/builtins/tests/search_frontend.rs b/crates/neovm-core/src/emacs_core/lisp/native/builtins/tests/search_frontend_test.rs
similarity index 100%
rename from crates/neovm-core/src/emacs_core/lisp/native/builtins/tests/search_frontend.rs
rename to crates/neovm-core/src/emacs_core/lisp/native/builtins/tests/search_frontend_test.rs
diff --git a/crates/neovm-core/src/emacs_core/lisp/native/builtins/tests/search.rs b/crates/neovm-core/src/emacs_core/lisp/native/builtins/tests/search_test.rs
similarity index 100%
rename from crates/neovm-core/src/emacs_core/lisp/native/builtins/tests/search.rs
rename to crates/neovm-core/src/emacs_core/lisp/native/builtins/tests/search_test.rs
diff --git a/crates/neovm-core/src/emacs_core/lisp/native/builtins/tests/sort_capture.rs b/crates/neovm-core/src/emacs_core/lisp/native/builtins/tests/sort_capture_test.rs
similarity index 100%
rename from crates/neovm-core/src/emacs_core/lisp/native/builtins/tests/sort_capture.rs
rename to crates/neovm-core/src/emacs_core/lisp/native/builtins/tests/sort_capture_test.rs
diff --git a/crates/neovm-core/src/emacs_core/lisp/native/builtins/tests/strings.rs b/crates/neovm-core/src/emacs_core/lisp/native/builtins/tests/strings_test.rs
similarity index 100%
rename from crates/neovm-core/src/emacs_core/lisp/native/builtins/tests/strings.rs
rename to crates/neovm-core/src/emacs_core/lisp/native/builtins/tests/strings_test.rs
diff --git a/crates/neovm-core/src/emacs_core/lisp/native/builtins/tests/treesit_freshness.rs b/crates/neovm-core/src/emacs_core/lisp/native/builtins/tests/treesit_freshness_test.rs
similarity index 100%
rename from crates/neovm-core/src/emacs_core/lisp/native/builtins/tests/treesit_freshness.rs
rename to crates/neovm-core/src/emacs_core/lisp/native/builtins/tests/treesit_freshness_test.rs
diff --git a/crates/neovm-core/src/emacs_core/lisp/native/builtins/treesit.rs b/crates/neovm-core/src/emacs_core/lisp/native/builtins/treesit.rs
index 737647ada7..71532ca5c4 100644
--- a/crates/neovm-core/src/emacs_core/lisp/native/builtins/treesit.rs
+++ b/crates/neovm-core/src/emacs_core/lisp/native/builtins/treesit.rs
@@ -3340,7 +3340,7 @@ pub(crate) fn builtin_treesit_linecol_cache(
 }
 
 #[cfg(test)]
-#[path = "tests/treesit_freshness.rs"]
+#[path = "tests/treesit_freshness_test.rs"]
 mod freshness_tests;
 
 #[cfg(test)]
diff --git a/crates/neovm-core/src/emacs_core/lisp/native/builtins_extra/mod.rs b/crates/neovm-core/src/emacs_core/lisp/native/builtins_extra/mod.rs
index b75377ef98..bcada4b241 100644
--- a/crates/neovm-core/src/emacs_core/lisp/native/builtins_extra/mod.rs
+++ b/crates/neovm-core/src/emacs_core/lisp/native/builtins_extra/mod.rs
@@ -910,5 +910,5 @@ pub(crate) fn builtin_neomacs_heap_layout_stats(args: Vec<Value>) -> EvalResult
 // Tests
 // ===========================================================================
 #[cfg(test)]
-#[path = "tests/mod.rs"]
+#[path = "tests/builtins_extra_test.rs"]
 mod tests;
diff --git a/crates/neovm-core/src/emacs_core/lisp/native/builtins_extra/tests/mod.rs b/crates/neovm-core/src/emacs_core/lisp/native/builtins_extra/tests/builtins_extra_test.rs
similarity index 100%
rename from crates/neovm-core/src/emacs_core/lisp/native/builtins_extra/tests/mod.rs
rename to crates/neovm-core/src/emacs_core/lisp/native/builtins_extra/tests/builtins_extra_test.rs
diff --git a/crates/neovm-core/src/emacs_core/lisp/native/floatfns/mod.rs b/crates/neovm-core/src/emacs_core/lisp/native/floatfns/mod.rs
index 3edbfeebb0..3e35f57d37 100644
--- a/crates/neovm-core/src/emacs_core/lisp/native/floatfns/mod.rs
+++ b/crates/neovm-core/src/emacs_core/lisp/native/floatfns/mod.rs
@@ -206,5 +206,5 @@ pub(crate) fn builtin_ftruncate(args: Vec<Value>) -> EvalResult {
 // Tests
 // ---------------------------------------------------------------------------
 #[cfg(test)]
-#[path = "tests/mod.rs"]
+#[path = "tests/floatfns_test.rs"]
 mod tests;
diff --git a/crates/neovm-core/src/emacs_core/lisp/native/floatfns/tests/mod.rs b/crates/neovm-core/src/emacs_core/lisp/native/floatfns/tests/floatfns_test.rs
similarity index 100%
rename from crates/neovm-core/src/emacs_core/lisp/native/floatfns/tests/mod.rs
rename to crates/neovm-core/src/emacs_core/lisp/native/floatfns/tests/floatfns_test.rs
diff --git a/crates/neovm-core/src/emacs_core/lisp/native/fns/mod.rs b/crates/neovm-core/src/emacs_core/lisp/native/fns/mod.rs
index cf4dba0146..fa67c7f160 100644
--- a/crates/neovm-core/src/emacs_core/lisp/native/fns/mod.rs
+++ b/crates/neovm-core/src/emacs_core/lisp/native/fns/mod.rs
@@ -2086,5 +2086,5 @@ pub(crate) fn builtin_string_collate_equalp(eval: &mut Context, args: Vec<Value>
 // Tests
 // ---------------------------------------------------------------------------
 #[cfg(test)]
-#[path = "tests/mod.rs"]
+#[path = "tests/fns_test.rs"]
 mod tests;
diff --git a/crates/neovm-core/src/emacs_core/lisp/native/fns/tests/compare_case_table.rs b/crates/neovm-core/src/emacs_core/lisp/native/fns/tests/compare_case_table_test.rs
similarity index 100%
rename from crates/neovm-core/src/emacs_core/lisp/native/fns/tests/compare_case_table.rs
rename to crates/neovm-core/src/emacs_core/lisp/native/fns/tests/compare_case_table_test.rs
diff --git a/crates/neovm-core/src/emacs_core/lisp/native/fns/tests/compare_position_cache.rs b/crates/neovm-core/src/emacs_core/lisp/native/fns/tests/compare_position_cache_test.rs
similarity index 100%
rename from crates/neovm-core/src/emacs_core/lisp/native/fns/tests/compare_position_cache.rs
rename to crates/neovm-core/src/emacs_core/lisp/native/fns/tests/compare_position_cache_test.rs
diff --git a/crates/neovm-core/src/emacs_core/lisp/native/fns/tests/mod.rs b/crates/neovm-core/src/emacs_core/lisp/native/fns/tests/fns_test.rs
similarity index 99%
rename from crates/neovm-core/src/emacs_core/lisp/native/fns/tests/mod.rs
rename to crates/neovm-core/src/emacs_core/lisp/native/fns/tests/fns_test.rs
index 0da17f085c..e5719eea5d 100644
--- a/crates/neovm-core/src/emacs_core/lisp/native/fns/tests/mod.rs
+++ b/crates/neovm-core/src/emacs_core/lisp/native/fns/tests/fns_test.rs
@@ -2213,7 +2213,9 @@ fn base64_decode_ignores_whitespace() {
 }
 
 #[cfg(test)]
+#[path = "compare_position_cache_test.rs"]
 mod compare_position_cache;
 
 #[cfg(test)]
+#[path = "compare_case_table_test.rs"]
 mod compare_case_table;
diff --git a/crates/neovm-core/src/emacs_core/lisp/native/misc/mod.rs b/crates/neovm-core/src/emacs_core/lisp/native/misc/mod.rs
index caffb534af..b4f577d5c1 100644
--- a/crates/neovm-core/src/emacs_core/lisp/native/misc/mod.rs
+++ b/crates/neovm-core/src/emacs_core/lisp/native/misc/mod.rs
@@ -1050,5 +1050,5 @@ pub(crate) fn builtin_recursion_depth(
 // Tests
 // ===========================================================================
 #[cfg(test)]
-#[path = "tests/mod.rs"]
+#[path = "tests/misc_test.rs"]
 mod tests;
diff --git a/crates/neovm-core/src/emacs_core/lisp/native/misc/tests/mod.rs b/crates/neovm-core/src/emacs_core/lisp/native/misc/tests/misc_test.rs
similarity index 100%
rename from crates/neovm-core/src/emacs_core/lisp/native/misc/tests/mod.rs
rename to crates/neovm-core/src/emacs_core/lisp/native/misc/tests/misc_test.rs
diff --git a/crates/neovm-core/src/emacs_core/lisp/native/subr/info.rs b/crates/neovm-core/src/emacs_core/lisp/native/subr/info.rs
index 2fa0ed10d2..9cb89fbf82 100644
--- a/crates/neovm-core/src/emacs_core/lisp/native/subr/info.rs
+++ b/crates/neovm-core/src/emacs_core/lisp/native/subr/info.rs
@@ -318,5 +318,5 @@ pub(crate) fn builtin_func_arity_ctx(
 // Tests
 // ---------------------------------------------------------------------------
 #[cfg(test)]
-#[path = "tests/info.rs"]
+#[path = "tests/info_test.rs"]
 mod tests;
diff --git a/crates/neovm-core/src/emacs_core/lisp/native/subr/leaf.rs b/crates/neovm-core/src/emacs_core/lisp/native/subr/leaf.rs
index 89ba5c7469..4df8a5d325 100644
--- a/crates/neovm-core/src/emacs_core/lisp/native/subr/leaf.rs
+++ b/crates/neovm-core/src/emacs_core/lisp/native/subr/leaf.rs
@@ -585,5 +585,5 @@ pub(crate) fn call_checked(spec: &'static LeafSpec, ctx: &Context, args: &[Value
 }
 
 #[cfg(test)]
-#[path = "tests/leaf_contract.rs"]
+#[path = "tests/leaf_contract_test.rs"]
 mod leaf_contract_tests;
diff --git a/crates/neovm-core/src/emacs_core/lisp/native/subr/mod.rs b/crates/neovm-core/src/emacs_core/lisp/native/subr/mod.rs
index 882e453ed3..12355c234b 100644
--- a/crates/neovm-core/src/emacs_core/lisp/native/subr/mod.rs
+++ b/crates/neovm-core/src/emacs_core/lisp/native/subr/mod.rs
@@ -494,4 +494,5 @@ macro_rules! define_subrs {
 pub(crate) use define_subrs;
 
 #[cfg(test)]
+#[path = "tests/subr_test.rs"]
 mod tests;
diff --git a/crates/neovm-core/src/emacs_core/lisp/native/subr/tests/info.rs b/crates/neovm-core/src/emacs_core/lisp/native/subr/tests/info_test.rs
similarity index 100%
rename from crates/neovm-core/src/emacs_core/lisp/native/subr/tests/info.rs
rename to crates/neovm-core/src/emacs_core/lisp/native/subr/tests/info_test.rs
diff --git a/crates/neovm-core/src/emacs_core/lisp/native/subr/tests/leaf_contract.rs b/crates/neovm-core/src/emacs_core/lisp/native/subr/tests/leaf_contract_test.rs
similarity index 100%
rename from crates/neovm-core/src/emacs_core/lisp/native/subr/tests/leaf_contract.rs
rename to crates/neovm-core/src/emacs_core/lisp/native/subr/tests/leaf_contract_test.rs
diff --git a/crates/neovm-core/src/emacs_core/lisp/native/subr/tests/mod.rs b/crates/neovm-core/src/emacs_core/lisp/native/subr/tests/subr_test.rs
similarity index 99%
rename from crates/neovm-core/src/emacs_core/lisp/native/subr/tests/mod.rs
rename to crates/neovm-core/src/emacs_core/lisp/native/subr/tests/subr_test.rs
index 71f6f37441..ebcaff03d2 100644
--- a/crates/neovm-core/src/emacs_core/lisp/native/subr/tests/mod.rs
+++ b/crates/neovm-core/src/emacs_core/lisp/native/subr/tests/subr_test.rs
@@ -4,6 +4,7 @@ use crate::emacs_core::intern::intern;
 use crate::emacs_core::value::Value;
 use crate::tagged::header::SubrFn;
 
+#[path = "subrs.rs"]
 mod subrs;
 
 fn zero(_ctx: &mut Context) -> crate::emacs_core::error::EvalResult {
diff --git a/crates/neovm-core/src/emacs_core/lisp/print/mod.rs b/crates/neovm-core/src/emacs_core/lisp/print/mod.rs
index 328cab41f9..1b39677853 100644
--- a/crates/neovm-core/src/emacs_core/lisp/print/mod.rs
+++ b/crates/neovm-core/src/emacs_core/lisp/print/mod.rs
@@ -2761,5 +2761,5 @@ fn threading_handle_print_name(kind: crate::tagged::header::VecLikeType) -> &'st
 }
 
 #[cfg(test)]
-#[path = "tests/mod.rs"]
+#[path = "tests/print_test.rs"]
 mod tests;
diff --git a/crates/neovm-core/src/emacs_core/lisp/print/tests/mod.rs b/crates/neovm-core/src/emacs_core/lisp/print/tests/print_test.rs
similarity index 100%
rename from crates/neovm-core/src/emacs_core/lisp/print/tests/mod.rs
rename to crates/neovm-core/src/emacs_core/lisp/print/tests/print_test.rs
diff --git a/crates/neovm-core/src/emacs_core/lisp/provide_coupled_vars/tests/runtime_surface.rs b/crates/neovm-core/src/emacs_core/lisp/provide_coupled_vars/tests/runtime_surface_test.rs
similarity index 100%
rename from crates/neovm-core/src/emacs_core/lisp/provide_coupled_vars/tests/runtime_surface.rs
rename to crates/neovm-core/src/emacs_core/lisp/provide_coupled_vars/tests/runtime_surface_test.rs
diff --git a/crates/neovm-core/src/emacs_core/lisp/reader/mod.rs b/crates/neovm-core/src/emacs_core/lisp/reader/mod.rs
index c5ec39095c..a31104d195 100644
--- a/crates/neovm-core/src/emacs_core/lisp/reader/mod.rs
+++ b/crates/neovm-core/src/emacs_core/lisp/reader/mod.rs
@@ -3396,14 +3396,14 @@ pub(crate) fn finish_read_key_sequence_vector_interactive_in_runtime(
 // Tests
 // ---------------------------------------------------------------------------
 #[cfg(test)]
-#[path = "tests/minibuffer_teardown.rs"]
+#[path = "tests/minibuffer_teardown_test.rs"]
 mod minibuffer_teardown_tests;
 #[cfg(test)]
-#[path = "tests/minibuffer_unwind_order.rs"]
+#[path = "tests/minibuffer_unwind_order_test.rs"]
 mod minibuffer_unwind_order_tests;
 #[cfg(test)]
-#[path = "tests/raw_bytes.rs"]
+#[path = "tests/raw_bytes_test.rs"]
 mod raw_bytes_tests;
 #[cfg(test)]
-#[path = "tests/mod.rs"]
+#[path = "tests/reader_test.rs"]
 mod tests;
diff --git a/crates/neovm-core/src/emacs_core/lisp/reader/tests/minibuffer_teardown.rs b/crates/neovm-core/src/emacs_core/lisp/reader/tests/minibuffer_teardown_test.rs
similarity index 100%
rename from crates/neovm-core/src/emacs_core/lisp/reader/tests/minibuffer_teardown.rs
rename to crates/neovm-core/src/emacs_core/lisp/reader/tests/minibuffer_teardown_test.rs
diff --git a/crates/neovm-core/src/emacs_core/lisp/reader/tests/minibuffer_unwind_order.rs b/crates/neovm-core/src/emacs_core/lisp/reader/tests/minibuffer_unwind_order_test.rs
similarity index 100%
rename from crates/neovm-core/src/emacs_core/lisp/reader/tests/minibuffer_unwind_order.rs
rename to crates/neovm-core/src/emacs_core/lisp/reader/tests/minibuffer_unwind_order_test.rs
diff --git a/crates/neovm-core/src/emacs_core/lisp/reader/tests/raw_bytes.rs b/crates/neovm-core/src/emacs_core/lisp/reader/tests/raw_bytes_test.rs
similarity index 100%
rename from crates/neovm-core/src/emacs_core/lisp/reader/tests/raw_bytes.rs
rename to crates/neovm-core/src/emacs_core/lisp/reader/tests/raw_bytes_test.rs
diff --git a/crates/neovm-core/src/emacs_core/lisp/reader/tests/mod.rs b/crates/neovm-core/src/emacs_core/lisp/reader/tests/reader_test.rs
similarity index 100%
rename from crates/neovm-core/src/emacs_core/lisp/reader/tests/mod.rs
rename to crates/neovm-core/src/emacs_core/lisp/reader/tests/reader_test.rs
diff --git a/crates/neovm-core/src/emacs_core/mod.rs b/crates/neovm-core/src/emacs_core/mod.rs
index d57c9b50cc..e8cb3393ff 100644
--- a/crates/neovm-core/src/emacs_core/mod.rs
+++ b/crates/neovm-core/src/emacs_core/mod.rs
@@ -373,74 +373,74 @@ pub(crate) mod zlib;
 // Cross-subsystem and externally-shaped regression suites retain the
 // `emacs_core` lexical parent while living beside the subsystem they cover.
 #[cfg(test)]
-#[path = "system/platform/c_features/tests/surface.rs"]
+#[path = "system/platform/c_features/tests/surface_test.rs"]
 mod c_features_test;
 #[cfg(test)]
 #[path = "tests/compat_regressions/mod.rs"]
 pub mod compat_regressions;
 #[cfg(test)]
-#[path = "tests/build_support/compile_main_rule.rs"]
+#[path = "tests/build_support/compile_main_rule_test.rs"]
 mod compile_main_rule_test;
 #[cfg(test)]
-#[path = "tests/build_support/generated_lisp.rs"]
+#[path = "tests/build_support/generated_lisp_test.rs"]
 mod generated_lisp_test;
 #[cfg(test)]
-#[path = "tests/gnu_surface/defvar_special.rs"]
+#[path = "tests/gnu_surface/defvar_special_test.rs"]
 mod gnu_defvar_special_test;
 #[cfg(test)]
-#[path = "tests/gnu_surface/subr.rs"]
+#[path = "tests/gnu_surface/subr_test.rs"]
 mod gnu_subr_surface_test;
 #[cfg(test)]
-#[path = "editing/undo/tests/kill_ring.rs"]
+#[path = "editing/undo/tests/kill_ring_test.rs"]
 mod kill_ring_test;
 #[cfg(test)]
-#[path = "tests/architecture/layout.rs"]
+#[path = "tests/architecture/layout_test.rs"]
 mod layout_test;
 #[cfg(test)]
-#[path = "lisp/provide_coupled_vars/tests/runtime_surface.rs"]
+#[path = "lisp/provide_coupled_vars/tests/runtime_surface_test.rs"]
 mod provide_coupled_vars_test;
 #[cfg(test)]
-#[path = "runtime/eval/tests/quit_regression.rs"]
+#[path = "runtime/eval/tests/quit_regression_test.rs"]
 mod quit_regression_test;
 #[cfg(test)]
-#[path = "tests/architecture/runtime_string_guard.rs"]
+#[path = "tests/architecture/runtime_string_guard_test.rs"]
 mod runtime_string_guard_test;
 
 #[cfg(test)]
-#[path = "display/shader_surface/tests/runtime.rs"]
+#[path = "display/shader_surface/tests/runtime_test.rs"]
 mod shader_surface_test;
 #[cfg(test)]
-#[path = "lisp/load/tests/stale_bytecode.rs"]
+#[path = "lisp/load/tests/stale_bytecode_test.rs"]
 mod stale_bytecode_test;
 #[cfg(test)]
-#[path = "runtime/symbol/tests/function_regression.rs"]
+#[path = "runtime/symbol/tests/function_regression_test.rs"]
 mod symbol_function_regression_test;
 #[cfg(test)]
-#[path = "tests/architecture/symbol_id_guard.rs"]
+#[path = "tests/architecture/symbol_id_guard_test.rs"]
 mod symbol_id_guard_test;
 #[cfg(test)]
-#[path = "runtime/symbol/tests/plist_regression.rs"]
+#[path = "runtime/symbol/tests/plist_regression_test.rs"]
 mod symbol_plist_regression_test;
 #[cfg(test)]
-#[path = "runtime/symbol/tests/redirect_regression.rs"]
+#[path = "runtime/symbol/tests/redirect_regression_test.rs"]
 mod symbol_redirect_regression_test;
 #[cfg(test)]
-#[path = "text/syntax/tests/category_property.rs"]
+#[path = "text/syntax/tests/category_property_test.rs"]
 mod syntax_category_property_test;
 #[cfg(test)]
-#[path = "text/syntax/tests/gnu_parity_regression.rs"]
+#[path = "text/syntax/tests/gnu_parity_regression_test.rs"]
 mod syntax_gnu_parity_regression_test;
 #[cfg(test)]
-#[path = "system/tls/tests/runtime.rs"]
+#[path = "system/tls/tests/runtime_test.rs"]
 mod tls_test;
 #[cfg(test)]
-#[path = "display/video/tests/runtime.rs"]
+#[path = "display/video/tests/runtime_test.rs"]
 mod video_test;
 #[cfg(test)]
-#[path = "display/window_cmds/tests/window_system_preload.rs"]
+#[path = "display/window_cmds/tests/window_system_preload_test.rs"]
 mod window_system_preload_test;
 #[cfg(test)]
-#[path = "display/xwidget/tests/runtime.rs"]
+#[path = "display/xwidget/tests/runtime_test.rs"]
 mod xwidget_test;
 
 #[derive(Clone, Debug, PartialEq, Eq)]
@@ -477,5 +477,5 @@ pub fn eval_source(input: &str) -> Result<Value, EvalError> {
 }
 
 #[cfg(test)]
-#[path = "tests/architecture/transmute_guard.rs"]
+#[path = "tests/architecture/transmute_guard_test.rs"]
 mod architecture_transmute_guard_test;
diff --git a/crates/neovm-core/src/emacs_core/runtime/alloc/mod.rs b/crates/neovm-core/src/emacs_core/runtime/alloc/mod.rs
index f4b0c088c1..cfcf49d2d1 100644
--- a/crates/neovm-core/src/emacs_core/runtime/alloc/mod.rs
+++ b/crates/neovm-core/src/emacs_core/runtime/alloc/mod.rs
@@ -38,5 +38,5 @@ pub fn register_bootstrap_vars(obarray: &mut Obarray) {
 }
 
 #[cfg(test)]
-#[path = "tests/mod.rs"]
+#[path = "tests/alloc_test.rs"]
 mod tests;
diff --git a/crates/neovm-core/src/emacs_core/runtime/alloc/tests/mod.rs b/crates/neovm-core/src/emacs_core/runtime/alloc/tests/alloc_test.rs
similarity index 100%
rename from crates/neovm-core/src/emacs_core/runtime/alloc/tests/mod.rs
rename to crates/neovm-core/src/emacs_core/runtime/alloc/tests/alloc_test.rs
diff --git a/crates/neovm-core/src/emacs_core/runtime/bytecode/arith_kind.rs b/crates/neovm-core/src/emacs_core/runtime/bytecode/arith_kind.rs
index 1ccbeb3d93..aa6632cfcb 100644
--- a/crates/neovm-core/src/emacs_core/runtime/bytecode/arith_kind.rs
+++ b/crates/neovm-core/src/emacs_core/runtime/bytecode/arith_kind.rs
@@ -132,5 +132,5 @@ impl ArithGenericKind {
 }
 
 #[cfg(test)]
-#[path = "tests/arith_kind.rs"]
+#[path = "tests/arith_kind_test.rs"]
 mod tests;
diff --git a/crates/neovm-core/src/emacs_core/runtime/bytecode/chunk.rs b/crates/neovm-core/src/emacs_core/runtime/bytecode/chunk.rs
index a02bd99f0e..04c67fb24e 100644
--- a/crates/neovm-core/src/emacs_core/runtime/bytecode/chunk.rs
+++ b/crates/neovm-core/src/emacs_core/runtime/bytecode/chunk.rs
@@ -814,5 +814,5 @@ impl ByteCodeFunction {
     }
 }
 #[cfg(test)]
-#[path = "tests/chunk.rs"]
+#[path = "tests/chunk_test.rs"]
 mod tests;
diff --git a/crates/neovm-core/src/emacs_core/runtime/bytecode/decode.rs b/crates/neovm-core/src/emacs_core/runtime/bytecode/decode.rs
index ffebeda682..f531d6fb6f 100644
--- a/crates/neovm-core/src/emacs_core/runtime/bytecode/decode.rs
+++ b/crates/neovm-core/src/emacs_core/runtime/bytecode/decode.rs
@@ -1244,5 +1244,5 @@ pub fn parse_arglist_value(arglist: &Value) -> LambdaParams {
 // Tests
 // ---------------------------------------------------------------------------
 #[cfg(test)]
-#[path = "tests/decode.rs"]
+#[path = "tests/decode_test.rs"]
 mod tests;
diff --git a/crates/neovm-core/src/emacs_core/runtime/bytecode/opcode.rs b/crates/neovm-core/src/emacs_core/runtime/bytecode/opcode.rs
index 0121ab7e70..7546cb1854 100644
--- a/crates/neovm-core/src/emacs_core/runtime/bytecode/opcode.rs
+++ b/crates/neovm-core/src/emacs_core/runtime/bytecode/opcode.rs
@@ -333,5 +333,5 @@ fn const_name(constants: &[super::super::value::Value], idx: u16) -> String {
         .to_string()
 }
 #[cfg(test)]
-#[path = "tests/opcode.rs"]
+#[path = "tests/opcode_test.rs"]
 mod tests;
diff --git a/crates/neovm-core/src/emacs_core/runtime/bytecode/resumed_chain.rs b/crates/neovm-core/src/emacs_core/runtime/bytecode/resumed_chain.rs
index 39bdb1a07e..7163076b47 100644
--- a/crates/neovm-core/src/emacs_core/runtime/bytecode/resumed_chain.rs
+++ b/crates/neovm-core/src/emacs_core/runtime/bytecode/resumed_chain.rs
@@ -528,9 +528,9 @@ impl<'a> Vm<'a> {
 }
 
 #[cfg(test)]
-#[path = "tests/resumed_chain.rs"]
+#[path = "tests/resumed_chain_test.rs"]
 mod tests;
 
 #[cfg(test)]
-#[path = "tests/osr_chain.rs"]
+#[path = "tests/osr_chain_test.rs"]
 mod osr_tests;
diff --git a/crates/neovm-core/src/emacs_core/runtime/bytecode/tests/arith_integer_fast_path.rs b/crates/neovm-core/src/emacs_core/runtime/bytecode/tests/arith_integer_fast_path_test.rs
similarity index 100%
rename from crates/neovm-core/src/emacs_core/runtime/bytecode/tests/arith_integer_fast_path.rs
rename to crates/neovm-core/src/emacs_core/runtime/bytecode/tests/arith_integer_fast_path_test.rs
diff --git a/crates/neovm-core/src/emacs_core/runtime/bytecode/tests/arith_kind.rs b/crates/neovm-core/src/emacs_core/runtime/bytecode/tests/arith_kind_test.rs
similarity index 100%
rename from crates/neovm-core/src/emacs_core/runtime/bytecode/tests/arith_kind.rs
rename to crates/neovm-core/src/emacs_core/runtime/bytecode/tests/arith_kind_test.rs
diff --git a/crates/neovm-core/src/emacs_core/runtime/bytecode/tests/builtin_result_return.rs b/crates/neovm-core/src/emacs_core/runtime/bytecode/tests/builtin_result_return_test.rs
similarity index 100%
rename from crates/neovm-core/src/emacs_core/runtime/bytecode/tests/builtin_result_return.rs
rename to crates/neovm-core/src/emacs_core/runtime/bytecode/tests/builtin_result_return_test.rs
diff --git a/crates/neovm-core/src/emacs_core/runtime/bytecode/tests/chunk.rs b/crates/neovm-core/src/emacs_core/runtime/bytecode/tests/chunk_test.rs
similarity index 100%
rename from crates/neovm-core/src/emacs_core/runtime/bytecode/tests/chunk.rs
rename to crates/neovm-core/src/emacs_core/runtime/bytecode/tests/chunk_test.rs
diff --git a/crates/neovm-core/src/emacs_core/runtime/bytecode/tests/collection_capture.rs b/crates/neovm-core/src/emacs_core/runtime/bytecode/tests/collection_capture_test.rs
similarity index 100%
rename from crates/neovm-core/src/emacs_core/runtime/bytecode/tests/collection_capture.rs
rename to crates/neovm-core/src/emacs_core/runtime/bytecode/tests/collection_capture_test.rs
diff --git a/crates/neovm-core/src/emacs_core/runtime/bytecode/tests/decode.rs b/crates/neovm-core/src/emacs_core/runtime/bytecode/tests/decode_test.rs
similarity index 100%
rename from crates/neovm-core/src/emacs_core/runtime/bytecode/tests/decode.rs
rename to crates/neovm-core/src/emacs_core/runtime/bytecode/tests/decode_test.rs
diff --git a/crates/neovm-core/src/emacs_core/runtime/bytecode/tests/opcode.rs b/crates/neovm-core/src/emacs_core/runtime/bytecode/tests/opcode_test.rs
similarity index 100%
rename from crates/neovm-core/src/emacs_core/runtime/bytecode/tests/opcode.rs
rename to crates/neovm-core/src/emacs_core/runtime/bytecode/tests/opcode_test.rs
diff --git a/crates/neovm-core/src/emacs_core/runtime/bytecode/tests/osr_chain.rs b/crates/neovm-core/src/emacs_core/runtime/bytecode/tests/osr_chain_test.rs
similarity index 100%
rename from crates/neovm-core/src/emacs_core/runtime/bytecode/tests/osr_chain.rs
rename to crates/neovm-core/src/emacs_core/runtime/bytecode/tests/osr_chain_test.rs
diff --git a/crates/neovm-core/src/emacs_core/runtime/bytecode/tests/primitive_opcode_cells.rs b/crates/neovm-core/src/emacs_core/runtime/bytecode/tests/primitive_opcode_cells_test.rs
similarity index 100%
rename from crates/neovm-core/src/emacs_core/runtime/bytecode/tests/primitive_opcode_cells.rs
rename to crates/neovm-core/src/emacs_core/runtime/bytecode/tests/primitive_opcode_cells_test.rs
diff --git a/crates/neovm-core/src/emacs_core/runtime/bytecode/tests/resumed_chain.rs b/crates/neovm-core/src/emacs_core/runtime/bytecode/tests/resumed_chain_test.rs
similarity index 100%
rename from crates/neovm-core/src/emacs_core/runtime/bytecode/tests/resumed_chain.rs
rename to crates/neovm-core/src/emacs_core/runtime/bytecode/tests/resumed_chain_test.rs
diff --git a/crates/neovm-core/src/emacs_core/runtime/bytecode/tests/stack_pool.rs b/crates/neovm-core/src/emacs_core/runtime/bytecode/tests/stack_pool_test.rs
similarity index 100%
rename from crates/neovm-core/src/emacs_core/runtime/bytecode/tests/stack_pool.rs
rename to crates/neovm-core/src/emacs_core/runtime/bytecode/tests/stack_pool_test.rs
diff --git a/crates/neovm-core/src/emacs_core/runtime/bytecode/tests/vm_leaf.rs b/crates/neovm-core/src/emacs_core/runtime/bytecode/tests/vm_leaf_test.rs
similarity index 100%
rename from crates/neovm-core/src/emacs_core/runtime/bytecode/tests/vm_leaf.rs
rename to crates/neovm-core/src/emacs_core/runtime/bytecode/tests/vm_leaf_test.rs
diff --git a/crates/neovm-core/src/emacs_core/runtime/bytecode/tests/vm.rs b/crates/neovm-core/src/emacs_core/runtime/bytecode/tests/vm_test.rs
similarity index 99%
rename from crates/neovm-core/src/emacs_core/runtime/bytecode/tests/vm.rs
rename to crates/neovm-core/src/emacs_core/runtime/bytecode/tests/vm_test.rs
index e42216183e..d4f7ff727a 100644
--- a/crates/neovm-core/src/emacs_core/runtime/bytecode/tests/vm.rs
+++ b/crates/neovm-core/src/emacs_core/runtime/bytecode/tests/vm_test.rs
@@ -11,7 +11,7 @@ use std::path::Path;
 use std::rc::Rc;
 
 #[cfg(test)]
-#[path = "primitive_opcode_cells.rs"]
+#[path = "primitive_opcode_cells_test.rs"]
 mod primitive_opcode_cells;
 
 fn new_vm(eval: &mut Context) -> Vm<'_> {
diff --git a/crates/neovm-core/src/emacs_core/runtime/bytecode/vm.rs b/crates/neovm-core/src/emacs_core/runtime/bytecode/vm.rs
index 3239ec0acc..3bbeef7e96 100644
--- a/crates/neovm-core/src/emacs_core/runtime/bytecode/vm.rs
+++ b/crates/neovm-core/src/emacs_core/runtime/bytecode/vm.rs
@@ -9733,23 +9733,23 @@ pub(crate) mod resumed_chain_probe;
 pub(crate) use vm_leaf::render_vm_leaf_stats;
 
 #[cfg(test)]
-#[path = "tests/vm.rs"]
+#[path = "tests/vm_test.rs"]
 mod tests;
 
 #[cfg(test)]
-#[path = "tests/builtin_result_return.rs"]
+#[path = "tests/builtin_result_return_test.rs"]
 mod builtin_result_return_tests;
 
 #[cfg(test)]
-#[path = "tests/arith_integer_fast_path.rs"]
+#[path = "tests/arith_integer_fast_path_test.rs"]
 mod arith_integer_fast_path_tests;
 
 #[cfg(test)]
-#[path = "tests/collection_capture.rs"]
+#[path = "tests/collection_capture_test.rs"]
 mod collection_capture_tests;
 
 #[cfg(test)]
-#[path = "tests/stack_pool.rs"]
+#[path = "tests/stack_pool_test.rs"]
 mod stack_pool_tests;
 
 impl ArithGenericKind {
diff --git a/crates/neovm-core/src/emacs_core/runtime/bytecode/vm_leaf.rs b/crates/neovm-core/src/emacs_core/runtime/bytecode/vm_leaf.rs
index 48ef2f62bc..a393689bf5 100644
--- a/crates/neovm-core/src/emacs_core/runtime/bytecode/vm_leaf.rs
+++ b/crates/neovm-core/src/emacs_core/runtime/bytecode/vm_leaf.rs
@@ -232,5 +232,5 @@ impl Vm<'_> {
 }
 
 #[cfg(test)]
-#[path = "tests/vm_leaf.rs"]
+#[path = "tests/vm_leaf_test.rs"]
 mod vm_leaf_tests;
diff --git a/crates/neovm-core/src/emacs_core/runtime/data/mod.rs b/crates/neovm-core/src/emacs_core/runtime/data/mod.rs
index 242206cd51..ce1648cc2a 100644
--- a/crates/neovm-core/src/emacs_core/runtime/data/mod.rs
+++ b/crates/neovm-core/src/emacs_core/runtime/data/mod.rs
@@ -316,4 +316,5 @@ pub(crate) fn default_value_in_state(
 }
 
 #[cfg(test)]
+#[path = "tests/data_test.rs"]
 mod tests;
diff --git a/crates/neovm-core/src/emacs_core/runtime/data/tests/mod.rs b/crates/neovm-core/src/emacs_core/runtime/data/tests/data_test.rs
similarity index 100%
rename from crates/neovm-core/src/emacs_core/runtime/data/tests/mod.rs
rename to crates/neovm-core/src/emacs_core/runtime/data/tests/data_test.rs
diff --git a/crates/neovm-core/src/emacs_core/runtime/debug/mod.rs b/crates/neovm-core/src/emacs_core/runtime/debug/mod.rs
index dde1485b0e..b881fb3fa0 100644
--- a/crates/neovm-core/src/emacs_core/runtime/debug/mod.rs
+++ b/crates/neovm-core/src/emacs_core/runtime/debug/mod.rs
@@ -637,5 +637,5 @@ fn format_param_list(params: &super::value::LambdaParams) -> String {
 // Tests
 // ---------------------------------------------------------------------------
 #[cfg(test)]
-#[path = "tests/mod.rs"]
+#[path = "tests/debug_test.rs"]
 mod tests;
diff --git a/crates/neovm-core/src/emacs_core/runtime/debug/tests/mod.rs b/crates/neovm-core/src/emacs_core/runtime/debug/tests/debug_test.rs
similarity index 100%
rename from crates/neovm-core/src/emacs_core/runtime/debug/tests/mod.rs
rename to crates/neovm-core/src/emacs_core/runtime/debug/tests/debug_test.rs
diff --git a/crates/neovm-core/src/emacs_core/runtime/debug_on_call/mod.rs b/crates/neovm-core/src/emacs_core/runtime/debug_on_call/mod.rs
index f6f72e7073..dc6780e88b 100644
--- a/crates/neovm-core/src/emacs_core/runtime/debug_on_call/mod.rs
+++ b/crates/neovm-core/src/emacs_core/runtime/debug_on_call/mod.rs
@@ -338,5 +338,5 @@ impl Context {
 }
 
 #[cfg(test)]
-#[path = "tests/mod.rs"]
+#[path = "tests/debug_on_call_test.rs"]
 mod tests;
diff --git a/crates/neovm-core/src/emacs_core/runtime/debug_on_call/tests/mod.rs b/crates/neovm-core/src/emacs_core/runtime/debug_on_call/tests/debug_on_call_test.rs
similarity index 100%
rename from crates/neovm-core/src/emacs_core/runtime/debug_on_call/tests/mod.rs
rename to crates/neovm-core/src/emacs_core/runtime/debug_on_call/tests/debug_on_call_test.rs
diff --git a/crates/neovm-core/src/emacs_core/runtime/error/mod.rs b/crates/neovm-core/src/emacs_core/runtime/error/mod.rs
index d7641de51c..5d88bb7007 100644
--- a/crates/neovm-core/src/emacs_core/runtime/error/mod.rs
+++ b/crates/neovm-core/src/emacs_core/runtime/error/mod.rs
@@ -2090,10 +2090,10 @@ pub fn format_eval_result_bytes_with_eval(
     out
 }
 #[cfg(test)]
-#[path = "tests/flow_kind.rs"]
+#[path = "tests/flow_kind_test.rs"]
 mod flow_kind_tests;
 #[cfg(test)]
-#[path = "tests/mod.rs"]
+#[path = "tests/error_test.rs"]
 mod tests;
 
 /// Signal wrong-number-of-arguments unless `args` has exactly `n` items.
@@ -2288,13 +2288,13 @@ impl super::eval::Context {
 }
 
 #[cfg(test)]
-#[path = "tests/gc_tls_ownership.rs"]
+#[path = "tests/gc_tls_ownership_test.rs"]
 mod gc_tls_ownership_tests;
 
 #[cfg(test)]
-#[path = "tests/flow_word.rs"]
+#[path = "tests/flow_word_test.rs"]
 mod flow_word_tests;
 
 #[cfg(test)]
-#[path = "tests/flow_word_gc.rs"]
+#[path = "tests/flow_word_gc_test.rs"]
 mod flow_word_gc_tests;
diff --git a/crates/neovm-core/src/emacs_core/runtime/error/tests/mod.rs b/crates/neovm-core/src/emacs_core/runtime/error/tests/error_test.rs
similarity index 100%
rename from crates/neovm-core/src/emacs_core/runtime/error/tests/mod.rs
rename to crates/neovm-core/src/emacs_core/runtime/error/tests/error_test.rs
diff --git a/crates/neovm-core/src/emacs_core/runtime/error/tests/flow_kind.rs b/crates/neovm-core/src/emacs_core/runtime/error/tests/flow_kind_test.rs
similarity index 100%
rename from crates/neovm-core/src/emacs_core/runtime/error/tests/flow_kind.rs
rename to crates/neovm-core/src/emacs_core/runtime/error/tests/flow_kind_test.rs
diff --git a/crates/neovm-core/src/emacs_core/runtime/error/tests/flow_word_gc.rs b/crates/neovm-core/src/emacs_core/runtime/error/tests/flow_word_gc_test.rs
similarity index 100%
rename from crates/neovm-core/src/emacs_core/runtime/error/tests/flow_word_gc.rs
rename to crates/neovm-core/src/emacs_core/runtime/error/tests/flow_word_gc_test.rs
diff --git a/crates/neovm-core/src/emacs_core/runtime/error/tests/flow_word.rs b/crates/neovm-core/src/emacs_core/runtime/error/tests/flow_word_test.rs
similarity index 100%
rename from crates/neovm-core/src/emacs_core/runtime/error/tests/flow_word.rs
rename to crates/neovm-core/src/emacs_core/runtime/error/tests/flow_word_test.rs
diff --git a/crates/neovm-core/src/emacs_core/runtime/error/tests/gc_tls_ownership.rs b/crates/neovm-core/src/emacs_core/runtime/error/tests/gc_tls_ownership_test.rs
similarity index 100%
rename from crates/neovm-core/src/emacs_core/runtime/error/tests/gc_tls_ownership.rs
rename to crates/neovm-core/src/emacs_core/runtime/error/tests/gc_tls_ownership_test.rs
diff --git a/crates/neovm-core/src/emacs_core/runtime/errors/mod.rs b/crates/neovm-core/src/emacs_core/runtime/errors/mod.rs
index b87781b205..239286dd14 100644
--- a/crates/neovm-core/src/emacs_core/runtime/errors/mod.rs
+++ b/crates/neovm-core/src/emacs_core/runtime/errors/mod.rs
@@ -1369,5 +1369,5 @@ impl Default for ErrorRegistry {
 // Tests
 // ---------------------------------------------------------------------------
 #[cfg(test)]
-#[path = "tests/mod.rs"]
+#[path = "tests/errors_test.rs"]
 mod tests;
diff --git a/crates/neovm-core/src/emacs_core/runtime/errors/tests/mod.rs b/crates/neovm-core/src/emacs_core/runtime/errors/tests/errors_test.rs
similarity index 100%
rename from crates/neovm-core/src/emacs_core/runtime/errors/tests/mod.rs
rename to crates/neovm-core/src/emacs_core/runtime/errors/tests/errors_test.rs
diff --git a/crates/neovm-core/src/emacs_core/runtime/eval/attention.rs b/crates/neovm-core/src/emacs_core/runtime/eval/attention.rs
index bc97a564f0..a0624181e1 100644
--- a/crates/neovm-core/src/emacs_core/runtime/eval/attention.rs
+++ b/crates/neovm-core/src/emacs_core/runtime/eval/attention.rs
@@ -361,5 +361,5 @@ impl Drop for QuitRequestCell {
 }
 
 #[cfg(test)]
-#[path = "tests/quit_request.rs"]
+#[path = "tests/quit_request_test.rs"]
 mod quit_request_tests;
diff --git a/crates/neovm-core/src/emacs_core/runtime/eval/callback.rs b/crates/neovm-core/src/emacs_core/runtime/eval/callback.rs
index 5c315eaf43..01177df9b1 100644
--- a/crates/neovm-core/src/emacs_core/runtime/eval/callback.rs
+++ b/crates/neovm-core/src/emacs_core/runtime/eval/callback.rs
@@ -174,5 +174,5 @@ impl Context {
 }
 
 #[cfg(test)]
-#[path = "tests/native_callback_cache.rs"]
+#[path = "tests/native_callback_cache_test.rs"]
 mod native_callback_cache;
diff --git a/crates/neovm-core/src/emacs_core/runtime/eval/command_loop.rs b/crates/neovm-core/src/emacs_core/runtime/eval/command_loop.rs
index 232ca365fe..772707c838 100644
--- a/crates/neovm-core/src/emacs_core/runtime/eval/command_loop.rs
+++ b/crates/neovm-core/src/emacs_core/runtime/eval/command_loop.rs
@@ -3297,9 +3297,9 @@ impl Context {
 
 #[cfg(test)]
 #[cfg(debug_assertions)]
-#[path = "tests/gc_heap_mut_closure.rs"]
+#[path = "tests/gc_heap_mut_closure_test.rs"]
 mod gc_heap_mut_closure_tests;
 
 #[cfg(test)]
-#[path = "tests/chrome_transitions.rs"]
+#[path = "tests/chrome_transitions_test.rs"]
 mod chrome_transition_tests;
diff --git a/crates/neovm-core/src/emacs_core/runtime/eval/mod.rs b/crates/neovm-core/src/emacs_core/runtime/eval/mod.rs
index b37c55e2b7..c8f482585a 100644
--- a/crates/neovm-core/src/emacs_core/runtime/eval/mod.rs
+++ b/crates/neovm-core/src/emacs_core/runtime/eval/mod.rs
@@ -7736,90 +7736,90 @@ pub(crate) use form_head_cache::FormHeadCache;
 use form_head_cache::{FormHead, HeadClass};
 
 #[cfg(test)]
-#[path = "tests/mod.rs"]
+#[path = "tests/eval_test.rs"]
 mod tests;
 
 // task3-jitcrash-diag: diagnostic repros for the pre-existing JIT
 // heap-corruption crash (no fix here).
 #[cfg(test)]
-#[path = "tests/jit_crash_repro.rs"]
+#[path = "tests/jit_crash_repro_test.rs"]
 mod jit_crash_repro_tests;
 
 // JIT call seam slice C1: the interpreter's direct entry into armed leaves.
 #[cfg(test)]
-#[path = "tests/jit_leaf_slot.rs"]
+#[path = "tests/jit_leaf_slot_test.rs"]
 mod jit_leaf_slot_tests;
 
 // Baseline known-fixnum analysis must honour Float feedback (silent-miscompile regression).
 #[cfg(test)]
-#[path = "tests/jit_known_fixnum_float.rs"]
+#[path = "tests/jit_known_fixnum_float_test.rs"]
 mod jit_known_fixnum_float_tests;
 #[cfg(test)]
-#[path = "tests/jit_mir_known_fixnum_float.rs"]
+#[path = "tests/jit_mir_known_fixnum_float_test.rs"]
 mod jit_mir_known_fixnum_float_tests;
 // Unboxed float slots on GNU's own nbody `elb-applyforces` bytecode.
 #[cfg(test)]
-#[path = "tests/jit_flonum_nbody.rs"]
+#[path = "tests/jit_flonum_nbody_test.rs"]
 mod jit_flonum_nbody_tests;
 // `setq` of a special variable: the plain-cell fast path and every shape it must refuse.
 #[cfg(test)]
-#[path = "tests/apply1_bytecode.rs"]
+#[path = "tests/apply1_bytecode_test.rs"]
 mod apply1_bytecode_tests;
 #[cfg(test)]
-#[path = "tests/apply2_bytecode.rs"]
+#[path = "tests/apply2_bytecode_test.rs"]
 mod apply2_bytecode_tests;
 #[cfg(test)]
-#[path = "tests/varset_plain_fast_path.rs"]
+#[path = "tests/varset_plain_fast_path_test.rs"]
 mod varset_plain_fast_path_tests;
 // Every variable shape through bytecode read/setq/let/unbind, both engines.
 #[cfg(test)]
-#[path = "tests/cconv_memo.rs"]
+#[path = "tests/cconv_memo_test.rs"]
 mod cconv_memo_tests;
 #[cfg(test)]
-#[path = "tests/var_fast.rs"]
+#[path = "tests/var_fast_test.rs"]
 mod var_fast_tests;
 
 #[cfg(test)]
-#[path = "tests/builtin_vars.rs"]
+#[path = "tests/builtin_vars_test.rs"]
 mod builtin_vars_tests;
 
 #[cfg(test)]
-#[path = "tests/gc_sweep_cap.rs"]
+#[path = "tests/gc_sweep_cap_test.rs"]
 mod gc_sweep_cap_tests;
 
 #[cfg(test)]
-#[path = "tests/gc_forced_first_cycle.rs"]
+#[path = "tests/gc_forced_first_cycle_test.rs"]
 mod gc_forced_first_cycle_tests;
 
 #[cfg(test)]
-#[path = "tests/gc_root_ownership.rs"]
+#[path = "tests/gc_root_ownership_test.rs"]
 mod gc_root_ownership_tests;
 
 #[cfg(test)]
-#[path = "tests/gc_tls_ownership.rs"]
+#[path = "tests/gc_tls_ownership_test.rs"]
 mod gc_tls_ownership_tests;
 
 #[cfg(test)]
-#[path = "tests/gc_tls_migration_proofs.rs"]
+#[path = "tests/gc_tls_migration_proofs_test.rs"]
 mod gc_tls_migration_proof_tests;
 
 // The attention word: every writer of its inputs keeps it derived.
 #[cfg(test)]
-#[path = "tests/attention.rs"]
+#[path = "tests/attention_test.rs"]
 mod attention_word_tests;
 
 #[cfg(test)]
-#[path = "tests/idle_redisplay.rs"]
+#[path = "tests/idle_redisplay_test.rs"]
 mod idle_redisplay_tests;
 
 #[cfg(test)]
-#[path = "tests/redisplay_mode_line_flow.rs"]
+#[path = "tests/redisplay_mode_line_flow_test.rs"]
 mod redisplay_mode_line_flow_tests;
 
 // The debug leaf guard: GC safe points, Lisp entries and binding pushes
 // refuse to run under a leaf builtin, and leaves leave state untouched.
 #[cfg(all(test, debug_assertions))]
-#[path = "tests/leaf_guard.rs"]
+#[path = "tests/leaf_guard_test.rs"]
 mod leaf_guard_tests;
 
 /// Allocator for [`Context::context_instance_id`].
diff --git a/crates/neovm-core/src/emacs_core/runtime/eval/native_stack.rs b/crates/neovm-core/src/emacs_core/runtime/eval/native_stack.rs
index 0e5381b3bc..693c12e3cb 100644
--- a/crates/neovm-core/src/emacs_core/runtime/eval/native_stack.rs
+++ b/crates/neovm-core/src/emacs_core/runtime/eval/native_stack.rs
@@ -232,5 +232,5 @@ impl Context {
 }
 
 #[cfg(test)]
-#[path = "tests/native_stack.rs"]
+#[path = "tests/native_stack_test.rs"]
 mod tests;
diff --git a/crates/neovm-core/src/emacs_core/runtime/eval/redisplay_hooks.rs b/crates/neovm-core/src/emacs_core/runtime/eval/redisplay_hooks.rs
index e328de0531..945790e31c 100644
--- a/crates/neovm-core/src/emacs_core/runtime/eval/redisplay_hooks.rs
+++ b/crates/neovm-core/src/emacs_core/runtime/eval/redisplay_hooks.rs
@@ -1021,11 +1021,11 @@ impl Drop for RedisplayTransaction<'_> {
 }
 
 #[cfg(test)]
-#[path = "tests/redisplay_hook_ownership.rs"]
+#[path = "tests/redisplay_hook_ownership_test.rs"]
 mod tests;
 
 #[cfg(test)]
-#[path = "redisplay_hooks/tests/mode_line_flow.rs"]
+#[path = "redisplay_hooks/tests/mode_line_flow_test.rs"]
 mod mode_line_flow_tests;
 
 /// Temporary echo source, matching with_echo_area_buffer's owned unwind.
@@ -1247,17 +1247,17 @@ impl Drop for CommittedScrollGuard<'_> {
 }
 
 #[cfg(test)]
-#[path = "tests/redisplay_mini_only.rs"]
+#[path = "tests/redisplay_mini_only_test.rs"]
 mod mini_only_tests;
 
 #[cfg(test)]
-#[path = "tests/redisplay_mini_preparer_context.rs"]
+#[path = "tests/redisplay_mini_preparer_context_test.rs"]
 mod mini_preparer_context_tests;
 
 #[cfg(test)]
-#[path = "tests/redisplay_mini_source_eligibility.rs"]
+#[path = "tests/redisplay_mini_source_eligibility_test.rs"]
 mod mini_source_eligibility_tests;
 
 #[cfg(test)]
-#[path = "tests/redisplay_transaction_owner.rs"]
+#[path = "tests/redisplay_transaction_owner_test.rs"]
 mod transaction_owner_tests;
diff --git a/crates/neovm-core/src/emacs_core/runtime/eval/redisplay_hooks/echo_message.rs b/crates/neovm-core/src/emacs_core/runtime/eval/redisplay_hooks/echo_message.rs
index 307d332350..e24cf52177 100644
--- a/crates/neovm-core/src/emacs_core/runtime/eval/redisplay_hooks/echo_message.rs
+++ b/crates/neovm-core/src/emacs_core/runtime/eval/redisplay_hooks/echo_message.rs
@@ -113,5 +113,5 @@ impl Drop for MessageEchoPreparation<'_> {
 }
 
 #[cfg(test)]
-#[path = "tests/echo_message.rs"]
+#[path = "tests/echo_message_test.rs"]
 mod tests;
diff --git a/crates/neovm-core/src/emacs_core/runtime/eval/redisplay_hooks/tests/echo_message.rs b/crates/neovm-core/src/emacs_core/runtime/eval/redisplay_hooks/tests/echo_message_test.rs
similarity index 100%
rename from crates/neovm-core/src/emacs_core/runtime/eval/redisplay_hooks/tests/echo_message.rs
rename to crates/neovm-core/src/emacs_core/runtime/eval/redisplay_hooks/tests/echo_message_test.rs
diff --git a/crates/neovm-core/src/emacs_core/runtime/eval/redisplay_hooks/tests/mode_line_flow.rs b/crates/neovm-core/src/emacs_core/runtime/eval/redisplay_hooks/tests/mode_line_flow_test.rs
similarity index 100%
rename from crates/neovm-core/src/emacs_core/runtime/eval/redisplay_hooks/tests/mode_line_flow.rs
rename to crates/neovm-core/src/emacs_core/runtime/eval/redisplay_hooks/tests/mode_line_flow_test.rs
diff --git a/crates/neovm-core/src/emacs_core/runtime/eval/tests/apply1_bytecode.rs b/crates/neovm-core/src/emacs_core/runtime/eval/tests/apply1_bytecode_test.rs
similarity index 100%
rename from crates/neovm-core/src/emacs_core/runtime/eval/tests/apply1_bytecode.rs
rename to crates/neovm-core/src/emacs_core/runtime/eval/tests/apply1_bytecode_test.rs
diff --git a/crates/neovm-core/src/emacs_core/runtime/eval/tests/apply2_bytecode.rs b/crates/neovm-core/src/emacs_core/runtime/eval/tests/apply2_bytecode_test.rs
similarity index 100%
rename from crates/neovm-core/src/emacs_core/runtime/eval/tests/apply2_bytecode.rs
rename to crates/neovm-core/src/emacs_core/runtime/eval/tests/apply2_bytecode_test.rs
diff --git a/crates/neovm-core/src/emacs_core/runtime/eval/tests/attention.rs b/crates/neovm-core/src/emacs_core/runtime/eval/tests/attention_test.rs
similarity index 100%
rename from crates/neovm-core/src/emacs_core/runtime/eval/tests/attention.rs
rename to crates/neovm-core/src/emacs_core/runtime/eval/tests/attention_test.rs
diff --git a/crates/neovm-core/src/emacs_core/runtime/eval/tests/builtin_vars.rs b/crates/neovm-core/src/emacs_core/runtime/eval/tests/builtin_vars_test.rs
similarity index 100%
rename from crates/neovm-core/src/emacs_core/runtime/eval/tests/builtin_vars.rs
rename to crates/neovm-core/src/emacs_core/runtime/eval/tests/builtin_vars_test.rs
diff --git a/crates/neovm-core/src/emacs_core/runtime/eval/tests/cconv_memo.rs b/crates/neovm-core/src/emacs_core/runtime/eval/tests/cconv_memo_test.rs
similarity index 100%
rename from crates/neovm-core/src/emacs_core/runtime/eval/tests/cconv_memo.rs
rename to crates/neovm-core/src/emacs_core/runtime/eval/tests/cconv_memo_test.rs
diff --git a/crates/neovm-core/src/emacs_core/runtime/eval/tests/chrome_transitions.rs b/crates/neovm-core/src/emacs_core/runtime/eval/tests/chrome_transitions_test.rs
similarity index 100%
rename from crates/neovm-core/src/emacs_core/runtime/eval/tests/chrome_transitions.rs
rename to crates/neovm-core/src/emacs_core/runtime/eval/tests/chrome_transitions_test.rs
diff --git a/crates/neovm-core/src/emacs_core/runtime/eval/tests/circular_lists.rs b/crates/neovm-core/src/emacs_core/runtime/eval/tests/circular_lists_test.rs
similarity index 100%
rename from crates/neovm-core/src/emacs_core/runtime/eval/tests/circular_lists.rs
rename to crates/neovm-core/src/emacs_core/runtime/eval/tests/circular_lists_test.rs
diff --git a/crates/neovm-core/src/emacs_core/runtime/eval/tests/mod.rs b/crates/neovm-core/src/emacs_core/runtime/eval/tests/eval_test.rs
similarity index 99%
rename from crates/neovm-core/src/emacs_core/runtime/eval/tests/mod.rs
rename to crates/neovm-core/src/emacs_core/runtime/eval/tests/eval_test.rs
index cfd15aff9a..620631c412 100644
--- a/crates/neovm-core/src/emacs_core/runtime/eval/tests/mod.rs
+++ b/crates/neovm-core/src/emacs_core/runtime/eval/tests/eval_test.rs
@@ -1,12 +1,15 @@
 use super::*;
 
 #[cfg(test)]
+#[path = "gc_generational_test.rs"]
 mod gc_generational;
 
 #[cfg(test)]
+#[path = "gc_generational_major_test.rs"]
 mod gc_generational_major;
 
 #[cfg(test)]
+#[path = "gc_generational_pacing_test.rs"]
 mod gc_generational_pacing;
 use crate::buffer::EmacsByteRange;
 fn test_ob() -> crate::emacs_core::symbol::Obarray {
@@ -28045,4 +28048,5 @@ fn fontset_changes_invalidate_redisplay_skip_signature() {
 }
 
 #[cfg(test)]
+#[path = "circular_lists_test.rs"]
 mod circular_lists;
diff --git a/crates/neovm-core/src/emacs_core/runtime/eval/tests/gc_forced_first_cycle.rs b/crates/neovm-core/src/emacs_core/runtime/eval/tests/gc_forced_first_cycle_test.rs
similarity index 100%
rename from crates/neovm-core/src/emacs_core/runtime/eval/tests/gc_forced_first_cycle.rs
rename to crates/neovm-core/src/emacs_core/runtime/eval/tests/gc_forced_first_cycle_test.rs
diff --git a/crates/neovm-core/src/emacs_core/runtime/eval/tests/gc_generational_major.rs b/crates/neovm-core/src/emacs_core/runtime/eval/tests/gc_generational_major_test.rs
similarity index 100%
rename from crates/neovm-core/src/emacs_core/runtime/eval/tests/gc_generational_major.rs
rename to crates/neovm-core/src/emacs_core/runtime/eval/tests/gc_generational_major_test.rs
diff --git a/crates/neovm-core/src/emacs_core/runtime/eval/tests/gc_generational_pacing.rs b/crates/neovm-core/src/emacs_core/runtime/eval/tests/gc_generational_pacing_test.rs
similarity index 100%
rename from crates/neovm-core/src/emacs_core/runtime/eval/tests/gc_generational_pacing.rs
rename to crates/neovm-core/src/emacs_core/runtime/eval/tests/gc_generational_pacing_test.rs
diff --git a/crates/neovm-core/src/emacs_core/runtime/eval/tests/gc_generational.rs b/crates/neovm-core/src/emacs_core/runtime/eval/tests/gc_generational_test.rs
similarity index 100%
rename from crates/neovm-core/src/emacs_core/runtime/eval/tests/gc_generational.rs
rename to crates/neovm-core/src/emacs_core/runtime/eval/tests/gc_generational_test.rs
diff --git a/crates/neovm-core/src/emacs_core/runtime/eval/tests/gc_heap_mut_closure.rs b/crates/neovm-core/src/emacs_core/runtime/eval/tests/gc_heap_mut_closure_test.rs
similarity index 100%
rename from crates/neovm-core/src/emacs_core/runtime/eval/tests/gc_heap_mut_closure.rs
rename to crates/neovm-core/src/emacs_core/runtime/eval/tests/gc_heap_mut_closure_test.rs
diff --git a/crates/neovm-core/src/emacs_core/runtime/eval/tests/gc_root_ownership.rs b/crates/neovm-core/src/emacs_core/runtime/eval/tests/gc_root_ownership_test.rs
similarity index 100%
rename from crates/neovm-core/src/emacs_core/runtime/eval/tests/gc_root_ownership.rs
rename to crates/neovm-core/src/emacs_core/runtime/eval/tests/gc_root_ownership_test.rs
diff --git a/crates/neovm-core/src/emacs_core/runtime/eval/tests/gc_sweep_cap.rs b/crates/neovm-core/src/emacs_core/runtime/eval/tests/gc_sweep_cap_test.rs
similarity index 100%
rename from crates/neovm-core/src/emacs_core/runtime/eval/tests/gc_sweep_cap.rs
rename to crates/neovm-core/src/emacs_core/runtime/eval/tests/gc_sweep_cap_test.rs
diff --git a/crates/neovm-core/src/emacs_core/runtime/eval/tests/gc_tls_migration_proofs.rs b/crates/neovm-core/src/emacs_core/runtime/eval/tests/gc_tls_migration_proofs_test.rs
similarity index 100%
rename from crates/neovm-core/src/emacs_core/runtime/eval/tests/gc_tls_migration_proofs.rs
rename to crates/neovm-core/src/emacs_core/runtime/eval/tests/gc_tls_migration_proofs_test.rs
diff --git a/crates/neovm-core/src/emacs_core/runtime/eval/tests/gc_tls_ownership.rs b/crates/neovm-core/src/emacs_core/runtime/eval/tests/gc_tls_ownership_test.rs
similarity index 100%
rename from crates/neovm-core/src/emacs_core/runtime/eval/tests/gc_tls_ownership.rs
rename to crates/neovm-core/src/emacs_core/runtime/eval/tests/gc_tls_ownership_test.rs
diff --git a/crates/neovm-core/src/emacs_core/runtime/eval/tests/idle_redisplay.rs b/crates/neovm-core/src/emacs_core/runtime/eval/tests/idle_redisplay_test.rs
similarity index 100%
rename from crates/neovm-core/src/emacs_core/runtime/eval/tests/idle_redisplay.rs
rename to crates/neovm-core/src/emacs_core/runtime/eval/tests/idle_redisplay_test.rs
diff --git a/crates/neovm-core/src/emacs_core/runtime/eval/tests/jit_crash_repro.rs b/crates/neovm-core/src/emacs_core/runtime/eval/tests/jit_crash_repro_test.rs
similarity index 100%
rename from crates/neovm-core/src/emacs_core/runtime/eval/tests/jit_crash_repro.rs
rename to crates/neovm-core/src/emacs_core/runtime/eval/tests/jit_crash_repro_test.rs
diff --git a/crates/neovm-core/src/emacs_core/runtime/eval/tests/jit_flonum_nbody.rs b/crates/neovm-core/src/emacs_core/runtime/eval/tests/jit_flonum_nbody_test.rs
similarity index 100%
rename from crates/neovm-core/src/emacs_core/runtime/eval/tests/jit_flonum_nbody.rs
rename to crates/neovm-core/src/emacs_core/runtime/eval/tests/jit_flonum_nbody_test.rs
diff --git a/crates/neovm-core/src/emacs_core/runtime/eval/tests/jit_known_fixnum_float.rs b/crates/neovm-core/src/emacs_core/runtime/eval/tests/jit_known_fixnum_float_test.rs
similarity index 100%
rename from crates/neovm-core/src/emacs_core/runtime/eval/tests/jit_known_fixnum_float.rs
rename to crates/neovm-core/src/emacs_core/runtime/eval/tests/jit_known_fixnum_float_test.rs
diff --git a/crates/neovm-core/src/emacs_core/runtime/eval/tests/jit_leaf_slot.rs b/crates/neovm-core/src/emacs_core/runtime/eval/tests/jit_leaf_slot_test.rs
similarity index 100%
rename from crates/neovm-core/src/emacs_core/runtime/eval/tests/jit_leaf_slot.rs
rename to crates/neovm-core/src/emacs_core/runtime/eval/tests/jit_leaf_slot_test.rs
diff --git a/crates/neovm-core/src/emacs_core/runtime/eval/tests/jit_mir_known_fixnum_float.rs b/crates/neovm-core/src/emacs_core/runtime/eval/tests/jit_mir_known_fixnum_float_test.rs
similarity index 100%
rename from crates/neovm-core/src/emacs_core/runtime/eval/tests/jit_mir_known_fixnum_float.rs
rename to crates/neovm-core/src/emacs_core/runtime/eval/tests/jit_mir_known_fixnum_float_test.rs
diff --git a/crates/neovm-core/src/emacs_core/runtime/eval/tests/leaf_guard.rs b/crates/neovm-core/src/emacs_core/runtime/eval/tests/leaf_guard_test.rs
similarity index 100%
rename from crates/neovm-core/src/emacs_core/runtime/eval/tests/leaf_guard.rs
rename to crates/neovm-core/src/emacs_core/runtime/eval/tests/leaf_guard_test.rs
diff --git a/crates/neovm-core/src/emacs_core/runtime/eval/tests/native_callback_cache.rs b/crates/neovm-core/src/emacs_core/runtime/eval/tests/native_callback_cache_test.rs
similarity index 100%
rename from crates/neovm-core/src/emacs_core/runtime/eval/tests/native_callback_cache.rs
rename to crates/neovm-core/src/emacs_core/runtime/eval/tests/native_callback_cache_test.rs
diff --git a/crates/neovm-core/src/emacs_core/runtime/eval/tests/native_stack.rs b/crates/neovm-core/src/emacs_core/runtime/eval/tests/native_stack_test.rs
similarity index 100%
rename from crates/neovm-core/src/emacs_core/runtime/eval/tests/native_stack.rs
rename to crates/neovm-core/src/emacs_core/runtime/eval/tests/native_stack_test.rs
diff --git a/crates/neovm-core/src/emacs_core/runtime/eval/tests/quit_regression.rs b/crates/neovm-core/src/emacs_core/runtime/eval/tests/quit_regression_test.rs
similarity index 100%
rename from crates/neovm-core/src/emacs_core/runtime/eval/tests/quit_regression.rs
rename to crates/neovm-core/src/emacs_core/runtime/eval/tests/quit_regression_test.rs
diff --git a/crates/neovm-core/src/emacs_core/runtime/eval/tests/quit_request.rs b/crates/neovm-core/src/emacs_core/runtime/eval/tests/quit_request_test.rs
similarity index 100%
rename from crates/neovm-core/src/emacs_core/runtime/eval/tests/quit_request.rs
rename to crates/neovm-core/src/emacs_core/runtime/eval/tests/quit_request_test.rs
diff --git a/crates/neovm-core/src/emacs_core/runtime/eval/tests/redisplay_hook_ownership.rs b/crates/neovm-core/src/emacs_core/runtime/eval/tests/redisplay_hook_ownership_test.rs
similarity index 100%
rename from crates/neovm-core/src/emacs_core/runtime/eval/tests/redisplay_hook_ownership.rs
rename to crates/neovm-core/src/emacs_core/runtime/eval/tests/redisplay_hook_ownership_test.rs
diff --git a/crates/neovm-core/src/emacs_core/runtime/eval/tests/redisplay_mini_only.rs b/crates/neovm-core/src/emacs_core/runtime/eval/tests/redisplay_mini_only_test.rs
similarity index 100%
rename from crates/neovm-core/src/emacs_core/runtime/eval/tests/redisplay_mini_only.rs
rename to crates/neovm-core/src/emacs_core/runtime/eval/tests/redisplay_mini_only_test.rs
diff --git a/crates/neovm-core/src/emacs_core/runtime/eval/tests/redisplay_mini_preparer_context.rs b/crates/neovm-core/src/emacs_core/runtime/eval/tests/redisplay_mini_preparer_context_test.rs
similarity index 100%
rename from crates/neovm-core/src/emacs_core/runtime/eval/tests/redisplay_mini_preparer_context.rs
rename to crates/neovm-core/src/emacs_core/runtime/eval/tests/redisplay_mini_preparer_context_test.rs
diff --git a/crates/neovm-core/src/emacs_core/runtime/eval/tests/redisplay_mini_source_eligibility.rs b/crates/neovm-core/src/emacs_core/runtime/eval/tests/redisplay_mini_source_eligibility_test.rs
similarity index 100%
rename from crates/neovm-core/src/emacs_core/runtime/eval/tests/redisplay_mini_source_eligibility.rs
rename to crates/neovm-core/src/emacs_core/runtime/eval/tests/redisplay_mini_source_eligibility_test.rs
diff --git a/crates/neovm-core/src/emacs_core/runtime/eval/tests/redisplay_mode_line_flow.rs b/crates/neovm-core/src/emacs_core/runtime/eval/tests/redisplay_mode_line_flow_test.rs
similarity index 100%
rename from crates/neovm-core/src/emacs_core/runtime/eval/tests/redisplay_mode_line_flow.rs
rename to crates/neovm-core/src/emacs_core/runtime/eval/tests/redisplay_mode_line_flow_test.rs
diff --git a/crates/neovm-core/src/emacs_core/runtime/eval/tests/redisplay_transaction_owner.rs b/crates/neovm-core/src/emacs_core/runtime/eval/tests/redisplay_transaction_owner_test.rs
similarity index 100%
rename from crates/neovm-core/src/emacs_core/runtime/eval/tests/redisplay_transaction_owner.rs
rename to crates/neovm-core/src/emacs_core/runtime/eval/tests/redisplay_transaction_owner_test.rs
diff --git a/crates/neovm-core/src/emacs_core/runtime/eval/tests/var_fast.rs b/crates/neovm-core/src/emacs_core/runtime/eval/tests/var_fast_test.rs
similarity index 100%
rename from crates/neovm-core/src/emacs_core/runtime/eval/tests/var_fast.rs
rename to crates/neovm-core/src/emacs_core/runtime/eval/tests/var_fast_test.rs
diff --git a/crates/neovm-core/src/emacs_core/runtime/eval/tests/varset_plain_fast_path.rs b/crates/neovm-core/src/emacs_core/runtime/eval/tests/varset_plain_fast_path_test.rs
similarity index 100%
rename from crates/neovm-core/src/emacs_core/runtime/eval/tests/varset_plain_fast_path.rs
rename to crates/neovm-core/src/emacs_core/runtime/eval/tests/varset_plain_fast_path_test.rs
diff --git a/crates/neovm-core/src/emacs_core/runtime/eval/tier_i/tests/analyzer.rs b/crates/neovm-core/src/emacs_core/runtime/eval/tier_i/tests/analyzer_test.rs
similarity index 100%
rename from crates/neovm-core/src/emacs_core/runtime/eval/tier_i/tests/analyzer.rs
rename to crates/neovm-core/src/emacs_core/runtime/eval/tier_i/tests/analyzer_test.rs
diff --git a/crates/neovm-core/src/emacs_core/runtime/eval/tier_i/tests/census.rs b/crates/neovm-core/src/emacs_core/runtime/eval/tier_i/tests/census_test.rs
similarity index 100%
rename from crates/neovm-core/src/emacs_core/runtime/eval/tier_i/tests/census.rs
rename to crates/neovm-core/src/emacs_core/runtime/eval/tier_i/tests/census_test.rs
diff --git a/crates/neovm-core/src/emacs_core/runtime/eval/tier_i/tests/differential.rs b/crates/neovm-core/src/emacs_core/runtime/eval/tier_i/tests/differential_test.rs
similarity index 100%
rename from crates/neovm-core/src/emacs_core/runtime/eval/tier_i/tests/differential.rs
rename to crates/neovm-core/src/emacs_core/runtime/eval/tier_i/tests/differential_test.rs
diff --git a/crates/neovm-core/src/emacs_core/runtime/eval/tier_i/tests/knobs.rs b/crates/neovm-core/src/emacs_core/runtime/eval/tier_i/tests/knobs_test.rs
similarity index 100%
rename from crates/neovm-core/src/emacs_core/runtime/eval/tier_i/tests/knobs.rs
rename to crates/neovm-core/src/emacs_core/runtime/eval/tier_i/tests/knobs_test.rs
diff --git a/crates/neovm-core/src/emacs_core/runtime/eval/tier_i/tests/list_bindings.rs b/crates/neovm-core/src/emacs_core/runtime/eval/tier_i/tests/list_bindings_test.rs
similarity index 100%
rename from crates/neovm-core/src/emacs_core/runtime/eval/tier_i/tests/list_bindings.rs
rename to crates/neovm-core/src/emacs_core/runtime/eval/tier_i/tests/list_bindings_test.rs
diff --git a/crates/neovm-core/src/emacs_core/runtime/eval/tier_i/tests/mod.rs b/crates/neovm-core/src/emacs_core/runtime/eval/tier_i/tests/mod.rs
index 126048a336..8a333a7074 100644
--- a/crates/neovm-core/src/emacs_core/runtime/eval/tier_i/tests/mod.rs
+++ b/crates/neovm-core/src/emacs_core/runtime/eval/tier_i/tests/mod.rs
@@ -1,9 +1,15 @@
 //! Tier-I tests.
 
+#[path = "analyzer_test.rs"]
 mod analyzer;
+#[path = "census_test.rs"]
 mod census;
+#[path = "differential_test.rs"]
 mod differential;
+#[path = "knobs_test.rs"]
 mod knobs;
 #[cfg(test)]
+#[path = "list_bindings_test.rs"]
 mod list_bindings;
+#[path = "soak_test.rs"]
 mod soak;
diff --git a/crates/neovm-core/src/emacs_core/runtime/eval/tier_i/tests/soak.rs b/crates/neovm-core/src/emacs_core/runtime/eval/tier_i/tests/soak_test.rs
similarity index 100%
rename from crates/neovm-core/src/emacs_core/runtime/eval/tier_i/tests/soak.rs
rename to crates/neovm-core/src/emacs_core/runtime/eval/tier_i/tests/soak_test.rs
diff --git a/crates/neovm-core/src/emacs_core/runtime/forward/mod.rs b/crates/neovm-core/src/emacs_core/runtime/forward/mod.rs
index e804e7f9c7..5dd8e24b4c 100644
--- a/crates/neovm-core/src/emacs_core/runtime/forward/mod.rs
+++ b/crates/neovm-core/src/emacs_core/runtime/forward/mod.rs
@@ -823,5 +823,5 @@ pub fn alloc_intfwd(initial: LispInteger) -> &'static LispIntFwd {
 mod tests;
 
 #[cfg(test)]
-#[path = "tests/mod.rs"]
+#[path = "tests/forward_module_test.rs"]
 mod gnu_parity_tests;
diff --git a/crates/neovm-core/src/emacs_core/runtime/forward/tests/mod.rs b/crates/neovm-core/src/emacs_core/runtime/forward/tests/forward_module_test.rs
similarity index 100%
rename from crates/neovm-core/src/emacs_core/runtime/forward/tests/mod.rs
rename to crates/neovm-core/src/emacs_core/runtime/forward/tests/forward_module_test.rs
diff --git a/crates/neovm-core/src/emacs_core/runtime/hashtab/mod.rs b/crates/neovm-core/src/emacs_core/runtime/hashtab/mod.rs
index 8b1209cc1e..3f02ebc0ff 100644
--- a/crates/neovm-core/src/emacs_core/runtime/hashtab/mod.rs
+++ b/crates/neovm-core/src/emacs_core/runtime/hashtab/mod.rs
@@ -1198,8 +1198,8 @@ pub(crate) fn builtin_unintern(eval: &mut super::eval::Context, args: Vec<Value>
     Ok(if removed { Value::T } else { Value::NIL })
 }
 #[cfg(test)]
-#[path = "tests/bignum_sxhash.rs"]
+#[path = "tests/bignum_sxhash_test.rs"]
 mod bignum_sxhash_tests;
 #[cfg(test)]
-#[path = "tests/mod.rs"]
+#[path = "tests/hashtab_test.rs"]
 mod tests;
diff --git a/crates/neovm-core/src/emacs_core/runtime/hashtab/tests/bignum_sxhash.rs b/crates/neovm-core/src/emacs_core/runtime/hashtab/tests/bignum_sxhash_test.rs
similarity index 100%
rename from crates/neovm-core/src/emacs_core/runtime/hashtab/tests/bignum_sxhash.rs
rename to crates/neovm-core/src/emacs_core/runtime/hashtab/tests/bignum_sxhash_test.rs
diff --git a/crates/neovm-core/src/emacs_core/runtime/hashtab/tests/mod.rs b/crates/neovm-core/src/emacs_core/runtime/hashtab/tests/hashtab_test.rs
similarity index 100%
rename from crates/neovm-core/src/emacs_core/runtime/hashtab/tests/mod.rs
rename to crates/neovm-core/src/emacs_core/runtime/hashtab/tests/hashtab_test.rs
diff --git a/crates/neovm-core/src/emacs_core/runtime/hashtab/tests/user_test_guard.rs b/crates/neovm-core/src/emacs_core/runtime/hashtab/tests/user_test_guard_test.rs
similarity index 100%
rename from crates/neovm-core/src/emacs_core/runtime/hashtab/tests/user_test_guard.rs
rename to crates/neovm-core/src/emacs_core/runtime/hashtab/tests/user_test_guard_test.rs
diff --git a/crates/neovm-core/src/emacs_core/runtime/hashtab/user_test_guard.rs b/crates/neovm-core/src/emacs_core/runtime/hashtab/user_test_guard.rs
index 73a69d9239..809b308f1d 100644
--- a/crates/neovm-core/src/emacs_core/runtime/hashtab/user_test_guard.rs
+++ b/crates/neovm-core/src/emacs_core/runtime/hashtab/user_test_guard.rs
@@ -138,5 +138,5 @@ pub(crate) fn gc_threshold_integer_fallback(value: Value) -> Option<i64> {
 }
 
 #[cfg(test)]
-#[path = "tests/user_test_guard.rs"]
+#[path = "tests/user_test_guard_test.rs"]
 mod tests;
diff --git a/crates/neovm-core/src/emacs_core/runtime/heap_registry/mod.rs b/crates/neovm-core/src/emacs_core/runtime/heap_registry/mod.rs
index 5bd0b85c8f..e2e66ecd5f 100644
--- a/crates/neovm-core/src/emacs_core/runtime/heap_registry/mod.rs
+++ b/crates/neovm-core/src/emacs_core/runtime/heap_registry/mod.rs
@@ -172,5 +172,5 @@ impl<T> HeapRegistrySlot<T> {
 }
 
 #[cfg(test)]
-#[path = "tests/ownership.rs"]
+#[path = "tests/ownership_test.rs"]
 mod ownership_tests;
diff --git a/crates/neovm-core/src/emacs_core/runtime/heap_registry/tests/ownership.rs b/crates/neovm-core/src/emacs_core/runtime/heap_registry/tests/ownership_test.rs
similarity index 100%
rename from crates/neovm-core/src/emacs_core/runtime/heap_registry/tests/ownership.rs
rename to crates/neovm-core/src/emacs_core/runtime/heap_registry/tests/ownership_test.rs
diff --git a/crates/neovm-core/src/emacs_core/runtime/intern/mod.rs b/crates/neovm-core/src/emacs_core/runtime/intern/mod.rs
index f867922c3c..179eb7e785 100644
--- a/crates/neovm-core/src/emacs_core/runtime/intern/mod.rs
+++ b/crates/neovm-core/src/emacs_core/runtime/intern/mod.rs
@@ -1882,13 +1882,13 @@ pub fn try_resolve_sym_lisp_string(id: SymId) -> Option<&'static LispString> {
 }
 
 #[cfg(test)]
-#[path = "tests/mod.rs"]
+#[path = "tests/intern_test.rs"]
 mod tests;
 
 #[cfg(test)]
-#[path = "tests/seed_prefix.rs"]
+#[path = "tests/seed_prefix_test.rs"]
 mod seed_prefix_tests;
 
 #[cfg(test)]
-#[path = "tests/gc_tls_ownership.rs"]
+#[path = "tests/gc_tls_ownership_test.rs"]
 mod gc_tls_ownership_tests;
diff --git a/crates/neovm-core/src/emacs_core/runtime/intern/tests/gc_tls_ownership.rs b/crates/neovm-core/src/emacs_core/runtime/intern/tests/gc_tls_ownership_test.rs
similarity index 100%
rename from crates/neovm-core/src/emacs_core/runtime/intern/tests/gc_tls_ownership.rs
rename to crates/neovm-core/src/emacs_core/runtime/intern/tests/gc_tls_ownership_test.rs
diff --git a/crates/neovm-core/src/emacs_core/runtime/intern/tests/mod.rs b/crates/neovm-core/src/emacs_core/runtime/intern/tests/intern_test.rs
similarity index 100%
rename from crates/neovm-core/src/emacs_core/runtime/intern/tests/mod.rs
rename to crates/neovm-core/src/emacs_core/runtime/intern/tests/intern_test.rs
diff --git a/crates/neovm-core/src/emacs_core/runtime/intern/tests/seed_prefix.rs b/crates/neovm-core/src/emacs_core/runtime/intern/tests/seed_prefix_test.rs
similarity index 100%
rename from crates/neovm-core/src/emacs_core/runtime/intern/tests/seed_prefix.rs
rename to crates/neovm-core/src/emacs_core/runtime/intern/tests/seed_prefix_test.rs
diff --git a/crates/neovm-core/src/emacs_core/runtime/jit/cache.rs b/crates/neovm-core/src/emacs_core/runtime/jit/cache.rs
index c429ddf9bf..d75d2a800b 100644
--- a/crates/neovm-core/src/emacs_core/runtime/jit/cache.rs
+++ b/crates/neovm-core/src/emacs_core/runtime/jit/cache.rs
@@ -3347,13 +3347,13 @@ mod tests;
 mod tier2_off_test;
 
 #[cfg(test)]
-#[path = "cache/tests/gc_tls_ownership.rs"]
+#[path = "cache/tests/gc_tls_ownership_test.rs"]
 mod gc_tls_ownership_tests;
 
 #[cfg(test)]
-#[path = "cache/tests/osr_inline.rs"]
+#[path = "cache/tests/osr_inline_test.rs"]
 mod osr_inline_tests;
 
 #[cfg(test)]
-#[path = "cache/tests/hof_regalloc.rs"]
+#[path = "cache/tests/hof_regalloc_test.rs"]
 mod hof_regalloc_tests;
diff --git a/crates/neovm-core/src/emacs_core/runtime/jit/cache/tests/gc_tls_ownership.rs b/crates/neovm-core/src/emacs_core/runtime/jit/cache/tests/gc_tls_ownership_test.rs
similarity index 100%
rename from crates/neovm-core/src/emacs_core/runtime/jit/cache/tests/gc_tls_ownership.rs
rename to crates/neovm-core/src/emacs_core/runtime/jit/cache/tests/gc_tls_ownership_test.rs
diff --git a/crates/neovm-core/src/emacs_core/runtime/jit/cache/tests/hof_regalloc.rs b/crates/neovm-core/src/emacs_core/runtime/jit/cache/tests/hof_regalloc_test.rs
similarity index 100%
rename from crates/neovm-core/src/emacs_core/runtime/jit/cache/tests/hof_regalloc.rs
rename to crates/neovm-core/src/emacs_core/runtime/jit/cache/tests/hof_regalloc_test.rs
diff --git a/crates/neovm-core/src/emacs_core/runtime/jit/cache/tests/osr_inline.rs b/crates/neovm-core/src/emacs_core/runtime/jit/cache/tests/osr_inline_test.rs
similarity index 100%
rename from crates/neovm-core/src/emacs_core/runtime/jit/cache/tests/osr_inline.rs
rename to crates/neovm-core/src/emacs_core/runtime/jit/cache/tests/osr_inline_test.rs
diff --git a/crates/neovm-core/src/emacs_core/runtime/jit/compile.rs b/crates/neovm-core/src/emacs_core/runtime/jit/compile.rs
index 8ec4206d7f..32aa542314 100644
--- a/crates/neovm-core/src/emacs_core/runtime/jit/compile.rs
+++ b/crates/neovm-core/src/emacs_core/runtime/jit/compile.rs
@@ -4097,167 +4097,167 @@ pub(crate) mod stack_guard;
 pub(crate) mod cold_exits;
 
 #[cfg(test)]
-#[path = "tests/arith_generic_integer.rs"]
+#[path = "tests/arith_generic_integer_test.rs"]
 mod arith_generic_integer_tests;
 #[cfg(test)]
-#[path = "tests/array_shims.rs"]
+#[path = "tests/array_shims_test.rs"]
 mod array_shim_tests;
 #[cfg(test)]
-#[path = "tests/call_feedback.rs"]
+#[path = "tests/call_feedback_test.rs"]
 mod call_feedback_tests;
 mod collection_journal;
 #[cfg(test)]
-#[path = "tests/compile_pipeline.rs"]
+#[path = "tests/compile_pipeline_test.rs"]
 pub(crate) mod compile_pipeline_tests;
 pub(crate) mod heap_inline;
 #[cfg(test)]
-#[path = "tests/inline_heap_ops.rs"]
+#[path = "tests/inline_heap_ops_test.rs"]
 mod inline_heap_ops_tests;
 
 #[cfg(test)]
-#[path = "tests/gen0_tracked_collection_revision.rs"]
+#[path = "tests/gen0_tracked_collection_revision_test.rs"]
 mod gen0_tracked_collection_revision_tests;
 #[cfg(test)]
-#[path = "tests/inline_heap_generational.rs"]
+#[path = "tests/inline_heap_generational_test.rs"]
 mod inline_heap_generational_tests;
 #[cfg(test)]
-#[path = "tests/inline.rs"]
+#[path = "tests/inline_test.rs"]
 mod inline_tests;
 pub(crate) mod inline_vars;
 #[cfg(test)]
-#[path = "tests/leaf_calls.rs"]
+#[path = "tests/leaf_calls_test.rs"]
 mod leaf_call_tests;
 #[cfg(test)]
-#[path = "tests/mir_calls.rs"]
+#[path = "tests/mir_calls_test.rs"]
 mod mir_calls;
 #[cfg(test)]
-#[path = "tests/mir_cons_deopt.rs"]
+#[path = "tests/mir_cons_deopt_test.rs"]
 mod mir_cons_deopt_tests;
 #[cfg(test)]
-#[path = "tests/mir_inline_guards.rs"]
+#[path = "tests/mir_inline_guards_test.rs"]
 mod mir_inline_guards;
 #[cfg(test)]
-#[path = "tests/mir_named_calls.rs"]
+#[path = "tests/mir_named_calls_test.rs"]
 mod mir_named_calls_tests;
 #[cfg(test)]
-#[path = "tests/mir_reach_dead.rs"]
+#[path = "tests/mir_reach_dead_test.rs"]
 mod mir_reach_dead_tests;
 #[cfg(test)]
-#[path = "tests/observability.rs"]
+#[path = "tests/observability_test.rs"]
 mod observability_tests;
 #[cfg(test)]
-#[path = "tests/osr_bindings.rs"]
+#[path = "tests/osr_bindings_test.rs"]
 mod osr_binding_tests;
 #[cfg(all(test, target_os = "linux", target_arch = "x86_64"))]
-#[path = "tests/shared_module.rs"]
+#[path = "tests/shared_module_test.rs"]
 mod shared_module_tests;
 pub(crate) mod switch_dispatch;
 
 #[cfg(test)]
-#[path = "tests/direct_call.rs"]
+#[path = "tests/direct_call_test.rs"]
 mod direct_call_tests;
 #[cfg(test)]
-#[path = "tests/direct_self.rs"]
+#[path = "tests/direct_self_test.rs"]
 mod direct_self_tests;
 #[cfg(test)]
-#[path = "tests/eq_swp_prefilter.rs"]
+#[path = "tests/eq_swp_prefilter_test.rs"]
 mod eq_swp_prefilter_tests;
 #[cfg(test)]
-#[path = "tests/fixnum_comparisons.rs"]
+#[path = "tests/fixnum_comparisons_test.rs"]
 mod fixnum_comparison_tests;
 #[cfg(test)]
-#[path = "tests/fixnum_ranges.rs"]
+#[path = "tests/fixnum_ranges_test.rs"]
 mod fixnum_range_tests;
 #[cfg(test)]
-#[path = "tests/flonum_slots.rs"]
+#[path = "tests/flonum_slots_test.rs"]
 mod flonum_slot_tests;
 #[cfg(test)]
-#[path = "tests/osr_entry_guards.rs"]
+#[path = "tests/osr_entry_guards_test.rs"]
 mod osr_entry_guard_tests;
 #[cfg(test)]
-#[path = "tests/osr_raw.rs"]
+#[path = "tests/osr_raw_test.rs"]
 mod osr_raw_tests;
 
 #[cfg(test)]
-#[path = "tests/inline_vars.rs"]
+#[path = "tests/inline_vars_test.rs"]
 mod inline_vars_tests;
 #[cfg(test)]
-#[path = "tests/native_frame_detach.rs"]
+#[path = "tests/native_frame_detach_test.rs"]
 mod native_frame_detach_tests;
 #[cfg(test)]
-#[path = "tests/osr_poll.rs"]
+#[path = "tests/osr_poll_test.rs"]
 mod osr_poll_tests;
 #[cfg(test)]
-#[path = "tests/predicate_branches.rs"]
+#[path = "tests/predicate_branches_test.rs"]
 mod predicate_branch_tests;
 #[cfg(test)]
-#[path = "compile/tests/regalloc_small.rs"]
+#[path = "compile/tests/regalloc_small_test.rs"]
 mod regalloc_small_tests;
 #[cfg(test)]
-#[path = "tests/source_slots.rs"]
+#[path = "tests/source_slots_test.rs"]
 mod source_slot_tests;
 #[cfg(test)]
-#[path = "tests/spec_frames.rs"]
+#[path = "tests/spec_frames_test.rs"]
 mod spec_frame_tests;
 #[cfg(test)]
-#[path = "tests/spec_gate.rs"]
+#[path = "tests/spec_gate_test.rs"]
 mod spec_gate_tests;
 #[cfg(test)]
-#[path = "tests/spec_rest_calls.rs"]
+#[path = "tests/spec_rest_calls_test.rs"]
 mod spec_rest_call_tests;
 #[cfg(test)]
-#[path = "tests/stack_guard.rs"]
+#[path = "tests/stack_guard_test.rs"]
 mod stack_guard_tests;
 #[cfg(test)]
-#[path = "tests/switch_dispatch.rs"]
+#[path = "tests/switch_dispatch_test.rs"]
 mod switch_dispatch_tests;
 #[cfg(test)]
-#[path = "tests/switch_inline.rs"]
+#[path = "tests/switch_inline_test.rs"]
 mod switch_inline_tests;
 #[cfg(test)]
-#[path = "tests/tail_calls.rs"]
+#[path = "tests/tail_calls_test.rs"]
 mod tail_call_tests;
 #[cfg(test)]
-#[path = "tests/compile.rs"]
+#[path = "tests/compile_test.rs"]
 mod tests;
 #[cfg(test)]
-#[path = "tests/varref_inline.rs"]
+#[path = "tests/varref_inline_test.rs"]
 mod varref_inline_tests;
 
 #[cfg(test)]
-#[path = "tests/opt_lower.rs"]
+#[path = "tests/opt_lower_test.rs"]
 mod opt_lower_tests;
 
 #[cfg(test)]
-#[path = "compile/tests/opt_admission.rs"]
+#[path = "compile/tests/opt_admission_test.rs"]
 mod opt_admission_tests;
 
 #[cfg(test)]
-#[path = "compile/tests/opt_ir_lower.rs"]
+#[path = "compile/tests/opt_ir_lower_test.rs"]
 mod opt_ir_lower_tests;
 
 #[cfg(test)]
-#[path = "compile/tests/opt_fold_select.rs"]
+#[path = "compile/tests/opt_fold_select_test.rs"]
 mod opt_fold_select_tests;
 
 #[cfg(test)]
-#[path = "compile/tests/opt_passes.rs"]
+#[path = "compile/tests/opt_passes_test.rs"]
 mod opt_passes_tests;
 
 #[cfg(test)]
-#[path = "compile/tests/opt_regalloc.rs"]
+#[path = "compile/tests/opt_regalloc_test.rs"]
 mod opt_regalloc_tests;
 
 #[cfg(test)]
-#[path = "compile/tests/opt_bool.rs"]
+#[path = "compile/tests/opt_bool_test.rs"]
 mod opt_bool_tests;
 
 #[cfg(test)]
-#[path = "compile/tests/opt_bool_numeric.rs"]
+#[path = "compile/tests/opt_bool_numeric_test.rs"]
 mod opt_bool_numeric_tests;
 
 #[cfg(test)]
-#[path = "compile/tests/opt_reps.rs"]
+#[path = "compile/tests/opt_reps_test.rs"]
 mod opt_reps_tests;
 
 #[cfg(test)]
@@ -4265,65 +4265,65 @@ mod opt_reps_tests;
 mod opt_gvn_tests;
 
 #[cfg(test)]
-#[path = "compile/tests/opt_array_profile.rs"]
+#[path = "compile/tests/opt_array_profile_test.rs"]
 mod opt_array_profile_tests;
 
 #[cfg(test)]
-#[path = "compile/tests/opt_arrays.rs"]
+#[path = "compile/tests/opt_arrays_test.rs"]
 mod opt_array_tests;
 
 #[cfg(test)]
-#[path = "compile/tests/opt_sink_alloc_probe.rs"]
+#[path = "compile/tests/opt_sink_alloc_probe_test.rs"]
 mod opt_sink_alloc_probe_tests;
 
 #[cfg(test)]
-#[path = "compile/tests/opt_sink_identity.rs"]
+#[path = "compile/tests/opt_sink_identity_test.rs"]
 mod opt_sink_identity_tests;
 
 #[cfg(test)]
-#[path = "compile/tests/opt_sink_sqrt.rs"]
+#[path = "compile/tests/opt_sink_sqrt_test.rs"]
 mod opt_sink_sqrt;
 
 #[cfg(test)]
-#[path = "compile/tests/opt_sink_numeric_ready.rs"]
+#[path = "compile/tests/opt_sink_numeric_ready_test.rs"]
 mod opt_sink_numeric_ready;
 
 #[cfg(test)]
-#[path = "compile/tests/opt_sink_numeric_sqrt_contagion.rs"]
+#[path = "compile/tests/opt_sink_numeric_sqrt_contagion_test.rs"]
 mod opt_sink_numeric_sqrt_contagion;
 
 #[cfg(test)]
-#[path = "compile/tests/opt_sink_numeric_static_contagion.rs"]
+#[path = "compile/tests/opt_sink_numeric_static_contagion_test.rs"]
 mod opt_sink_numeric_static_contagion;
 
 #[cfg(test)]
-#[path = "compile/tests/opt_sink_numeric_cold.rs"]
+#[path = "compile/tests/opt_sink_numeric_cold_test.rs"]
 mod opt_sink_numeric_cold;
 
 #[cfg(test)]
-#[path = "compile/tests/opt_sink_numeric_infallible.rs"]
+#[path = "compile/tests/opt_sink_numeric_infallible_test.rs"]
 mod opt_sink_numeric_infallible;
 
 #[cfg(test)]
-#[path = "compile/tests/opt_sink_cold_demand.rs"]
+#[path = "compile/tests/opt_sink_cold_demand_test.rs"]
 mod opt_sink_cold_demand;
 
 #[cfg(test)]
-#[path = "compile/tests/opt_sqrt_binding.rs"]
+#[path = "compile/tests/opt_sqrt_binding_test.rs"]
 mod opt_sqrt_binding;
 
 #[cfg(test)]
-#[path = "compile/tests/opt_sqrt_snapshot.rs"]
+#[path = "compile/tests/opt_sqrt_snapshot_test.rs"]
 mod opt_sqrt_snapshot;
 
 #[cfg(test)]
-#[path = "compile/tests/opt_sink_numeric_resolved.rs"]
+#[path = "compile/tests/opt_sink_numeric_resolved_test.rs"]
 mod opt_sink_numeric_resolved;
 
 #[cfg(test)]
-#[path = "compile/tests/opt_sink_native_verification.rs"]
+#[path = "compile/tests/opt_sink_native_verification_test.rs"]
 mod opt_sink_native_verification;
 
 #[cfg(test)]
-#[path = "compile/tests/opt_rootwin_counts.rs"]
+#[path = "compile/tests/opt_rootwin_counts_test.rs"]
 mod opt_rootwin_count_tests;
diff --git a/crates/neovm-core/src/emacs_core/runtime/jit/compile/calls.rs b/crates/neovm-core/src/emacs_core/runtime/jit/compile/calls.rs
index 40bed032bf..a2670741c6 100644
--- a/crates/neovm-core/src/emacs_core/runtime/jit/compile/calls.rs
+++ b/crates/neovm-core/src/emacs_core/runtime/jit/compile/calls.rs
@@ -176,5 +176,5 @@ pub(super) fn cbsym_spec_kind(sym: SymId, _nargs: usize) -> Option<SpecCalleeKin
 }
 
 #[cfg(test)]
-#[path = "../tests/mir_leaf_effects.rs"]
+#[path = "../tests/mir_leaf_effects_test.rs"]
 mod mir_leaf_effects_tests;
diff --git a/crates/neovm-core/src/emacs_core/runtime/jit/compile/chain_framestate.rs b/crates/neovm-core/src/emacs_core/runtime/jit/compile/chain_framestate.rs
index 5db4704da4..390d2bd51e 100644
--- a/crates/neovm-core/src/emacs_core/runtime/jit/compile/chain_framestate.rs
+++ b/crates/neovm-core/src/emacs_core/runtime/jit/compile/chain_framestate.rs
@@ -225,9 +225,9 @@ pub(crate) fn chain_framestate_at(
 }
 
 #[cfg(test)]
-#[path = "tests/chain_framestate.rs"]
+#[path = "tests/chain_framestate_test.rs"]
 mod tests;
 
 #[cfg(test)]
-#[path = "tests/chain_entry.rs"]
+#[path = "tests/chain_entry_test.rs"]
 mod entry_tests;
diff --git a/crates/neovm-core/src/emacs_core/runtime/jit/compile/cold_exits.rs b/crates/neovm-core/src/emacs_core/runtime/jit/compile/cold_exits.rs
index 11120eaa05..56afe45523 100644
--- a/crates/neovm-core/src/emacs_core/runtime/jit/compile/cold_exits.rs
+++ b/crates/neovm-core/src/emacs_core/runtime/jit/compile/cold_exits.rs
@@ -138,5 +138,5 @@ impl ColdSpan {
 }
 
 #[cfg(test)]
-#[path = "../tests/cold_exits.rs"]
+#[path = "../tests/cold_exits_test.rs"]
 mod tests;
diff --git a/crates/neovm-core/src/emacs_core/runtime/jit/compile/dispatch.rs b/crates/neovm-core/src/emacs_core/runtime/jit/compile/dispatch.rs
index 3c3ec658b8..274b483868 100644
--- a/crates/neovm-core/src/emacs_core/runtime/jit/compile/dispatch.rs
+++ b/crates/neovm-core/src/emacs_core/runtime/jit/compile/dispatch.rs
@@ -353,7 +353,7 @@ fn aref_fast(array: Value, index: Value) -> Option<Value> {
 }
 
 #[cfg(test)]
-#[path = "tests/array_projection_capture.rs"]
+#[path = "tests/array_projection_capture_test.rs"]
 mod array_projection_capture;
 
 /// `Op::Aref` (GNU `Baref`) from compiled code: the element's bits, or
diff --git a/crates/neovm-core/src/emacs_core/runtime/jit/compile/hof_runtime.rs b/crates/neovm-core/src/emacs_core/runtime/jit/compile/hof_runtime.rs
index 29daec6123..8562fe0530 100644
--- a/crates/neovm-core/src/emacs_core/runtime/jit/compile/hof_runtime.rs
+++ b/crates/neovm-core/src/emacs_core/runtime/jit/compile/hof_runtime.rs
@@ -310,9 +310,9 @@ pub(crate) fn resume_mapping(
 }
 
 #[cfg(test)]
-#[path = "../tests/inline_hof_runtime.rs"]
+#[path = "../tests/inline_hof_runtime_test.rs"]
 mod tests;
 
 #[cfg(test)]
-#[path = "../tests/inline_hof_length.rs"]
+#[path = "../tests/inline_hof_length_test.rs"]
 mod hof_length_tests;
diff --git a/crates/neovm-core/src/emacs_core/runtime/jit/compile/inline_entry_cache.rs b/crates/neovm-core/src/emacs_core/runtime/jit/compile/inline_entry_cache.rs
index d310756803..a862a9557d 100644
--- a/crates/neovm-core/src/emacs_core/runtime/jit/compile/inline_entry_cache.rs
+++ b/crates/neovm-core/src/emacs_core/runtime/jit/compile/inline_entry_cache.rs
@@ -465,5 +465,5 @@ fn constant_states(
 }
 
 #[cfg(test)]
-#[path = "inline_entry_cache/tests/admission.rs"]
+#[path = "inline_entry_cache/tests/admission_test.rs"]
 mod tests;
diff --git a/crates/neovm-core/src/emacs_core/runtime/jit/compile/inline_entry_cache/tests/admission.rs b/crates/neovm-core/src/emacs_core/runtime/jit/compile/inline_entry_cache/tests/admission_test.rs
similarity index 100%
rename from crates/neovm-core/src/emacs_core/runtime/jit/compile/inline_entry_cache/tests/admission.rs
rename to crates/neovm-core/src/emacs_core/runtime/jit/compile/inline_entry_cache/tests/admission_test.rs
diff --git a/crates/neovm-core/src/emacs_core/runtime/jit/compile/inline_hof.rs b/crates/neovm-core/src/emacs_core/runtime/jit/compile/inline_hof.rs
index 171cf14849..b0239d5efe 100644
--- a/crates/neovm-core/src/emacs_core/runtime/jit/compile/inline_hof.rs
+++ b/crates/neovm-core/src/emacs_core/runtime/jit/compile/inline_hof.rs
@@ -17,7 +17,7 @@ pub(crate) use heap_policy::hoist_callback_heap_ptr;
 mod captures;
 
 #[cfg(test)]
-#[path = "../tests/inline_hof_headers.rs"]
+#[path = "../tests/inline_hof_headers_test.rs"]
 mod tests;
 
 /// Emit one admitted map call, including its internal callback CFG. All
diff --git a/crates/neovm-core/src/emacs_core/runtime/jit/compile/inline_hof/captures.rs b/crates/neovm-core/src/emacs_core/runtime/jit/compile/inline_hof/captures.rs
index 973b92760b..3b3fbc07ad 100644
--- a/crates/neovm-core/src/emacs_core/runtime/jit/compile/inline_hof/captures.rs
+++ b/crates/neovm-core/src/emacs_core/runtime/jit/compile/inline_hof/captures.rs
@@ -127,5 +127,5 @@ impl Captures {
 }
 
 #[cfg(test)]
-#[path = "../../tests/inline_hof_captures.rs"]
+#[path = "../../tests/inline_hof_captures_test.rs"]
 mod tests;
diff --git a/crates/neovm-core/src/emacs_core/runtime/jit/compile/inline_hof/heap_policy.rs b/crates/neovm-core/src/emacs_core/runtime/jit/compile/inline_hof/heap_policy.rs
index 54af9b31be..965cf537e8 100644
--- a/crates/neovm-core/src/emacs_core/runtime/jit/compile/inline_hof/heap_policy.rs
+++ b/crates/neovm-core/src/emacs_core/runtime/jit/compile/inline_hof/heap_policy.rs
@@ -26,5 +26,5 @@ pub(crate) fn hoist_callback_heap_ptr() -> bool {
 }
 
 #[cfg(test)]
-#[path = "../../tests/inline_hof_heap_policy.rs"]
+#[path = "../../tests/inline_hof_heap_policy_test.rs"]
 mod tests;
diff --git a/crates/neovm-core/src/emacs_core/runtime/jit/compile/inline_regalloc.rs b/crates/neovm-core/src/emacs_core/runtime/jit/compile/inline_regalloc.rs
index fea3410485..19a5f853f2 100644
--- a/crates/neovm-core/src/emacs_core/runtime/jit/compile/inline_regalloc.rs
+++ b/crates/neovm-core/src/emacs_core/runtime/jit/compile/inline_regalloc.rs
@@ -46,5 +46,5 @@ fn select_hof_allocator(
 }
 
 #[cfg(test)]
-#[path = "../tests/inline_regalloc.rs"]
+#[path = "../tests/inline_regalloc_test.rs"]
 mod tests;
diff --git a/crates/neovm-core/src/emacs_core/runtime/jit/compile/intrinsics.rs b/crates/neovm-core/src/emacs_core/runtime/jit/compile/intrinsics.rs
index d33f8b8832..4115a5e29c 100644
--- a/crates/neovm-core/src/emacs_core/runtime/jit/compile/intrinsics.rs
+++ b/crates/neovm-core/src/emacs_core/runtime/jit/compile/intrinsics.rs
@@ -851,5 +851,5 @@ pub(crate) fn emit_symbol_cell_read(
 }
 
 #[cfg(test)]
-#[path = "../tests/intrinsics.rs"]
+#[path = "../tests/intrinsics_test.rs"]
 mod intrinsics_tests;
diff --git a/crates/neovm-core/src/emacs_core/runtime/jit/compile/jit_layout.rs b/crates/neovm-core/src/emacs_core/runtime/jit/compile/jit_layout.rs
index d56e384ca6..c8218e6074 100644
--- a/crates/neovm-core/src/emacs_core/runtime/jit/compile/jit_layout.rs
+++ b/crates/neovm-core/src/emacs_core/runtime/jit/compile/jit_layout.rs
@@ -840,9 +840,9 @@ fn probe_let_layout() -> Option<LetLayout> {
 }
 
 #[cfg(test)]
-#[path = "jit_layout/tests/golden.rs"]
+#[path = "jit_layout/tests/golden_test.rs"]
 mod tests;
 
 #[cfg(test)]
-#[path = "jit_layout/tests/runtime_prefix.rs"]
+#[path = "jit_layout/tests/runtime_prefix_test.rs"]
 mod runtime_prefix_tests;
diff --git a/crates/neovm-core/src/emacs_core/runtime/jit/compile/jit_layout/tests/golden.rs b/crates/neovm-core/src/emacs_core/runtime/jit/compile/jit_layout/tests/golden_test.rs
similarity index 100%
rename from crates/neovm-core/src/emacs_core/runtime/jit/compile/jit_layout/tests/golden.rs
rename to crates/neovm-core/src/emacs_core/runtime/jit/compile/jit_layout/tests/golden_test.rs
diff --git a/crates/neovm-core/src/emacs_core/runtime/jit/compile/jit_layout/tests/runtime_prefix.rs b/crates/neovm-core/src/emacs_core/runtime/jit/compile/jit_layout/tests/runtime_prefix_test.rs
similarity index 100%
rename from crates/neovm-core/src/emacs_core/runtime/jit/compile/jit_layout/tests/runtime_prefix.rs
rename to crates/neovm-core/src/emacs_core/runtime/jit/compile/jit_layout/tests/runtime_prefix_test.rs
diff --git a/crates/neovm-core/src/emacs_core/runtime/jit/compile/opt_backend.rs b/crates/neovm-core/src/emacs_core/runtime/jit/compile/opt_backend.rs
index cbf8ccec25..a3f415a6d2 100644
--- a/crates/neovm-core/src/emacs_core/runtime/jit/compile/opt_backend.rs
+++ b/crates/neovm-core/src/emacs_core/runtime/jit/compile/opt_backend.rs
@@ -7,7 +7,7 @@ use super::*;
 use crate::emacs_core::jit::opt::{build, ir};
 
 #[cfg(test)]
-#[path = "tests/opt_opcode_transport_effects.rs"]
+#[path = "tests/opt_opcode_transport_effects_test.rs"]
 mod opcode_transport_effects_tests;
 
 /// Honor a Feedback request's explicit Full policy when the verified opt plan
diff --git a/crates/neovm-core/src/emacs_core/runtime/jit/compile/opt_census.rs b/crates/neovm-core/src/emacs_core/runtime/jit/compile/opt_census.rs
index 20f55af681..54e4807f42 100644
--- a/crates/neovm-core/src/emacs_core/runtime/jit/compile/opt_census.rs
+++ b/crates/neovm-core/src/emacs_core/runtime/jit/compile/opt_census.rs
@@ -222,5 +222,5 @@ impl CompiledLeaf {
 }
 
 #[cfg(test)]
-#[path = "tests/opt_census.rs"]
+#[path = "tests/opt_census_test.rs"]
 mod tests;
diff --git a/crates/neovm-core/src/emacs_core/runtime/jit/compile/shared.rs b/crates/neovm-core/src/emacs_core/runtime/jit/compile/shared.rs
index aef6d4db02..07eaa54d56 100644
--- a/crates/neovm-core/src/emacs_core/runtime/jit/compile/shared.rs
+++ b/crates/neovm-core/src/emacs_core/runtime/jit/compile/shared.rs
@@ -815,5 +815,5 @@ impl WorkerBackend {
 // END T35 SELECTED SHIM BACKEND
 
 #[cfg(test)]
-#[path = "shared/tests/collection_journal.rs"]
+#[path = "shared/tests/collection_journal_test.rs"]
 mod collection_journal_tests;
diff --git a/crates/neovm-core/src/emacs_core/runtime/jit/compile/shared/tests/collection_journal.rs b/crates/neovm-core/src/emacs_core/runtime/jit/compile/shared/tests/collection_journal_test.rs
similarity index 100%
rename from crates/neovm-core/src/emacs_core/runtime/jit/compile/shared/tests/collection_journal.rs
rename to crates/neovm-core/src/emacs_core/runtime/jit/compile/shared/tests/collection_journal_test.rs
diff --git a/crates/neovm-core/src/emacs_core/runtime/jit/compile/tests/array_projection_capture.rs b/crates/neovm-core/src/emacs_core/runtime/jit/compile/tests/array_projection_capture_test.rs
similarity index 100%
rename from crates/neovm-core/src/emacs_core/runtime/jit/compile/tests/array_projection_capture.rs
rename to crates/neovm-core/src/emacs_core/runtime/jit/compile/tests/array_projection_capture_test.rs
diff --git a/crates/neovm-core/src/emacs_core/runtime/jit/compile/tests/chain_entry.rs b/crates/neovm-core/src/emacs_core/runtime/jit/compile/tests/chain_entry_test.rs
similarity index 100%
rename from crates/neovm-core/src/emacs_core/runtime/jit/compile/tests/chain_entry.rs
rename to crates/neovm-core/src/emacs_core/runtime/jit/compile/tests/chain_entry_test.rs
diff --git a/crates/neovm-core/src/emacs_core/runtime/jit/compile/tests/chain_framestate.rs b/crates/neovm-core/src/emacs_core/runtime/jit/compile/tests/chain_framestate_test.rs
similarity index 100%
rename from crates/neovm-core/src/emacs_core/runtime/jit/compile/tests/chain_framestate.rs
rename to crates/neovm-core/src/emacs_core/runtime/jit/compile/tests/chain_framestate_test.rs
diff --git a/crates/neovm-core/src/emacs_core/runtime/jit/compile/tests/opt_admission.rs b/crates/neovm-core/src/emacs_core/runtime/jit/compile/tests/opt_admission_test.rs
similarity index 100%
rename from crates/neovm-core/src/emacs_core/runtime/jit/compile/tests/opt_admission.rs
rename to crates/neovm-core/src/emacs_core/runtime/jit/compile/tests/opt_admission_test.rs
diff --git a/crates/neovm-core/src/emacs_core/runtime/jit/compile/tests/opt_array_profile.rs b/crates/neovm-core/src/emacs_core/runtime/jit/compile/tests/opt_array_profile_test.rs
similarity index 100%
rename from crates/neovm-core/src/emacs_core/runtime/jit/compile/tests/opt_array_profile.rs
rename to crates/neovm-core/src/emacs_core/runtime/jit/compile/tests/opt_array_profile_test.rs
diff --git a/crates/neovm-core/src/emacs_core/runtime/jit/compile/tests/opt_arrays.rs b/crates/neovm-core/src/emacs_core/runtime/jit/compile/tests/opt_arrays_test.rs
similarity index 100%
rename from crates/neovm-core/src/emacs_core/runtime/jit/compile/tests/opt_arrays.rs
rename to crates/neovm-core/src/emacs_core/runtime/jit/compile/tests/opt_arrays_test.rs
diff --git a/crates/neovm-core/src/emacs_core/runtime/jit/compile/tests/opt_bool_numeric.rs b/crates/neovm-core/src/emacs_core/runtime/jit/compile/tests/opt_bool_numeric_test.rs
similarity index 100%
rename from crates/neovm-core/src/emacs_core/runtime/jit/compile/tests/opt_bool_numeric.rs
rename to crates/neovm-core/src/emacs_core/runtime/jit/compile/tests/opt_bool_numeric_test.rs
diff --git a/crates/neovm-core/src/emacs_core/runtime/jit/compile/tests/opt_bool.rs b/crates/neovm-core/src/emacs_core/runtime/jit/compile/tests/opt_bool_test.rs
similarity index 100%
rename from crates/neovm-core/src/emacs_core/runtime/jit/compile/tests/opt_bool.rs
rename to crates/neovm-core/src/emacs_core/runtime/jit/compile/tests/opt_bool_test.rs
diff --git a/crates/neovm-core/src/emacs_core/runtime/jit/compile/tests/opt_census.rs b/crates/neovm-core/src/emacs_core/runtime/jit/compile/tests/opt_census_test.rs
similarity index 100%
rename from crates/neovm-core/src/emacs_core/runtime/jit/compile/tests/opt_census.rs
rename to crates/neovm-core/src/emacs_core/runtime/jit/compile/tests/opt_census_test.rs
diff --git a/crates/neovm-core/src/emacs_core/runtime/jit/compile/tests/opt_fold_select.rs b/crates/neovm-core/src/emacs_core/runtime/jit/compile/tests/opt_fold_select_test.rs
similarity index 100%
rename from crates/neovm-core/src/emacs_core/runtime/jit/compile/tests/opt_fold_select.rs
rename to crates/neovm-core/src/emacs_core/runtime/jit/compile/tests/opt_fold_select_test.rs
diff --git a/crates/neovm-core/src/emacs_core/runtime/jit/compile/tests/opt_ir_lower.rs b/crates/neovm-core/src/emacs_core/runtime/jit/compile/tests/opt_ir_lower_test.rs
similarity index 100%
rename from crates/neovm-core/src/emacs_core/runtime/jit/compile/tests/opt_ir_lower.rs
rename to crates/neovm-core/src/emacs_core/runtime/jit/compile/tests/opt_ir_lower_test.rs
diff --git a/crates/neovm-core/src/emacs_core/runtime/jit/compile/tests/opt_licm_positive.rs b/crates/neovm-core/src/emacs_core/runtime/jit/compile/tests/opt_licm_positive_test.rs
similarity index 100%
rename from crates/neovm-core/src/emacs_core/runtime/jit/compile/tests/opt_licm_positive.rs
rename to crates/neovm-core/src/emacs_core/runtime/jit/compile/tests/opt_licm_positive_test.rs
diff --git a/crates/neovm-core/src/emacs_core/runtime/jit/compile/tests/opt_opcode_transport_effects.rs b/crates/neovm-core/src/emacs_core/runtime/jit/compile/tests/opt_opcode_transport_effects_test.rs
similarity index 100%
rename from crates/neovm-core/src/emacs_core/runtime/jit/compile/tests/opt_opcode_transport_effects.rs
rename to crates/neovm-core/src/emacs_core/runtime/jit/compile/tests/opt_opcode_transport_effects_test.rs
diff --git a/crates/neovm-core/src/emacs_core/runtime/jit/compile/tests/opt_passes.rs b/crates/neovm-core/src/emacs_core/runtime/jit/compile/tests/opt_passes_test.rs
similarity index 100%
rename from crates/neovm-core/src/emacs_core/runtime/jit/compile/tests/opt_passes.rs
rename to crates/neovm-core/src/emacs_core/runtime/jit/compile/tests/opt_passes_test.rs
diff --git a/crates/neovm-core/src/emacs_core/runtime/jit/compile/tests/opt_range_licm.rs b/crates/neovm-core/src/emacs_core/runtime/jit/compile/tests/opt_range_licm_test.rs
similarity index 100%
rename from crates/neovm-core/src/emacs_core/runtime/jit/compile/tests/opt_range_licm.rs
rename to crates/neovm-core/src/emacs_core/runtime/jit/compile/tests/opt_range_licm_test.rs
diff --git a/crates/neovm-core/src/emacs_core/runtime/jit/compile/tests/opt_regalloc.rs b/crates/neovm-core/src/emacs_core/runtime/jit/compile/tests/opt_regalloc_test.rs
similarity index 100%
rename from crates/neovm-core/src/emacs_core/runtime/jit/compile/tests/opt_regalloc.rs
rename to crates/neovm-core/src/emacs_core/runtime/jit/compile/tests/opt_regalloc_test.rs
diff --git a/crates/neovm-core/src/emacs_core/runtime/jit/compile/tests/opt_reps.rs b/crates/neovm-core/src/emacs_core/runtime/jit/compile/tests/opt_reps_test.rs
similarity index 99%
rename from crates/neovm-core/src/emacs_core/runtime/jit/compile/tests/opt_reps.rs
rename to crates/neovm-core/src/emacs_core/runtime/jit/compile/tests/opt_reps_test.rs
index a2fa9b9b57..648034a308 100644
--- a/crates/neovm-core/src/emacs_core/runtime/jit/compile/tests/opt_reps.rs
+++ b/crates/neovm-core/src/emacs_core/runtime/jit/compile/tests/opt_reps_test.rs
@@ -18,7 +18,7 @@ use crate::emacs_core::jit::opt::{build, eval, ir};
 use crate::emacs_core::print::print_value;
 
 #[cfg(test)]
-#[path = "opt_range_licm.rs"]
+#[path = "opt_range_licm_test.rs"]
 mod range_licm_tests;
 
 struct Settings;
@@ -942,5 +942,5 @@ fn opt_reps_native_static_fixnum_untag_uses_immediate_payload() {
 }
 
 #[cfg(test)]
-#[path = "opt_licm_positive.rs"]
+#[path = "opt_licm_positive_test.rs"]
 mod licm_positive_tests;
diff --git a/crates/neovm-core/src/emacs_core/runtime/jit/compile/tests/opt_rootwin_counts.rs b/crates/neovm-core/src/emacs_core/runtime/jit/compile/tests/opt_rootwin_counts_test.rs
similarity index 100%
rename from crates/neovm-core/src/emacs_core/runtime/jit/compile/tests/opt_rootwin_counts.rs
rename to crates/neovm-core/src/emacs_core/runtime/jit/compile/tests/opt_rootwin_counts_test.rs
diff --git a/crates/neovm-core/src/emacs_core/runtime/jit/compile/tests/opt_sink_alloc_probe.rs b/crates/neovm-core/src/emacs_core/runtime/jit/compile/tests/opt_sink_alloc_probe_test.rs
similarity index 100%
rename from crates/neovm-core/src/emacs_core/runtime/jit/compile/tests/opt_sink_alloc_probe.rs
rename to crates/neovm-core/src/emacs_core/runtime/jit/compile/tests/opt_sink_alloc_probe_test.rs
diff --git a/crates/neovm-core/src/emacs_core/runtime/jit/compile/tests/opt_sink_cold_demand.rs b/crates/neovm-core/src/emacs_core/runtime/jit/compile/tests/opt_sink_cold_demand_test.rs
similarity index 100%
rename from crates/neovm-core/src/emacs_core/runtime/jit/compile/tests/opt_sink_cold_demand.rs
rename to crates/neovm-core/src/emacs_core/runtime/jit/compile/tests/opt_sink_cold_demand_test.rs
diff --git a/crates/neovm-core/src/emacs_core/runtime/jit/compile/tests/opt_sink_identity.rs b/crates/neovm-core/src/emacs_core/runtime/jit/compile/tests/opt_sink_identity_test.rs
similarity index 100%
rename from crates/neovm-core/src/emacs_core/runtime/jit/compile/tests/opt_sink_identity.rs
rename to crates/neovm-core/src/emacs_core/runtime/jit/compile/tests/opt_sink_identity_test.rs
diff --git a/crates/neovm-core/src/emacs_core/runtime/jit/compile/tests/opt_sink_native_verification.rs b/crates/neovm-core/src/emacs_core/runtime/jit/compile/tests/opt_sink_native_verification_test.rs
similarity index 100%
rename from crates/neovm-core/src/emacs_core/runtime/jit/compile/tests/opt_sink_native_verification.rs
rename to crates/neovm-core/src/emacs_core/runtime/jit/compile/tests/opt_sink_native_verification_test.rs
diff --git a/crates/neovm-core/src/emacs_core/runtime/jit/compile/tests/opt_sink_numeric_cold.rs b/crates/neovm-core/src/emacs_core/runtime/jit/compile/tests/opt_sink_numeric_cold_test.rs
similarity index 100%
rename from crates/neovm-core/src/emacs_core/runtime/jit/compile/tests/opt_sink_numeric_cold.rs
rename to crates/neovm-core/src/emacs_core/runtime/jit/compile/tests/opt_sink_numeric_cold_test.rs
diff --git a/crates/neovm-core/src/emacs_core/runtime/jit/compile/tests/opt_sink_numeric_infallible.rs b/crates/neovm-core/src/emacs_core/runtime/jit/compile/tests/opt_sink_numeric_infallible_test.rs
similarity index 100%
rename from crates/neovm-core/src/emacs_core/runtime/jit/compile/tests/opt_sink_numeric_infallible.rs
rename to crates/neovm-core/src/emacs_core/runtime/jit/compile/tests/opt_sink_numeric_infallible_test.rs
diff --git a/crates/neovm-core/src/emacs_core/runtime/jit/compile/tests/opt_sink_numeric_ready.rs b/crates/neovm-core/src/emacs_core/runtime/jit/compile/tests/opt_sink_numeric_ready_test.rs
similarity index 100%
rename from crates/neovm-core/src/emacs_core/runtime/jit/compile/tests/opt_sink_numeric_ready.rs
rename to crates/neovm-core/src/emacs_core/runtime/jit/compile/tests/opt_sink_numeric_ready_test.rs
diff --git a/crates/neovm-core/src/emacs_core/runtime/jit/compile/tests/opt_sink_numeric_resolved.rs b/crates/neovm-core/src/emacs_core/runtime/jit/compile/tests/opt_sink_numeric_resolved_test.rs
similarity index 100%
rename from crates/neovm-core/src/emacs_core/runtime/jit/compile/tests/opt_sink_numeric_resolved.rs
rename to crates/neovm-core/src/emacs_core/runtime/jit/compile/tests/opt_sink_numeric_resolved_test.rs
diff --git a/crates/neovm-core/src/emacs_core/runtime/jit/compile/tests/opt_sink_numeric_sqrt_contagion.rs b/crates/neovm-core/src/emacs_core/runtime/jit/compile/tests/opt_sink_numeric_sqrt_contagion_test.rs
similarity index 100%
rename from crates/neovm-core/src/emacs_core/runtime/jit/compile/tests/opt_sink_numeric_sqrt_contagion.rs
rename to crates/neovm-core/src/emacs_core/runtime/jit/compile/tests/opt_sink_numeric_sqrt_contagion_test.rs
diff --git a/crates/neovm-core/src/emacs_core/runtime/jit/compile/tests/opt_sink_numeric_static_contagion.rs b/crates/neovm-core/src/emacs_core/runtime/jit/compile/tests/opt_sink_numeric_static_contagion_test.rs
similarity index 100%
rename from crates/neovm-core/src/emacs_core/runtime/jit/compile/tests/opt_sink_numeric_static_contagion.rs
rename to crates/neovm-core/src/emacs_core/runtime/jit/compile/tests/opt_sink_numeric_static_contagion_test.rs
diff --git a/crates/neovm-core/src/emacs_core/runtime/jit/compile/tests/opt_sink_sqrt.rs b/crates/neovm-core/src/emacs_core/runtime/jit/compile/tests/opt_sink_sqrt_test.rs
similarity index 100%
rename from crates/neovm-core/src/emacs_core/runtime/jit/compile/tests/opt_sink_sqrt.rs
rename to crates/neovm-core/src/emacs_core/runtime/jit/compile/tests/opt_sink_sqrt_test.rs
diff --git a/crates/neovm-core/src/emacs_core/runtime/jit/compile/tests/opt_sqrt_binding.rs b/crates/neovm-core/src/emacs_core/runtime/jit/compile/tests/opt_sqrt_binding_test.rs
similarity index 100%
rename from crates/neovm-core/src/emacs_core/runtime/jit/compile/tests/opt_sqrt_binding.rs
rename to crates/neovm-core/src/emacs_core/runtime/jit/compile/tests/opt_sqrt_binding_test.rs
diff --git a/crates/neovm-core/src/emacs_core/runtime/jit/compile/tests/opt_sqrt_snapshot.rs b/crates/neovm-core/src/emacs_core/runtime/jit/compile/tests/opt_sqrt_snapshot_test.rs
similarity index 100%
rename from crates/neovm-core/src/emacs_core/runtime/jit/compile/tests/opt_sqrt_snapshot.rs
rename to crates/neovm-core/src/emacs_core/runtime/jit/compile/tests/opt_sqrt_snapshot_test.rs
diff --git a/crates/neovm-core/src/emacs_core/runtime/jit/compile/tests/regalloc_small.rs b/crates/neovm-core/src/emacs_core/runtime/jit/compile/tests/regalloc_small_test.rs
similarity index 100%
rename from crates/neovm-core/src/emacs_core/runtime/jit/compile/tests/regalloc_small.rs
rename to crates/neovm-core/src/emacs_core/runtime/jit/compile/tests/regalloc_small_test.rs
diff --git a/crates/neovm-core/src/emacs_core/runtime/jit/inline.rs b/crates/neovm-core/src/emacs_core/runtime/jit/inline.rs
index 463b801902..53880623a9 100644
--- a/crates/neovm-core/src/emacs_core/runtime/jit/inline.rs
+++ b/crates/neovm-core/src/emacs_core/runtime/jit/inline.rs
@@ -57,11 +57,11 @@ pub(crate) use v2::{
 };
 
 #[cfg(test)]
-#[path = "tests/inline_named_front.rs"]
+#[path = "tests/inline_named_front_test.rs"]
 mod named_front_tests;
 
 #[cfg(test)]
-#[path = "tests/inline_named_runtime.rs"]
+#[path = "tests/inline_named_runtime_test.rs"]
 mod named_runtime_tests;
 
 /// Ops of a callee body, at most, for one splice.
@@ -726,21 +726,21 @@ pub(crate) fn force_inline_for_test(on: Option<bool>) {
 }
 
 #[cfg(test)]
-#[path = "tests/inline_v2.rs"]
+#[path = "tests/inline_v2_test.rs"]
 mod v2_tests;
 
 #[cfg(test)]
-#[path = "tests/inline_v2_closure.rs"]
+#[path = "tests/inline_v2_closure_test.rs"]
 mod v2_closure_tests;
 
 #[cfg(test)]
-#[path = "tests/inline_v2_hof.rs"]
+#[path = "tests/inline_v2_hof_test.rs"]
 mod v2_hof_tests;
 
 #[cfg(test)]
-#[path = "tests/inline_closure.rs"]
+#[path = "tests/inline_closure_test.rs"]
 mod closure_tests;
 
 #[cfg(test)]
-#[path = "tests/inline_entry_cache.rs"]
+#[path = "tests/inline_entry_cache_test.rs"]
 mod entry_cache_tests;
diff --git a/crates/neovm-core/src/emacs_core/runtime/jit/opt/build.rs b/crates/neovm-core/src/emacs_core/runtime/jit/opt/build.rs
index 0477072195..469e4e7d57 100644
--- a/crates/neovm-core/src/emacs_core/runtime/jit/opt/build.rs
+++ b/crates/neovm-core/src/emacs_core/runtime/jit/opt/build.rs
@@ -1482,9 +1482,9 @@ pub(crate) fn op_effects(op: &Op) -> (Effects, AliasClass) {
 }
 
 #[cfg(test)]
-#[path = "tests/build_ssa.rs"]
+#[path = "tests/build_ssa_test.rs"]
 mod tests;
 
 #[cfg(test)]
-#[path = "tests/primitive_effects.rs"]
+#[path = "tests/primitive_effects_test.rs"]
 mod primitive_effects_tests;
diff --git a/crates/neovm-core/src/emacs_core/runtime/jit/opt/mod.rs b/crates/neovm-core/src/emacs_core/runtime/jit/opt/mod.rs
index 9e04a87e2c..d7ca15df71 100644
--- a/crates/neovm-core/src/emacs_core/runtime/jit/opt/mod.rs
+++ b/crates/neovm-core/src/emacs_core/runtime/jit/opt/mod.rs
@@ -21,13 +21,13 @@ pub(crate) mod verify;
 #[path = "tests/reference_eval.rs"]
 pub(crate) mod eval;
 #[cfg(test)]
-#[path = "tests/eval.rs"]
+#[path = "tests/eval_test.rs"]
 mod eval_tests;
 #[cfg(test)]
-#[path = "tests/ir_verify.rs"]
+#[path = "tests/ir_verify_test.rs"]
 mod ir_verify_tests;
 #[cfg(test)]
-#[path = "tests/types.rs"]
+#[path = "tests/types_test.rs"]
 mod type_tests;
 
 #[cfg(test)]
@@ -35,7 +35,7 @@ mod type_tests;
 mod gvn_eval_tests;
 
 #[cfg(test)]
-#[path = "tests/range_licm_eval.rs"]
+#[path = "tests/range_licm_eval_test.rs"]
 mod range_licm_eval_tests;
 
 #[cfg(test)]
diff --git a/crates/neovm-core/src/emacs_core/runtime/jit/opt/passes/array_reads.rs b/crates/neovm-core/src/emacs_core/runtime/jit/opt/passes/array_reads.rs
index 5bc4e8f1d8..768d860f5f 100644
--- a/crates/neovm-core/src/emacs_core/runtime/jit/opt/passes/array_reads.rs
+++ b/crates/neovm-core/src/emacs_core/runtime/jit/opt/passes/array_reads.rs
@@ -1024,5 +1024,5 @@ fn verify_reads_with_context(
 }
 
 #[cfg(test)]
-#[path = "tests/array_reads.rs"]
+#[path = "tests/array_reads_test.rs"]
 mod tests;
diff --git a/crates/neovm-core/src/emacs_core/runtime/jit/opt/passes/bools.rs b/crates/neovm-core/src/emacs_core/runtime/jit/opt/passes/bools.rs
index 5d2b94213b..cdd2c143cf 100644
--- a/crates/neovm-core/src/emacs_core/runtime/jit/opt/passes/bools.rs
+++ b/crates/neovm-core/src/emacs_core/runtime/jit/opt/passes/bools.rs
@@ -461,5 +461,5 @@ fn tagged_view(
 }
 
 #[cfg(test)]
-#[path = "tests/bools.rs"]
+#[path = "tests/bools_test.rs"]
 mod tests;
diff --git a/crates/neovm-core/src/emacs_core/runtime/jit/opt/passes/cfg.rs b/crates/neovm-core/src/emacs_core/runtime/jit/opt/passes/cfg.rs
index d9f67273d7..0813d71f0c 100644
--- a/crates/neovm-core/src/emacs_core/runtime/jit/opt/passes/cfg.rs
+++ b/crates/neovm-core/src/emacs_core/runtime/jit/opt/passes/cfg.rs
@@ -693,5 +693,5 @@ fn mapped_term(
 }
 
 #[cfg(test)]
-#[path = "tests/cfg.rs"]
+#[path = "tests/cfg_test.rs"]
 mod tests;
diff --git a/crates/neovm-core/src/emacs_core/runtime/jit/opt/passes/fold.rs b/crates/neovm-core/src/emacs_core/runtime/jit/opt/passes/fold.rs
index c599ee3a93..07fdfd70ff 100644
--- a/crates/neovm-core/src/emacs_core/runtime/jit/opt/passes/fold.rs
+++ b/crates/neovm-core/src/emacs_core/runtime/jit/opt/passes/fold.rs
@@ -862,5 +862,5 @@ fn thread_edges(
 }
 
 #[cfg(test)]
-#[path = "tests/fold.rs"]
+#[path = "tests/fold_test.rs"]
 mod tests;
diff --git a/crates/neovm-core/src/emacs_core/runtime/jit/opt/passes/mod.rs b/crates/neovm-core/src/emacs_core/runtime/jit/opt/passes/mod.rs
index cb2fbb4707..151e558839 100644
--- a/crates/neovm-core/src/emacs_core/runtime/jit/opt/passes/mod.rs
+++ b/crates/neovm-core/src/emacs_core/runtime/jit/opt/passes/mod.rs
@@ -12,5 +12,5 @@ pub(crate) mod sink;
 pub(crate) mod static_fix;
 
 #[cfg(test)]
-#[path = "tests/bools_reference.rs"]
+#[path = "tests/bools_reference_test.rs"]
 mod bools_reference_tests;
diff --git a/crates/neovm-core/src/emacs_core/runtime/jit/opt/passes/reps.rs b/crates/neovm-core/src/emacs_core/runtime/jit/opt/passes/reps.rs
index 7647f53ff8..0737970a06 100644
--- a/crates/neovm-core/src/emacs_core/runtime/jit/opt/passes/reps.rs
+++ b/crates/neovm-core/src/emacs_core/runtime/jit/opt/passes/reps.rs
@@ -899,5 +899,5 @@ fn view_for(
 }
 
 #[cfg(test)]
-#[path = "tests/reps.rs"]
+#[path = "tests/reps_test.rs"]
 mod tests;
diff --git a/crates/neovm-core/src/emacs_core/runtime/jit/opt/passes/reps_lift.rs b/crates/neovm-core/src/emacs_core/runtime/jit/opt/passes/reps_lift.rs
index ceb91a256e..0b3e76d8c8 100644
--- a/crates/neovm-core/src/emacs_core/runtime/jit/opt/passes/reps_lift.rs
+++ b/crates/neovm-core/src/emacs_core/runtime/jit/opt/passes/reps_lift.rs
@@ -463,5 +463,5 @@ fn narrow_views(func: &mut Func, canonical: &[Value]) {
 }
 
 #[cfg(test)]
-#[path = "tests/reps_lift.rs"]
+#[path = "tests/reps_lift_test.rs"]
 mod tests;
diff --git a/crates/neovm-core/src/emacs_core/runtime/jit/opt/passes/tests/array_reads.rs b/crates/neovm-core/src/emacs_core/runtime/jit/opt/passes/tests/array_reads_test.rs
similarity index 100%
rename from crates/neovm-core/src/emacs_core/runtime/jit/opt/passes/tests/array_reads.rs
rename to crates/neovm-core/src/emacs_core/runtime/jit/opt/passes/tests/array_reads_test.rs
diff --git a/crates/neovm-core/src/emacs_core/runtime/jit/opt/passes/tests/bools_reference.rs b/crates/neovm-core/src/emacs_core/runtime/jit/opt/passes/tests/bools_reference_test.rs
similarity index 100%
rename from crates/neovm-core/src/emacs_core/runtime/jit/opt/passes/tests/bools_reference.rs
rename to crates/neovm-core/src/emacs_core/runtime/jit/opt/passes/tests/bools_reference_test.rs
diff --git a/crates/neovm-core/src/emacs_core/runtime/jit/opt/passes/tests/bools.rs b/crates/neovm-core/src/emacs_core/runtime/jit/opt/passes/tests/bools_test.rs
similarity index 100%
rename from crates/neovm-core/src/emacs_core/runtime/jit/opt/passes/tests/bools.rs
rename to crates/neovm-core/src/emacs_core/runtime/jit/opt/passes/tests/bools_test.rs
diff --git a/crates/neovm-core/src/emacs_core/runtime/jit/opt/passes/tests/cfg.rs b/crates/neovm-core/src/emacs_core/runtime/jit/opt/passes/tests/cfg_test.rs
similarity index 100%
rename from crates/neovm-core/src/emacs_core/runtime/jit/opt/passes/tests/cfg.rs
rename to crates/neovm-core/src/emacs_core/runtime/jit/opt/passes/tests/cfg_test.rs
diff --git a/crates/neovm-core/src/emacs_core/runtime/jit/opt/passes/tests/fold.rs b/crates/neovm-core/src/emacs_core/runtime/jit/opt/passes/tests/fold_test.rs
similarity index 100%
rename from crates/neovm-core/src/emacs_core/runtime/jit/opt/passes/tests/fold.rs
rename to crates/neovm-core/src/emacs_core/runtime/jit/opt/passes/tests/fold_test.rs
diff --git a/crates/neovm-core/src/emacs_core/runtime/jit/opt/passes/tests/reps_lift.rs b/crates/neovm-core/src/emacs_core/runtime/jit/opt/passes/tests/reps_lift_test.rs
similarity index 100%
rename from crates/neovm-core/src/emacs_core/runtime/jit/opt/passes/tests/reps_lift.rs
rename to crates/neovm-core/src/emacs_core/runtime/jit/opt/passes/tests/reps_lift_test.rs
diff --git a/crates/neovm-core/src/emacs_core/runtime/jit/opt/passes/tests/reps.rs b/crates/neovm-core/src/emacs_core/runtime/jit/opt/passes/tests/reps_test.rs
similarity index 100%
rename from crates/neovm-core/src/emacs_core/runtime/jit/opt/passes/tests/reps.rs
rename to crates/neovm-core/src/emacs_core/runtime/jit/opt/passes/tests/reps_test.rs
diff --git a/crates/neovm-core/src/emacs_core/runtime/jit/opt/sink_recipes/tests/verify.rs b/crates/neovm-core/src/emacs_core/runtime/jit/opt/sink_recipes/tests/verify_test.rs
similarity index 100%
rename from crates/neovm-core/src/emacs_core/runtime/jit/opt/sink_recipes/tests/verify.rs
rename to crates/neovm-core/src/emacs_core/runtime/jit/opt/sink_recipes/tests/verify_test.rs
diff --git a/crates/neovm-core/src/emacs_core/runtime/jit/opt/sink_recipes/verify.rs b/crates/neovm-core/src/emacs_core/runtime/jit/opt/sink_recipes/verify.rs
index ce24642e9d..955f24eeca 100644
--- a/crates/neovm-core/src/emacs_core/runtime/jit/opt/sink_recipes/verify.rs
+++ b/crates/neovm-core/src/emacs_core/runtime/jit/opt/sink_recipes/verify.rs
@@ -2892,5 +2892,5 @@ pub(crate) fn roots_at(
 }
 
 #[cfg(test)]
-#[path = "tests/verify.rs"]
+#[path = "tests/verify_test.rs"]
 mod tests;
diff --git a/crates/neovm-core/src/emacs_core/runtime/jit/opt/tests/build_ssa.rs b/crates/neovm-core/src/emacs_core/runtime/jit/opt/tests/build_ssa_test.rs
similarity index 100%
rename from crates/neovm-core/src/emacs_core/runtime/jit/opt/tests/build_ssa.rs
rename to crates/neovm-core/src/emacs_core/runtime/jit/opt/tests/build_ssa_test.rs
diff --git a/crates/neovm-core/src/emacs_core/runtime/jit/opt/tests/eval.rs b/crates/neovm-core/src/emacs_core/runtime/jit/opt/tests/eval_test.rs
similarity index 100%
rename from crates/neovm-core/src/emacs_core/runtime/jit/opt/tests/eval.rs
rename to crates/neovm-core/src/emacs_core/runtime/jit/opt/tests/eval_test.rs
diff --git a/crates/neovm-core/src/emacs_core/runtime/jit/opt/tests/ir_verify.rs b/crates/neovm-core/src/emacs_core/runtime/jit/opt/tests/ir_verify_test.rs
similarity index 100%
rename from crates/neovm-core/src/emacs_core/runtime/jit/opt/tests/ir_verify.rs
rename to crates/neovm-core/src/emacs_core/runtime/jit/opt/tests/ir_verify_test.rs
diff --git a/crates/neovm-core/src/emacs_core/runtime/jit/opt/tests/primitive_effects.rs b/crates/neovm-core/src/emacs_core/runtime/jit/opt/tests/primitive_effects_test.rs
similarity index 100%
rename from crates/neovm-core/src/emacs_core/runtime/jit/opt/tests/primitive_effects.rs
rename to crates/neovm-core/src/emacs_core/runtime/jit/opt/tests/primitive_effects_test.rs
diff --git a/crates/neovm-core/src/emacs_core/runtime/jit/opt/tests/range_licm_eval.rs b/crates/neovm-core/src/emacs_core/runtime/jit/opt/tests/range_licm_eval_test.rs
similarity index 100%
rename from crates/neovm-core/src/emacs_core/runtime/jit/opt/tests/range_licm_eval.rs
rename to crates/neovm-core/src/emacs_core/runtime/jit/opt/tests/range_licm_eval_test.rs
diff --git a/crates/neovm-core/src/emacs_core/runtime/jit/opt/tests/types.rs b/crates/neovm-core/src/emacs_core/runtime/jit/opt/tests/types_test.rs
similarity index 100%
rename from crates/neovm-core/src/emacs_core/runtime/jit/opt/tests/types.rs
rename to crates/neovm-core/src/emacs_core/runtime/jit/opt/tests/types_test.rs
diff --git a/crates/neovm-core/src/emacs_core/runtime/jit/reopt.rs b/crates/neovm-core/src/emacs_core/runtime/jit/reopt.rs
index cec6ad8a4b..878b8f366c 100644
--- a/crates/neovm-core/src/emacs_core/runtime/jit/reopt.rs
+++ b/crates/neovm-core/src/emacs_core/runtime/jit/reopt.rs
@@ -755,7 +755,7 @@ pub(crate) fn reopt_enabled() -> bool {
 mod tests;
 
 #[cfg(test)]
-#[path = "reopt/tests/end_to_end.rs"]
+#[path = "reopt/tests/end_to_end_test.rs"]
 mod end_to_end;
 
 #[cfg(test)]
diff --git a/crates/neovm-core/src/emacs_core/runtime/jit/reopt/tests/end_to_end.rs b/crates/neovm-core/src/emacs_core/runtime/jit/reopt/tests/end_to_end_test.rs
similarity index 100%
rename from crates/neovm-core/src/emacs_core/runtime/jit/reopt/tests/end_to_end.rs
rename to crates/neovm-core/src/emacs_core/runtime/jit/reopt/tests/end_to_end_test.rs
diff --git a/crates/neovm-core/src/emacs_core/runtime/jit/tests/arith_generic_integer.rs b/crates/neovm-core/src/emacs_core/runtime/jit/tests/arith_generic_integer_test.rs
similarity index 100%
rename from crates/neovm-core/src/emacs_core/runtime/jit/tests/arith_generic_integer.rs
rename to crates/neovm-core/src/emacs_core/runtime/jit/tests/arith_generic_integer_test.rs
diff --git a/crates/neovm-core/src/emacs_core/runtime/jit/tests/array_shims.rs b/crates/neovm-core/src/emacs_core/runtime/jit/tests/array_shims_test.rs
similarity index 100%
rename from crates/neovm-core/src/emacs_core/runtime/jit/tests/array_shims.rs
rename to crates/neovm-core/src/emacs_core/runtime/jit/tests/array_shims_test.rs
diff --git a/crates/neovm-core/src/emacs_core/runtime/jit/tests/call_feedback.rs b/crates/neovm-core/src/emacs_core/runtime/jit/tests/call_feedback_test.rs
similarity index 100%
rename from crates/neovm-core/src/emacs_core/runtime/jit/tests/call_feedback.rs
rename to crates/neovm-core/src/emacs_core/runtime/jit/tests/call_feedback_test.rs
diff --git a/crates/neovm-core/src/emacs_core/runtime/jit/tests/cold_exits.rs b/crates/neovm-core/src/emacs_core/runtime/jit/tests/cold_exits_test.rs
similarity index 100%
rename from crates/neovm-core/src/emacs_core/runtime/jit/tests/cold_exits.rs
rename to crates/neovm-core/src/emacs_core/runtime/jit/tests/cold_exits_test.rs
diff --git a/crates/neovm-core/src/emacs_core/runtime/jit/tests/compile_pipeline.rs b/crates/neovm-core/src/emacs_core/runtime/jit/tests/compile_pipeline_test.rs
similarity index 100%
rename from crates/neovm-core/src/emacs_core/runtime/jit/tests/compile_pipeline.rs
rename to crates/neovm-core/src/emacs_core/runtime/jit/tests/compile_pipeline_test.rs
diff --git a/crates/neovm-core/src/emacs_core/runtime/jit/tests/compile.rs b/crates/neovm-core/src/emacs_core/runtime/jit/tests/compile_test.rs
similarity index 100%
rename from crates/neovm-core/src/emacs_core/runtime/jit/tests/compile.rs
rename to crates/neovm-core/src/emacs_core/runtime/jit/tests/compile_test.rs
diff --git a/crates/neovm-core/src/emacs_core/runtime/jit/tests/direct_call_framed.rs b/crates/neovm-core/src/emacs_core/runtime/jit/tests/direct_call_framed_test.rs
similarity index 100%
rename from crates/neovm-core/src/emacs_core/runtime/jit/tests/direct_call_framed.rs
rename to crates/neovm-core/src/emacs_core/runtime/jit/tests/direct_call_framed_test.rs
diff --git a/crates/neovm-core/src/emacs_core/runtime/jit/tests/direct_call_memory.rs b/crates/neovm-core/src/emacs_core/runtime/jit/tests/direct_call_memory_test.rs
similarity index 100%
rename from crates/neovm-core/src/emacs_core/runtime/jit/tests/direct_call_memory.rs
rename to crates/neovm-core/src/emacs_core/runtime/jit/tests/direct_call_memory_test.rs
diff --git a/crates/neovm-core/src/emacs_core/runtime/jit/tests/direct_call_shape_edges.rs b/crates/neovm-core/src/emacs_core/runtime/jit/tests/direct_call_shape_edges_test.rs
similarity index 100%
rename from crates/neovm-core/src/emacs_core/runtime/jit/tests/direct_call_shape_edges.rs
rename to crates/neovm-core/src/emacs_core/runtime/jit/tests/direct_call_shape_edges_test.rs
diff --git a/crates/neovm-core/src/emacs_core/runtime/jit/tests/direct_call_shape_parity.rs b/crates/neovm-core/src/emacs_core/runtime/jit/tests/direct_call_shape_parity_test.rs
similarity index 99%
rename from crates/neovm-core/src/emacs_core/runtime/jit/tests/direct_call_shape_parity.rs
rename to crates/neovm-core/src/emacs_core/runtime/jit/tests/direct_call_shape_parity_test.rs
index 0ba2063b50..a6dccb4a19 100644
--- a/crates/neovm-core/src/emacs_core/runtime/jit/tests/direct_call_shape_parity.rs
+++ b/crates/neovm-core/src/emacs_core/runtime/jit/tests/direct_call_shape_parity_test.rs
@@ -11,7 +11,7 @@
 use super::*;
 
 #[cfg(test)]
-#[path = "direct_call_shape_edges.rs"]
+#[path = "direct_call_shape_edges_test.rs"]
 mod edges;
 use std::path::PathBuf;
 
diff --git a/crates/neovm-core/src/emacs_core/runtime/jit/tests/direct_call_shapes.rs b/crates/neovm-core/src/emacs_core/runtime/jit/tests/direct_call_shapes_test.rs
similarity index 100%
rename from crates/neovm-core/src/emacs_core/runtime/jit/tests/direct_call_shapes.rs
rename to crates/neovm-core/src/emacs_core/runtime/jit/tests/direct_call_shapes_test.rs
diff --git a/crates/neovm-core/src/emacs_core/runtime/jit/tests/direct_call.rs b/crates/neovm-core/src/emacs_core/runtime/jit/tests/direct_call_test.rs
similarity index 99%
rename from crates/neovm-core/src/emacs_core/runtime/jit/tests/direct_call.rs
rename to crates/neovm-core/src/emacs_core/runtime/jit/tests/direct_call_test.rs
index e9d7548a11..49b8eb907d 100644
--- a/crates/neovm-core/src/emacs_core/runtime/jit/tests/direct_call.rs
+++ b/crates/neovm-core/src/emacs_core/runtime/jit/tests/direct_call_test.rs
@@ -754,18 +754,18 @@ fn a_deep_direct_recursion_signals_bytecode_stack_overflow() {
 
 // P1.1 Stage 2 (`NEOVM_JIT_DIRECT_SHAPES`): the call shapes beyond the exact
 // named call, on this file's harness.
-#[path = "direct_call_shapes.rs"]
+#[path = "direct_call_shapes_test.rs"]
 #[cfg(test)]
 mod shapes;
 
-#[path = "direct_call_shape_parity.rs"]
+#[path = "direct_call_shape_parity_test.rs"]
 #[cfg(test)]
 mod shape_parity;
 
 #[cfg(test)]
-#[path = "direct_call_framed.rs"]
+#[path = "direct_call_framed_test.rs"]
 mod framed;
 
 #[cfg(test)]
-#[path = "direct_call_memory.rs"]
+#[path = "direct_call_memory_test.rs"]
 mod memory;
diff --git a/crates/neovm-core/src/emacs_core/runtime/jit/tests/direct_self_heat.rs b/crates/neovm-core/src/emacs_core/runtime/jit/tests/direct_self_heat_test.rs
similarity index 100%
rename from crates/neovm-core/src/emacs_core/runtime/jit/tests/direct_self_heat.rs
rename to crates/neovm-core/src/emacs_core/runtime/jit/tests/direct_self_heat_test.rs
diff --git a/crates/neovm-core/src/emacs_core/runtime/jit/tests/direct_self_kernel.rs b/crates/neovm-core/src/emacs_core/runtime/jit/tests/direct_self_kernel_test.rs
similarity index 100%
rename from crates/neovm-core/src/emacs_core/runtime/jit/tests/direct_self_kernel.rs
rename to crates/neovm-core/src/emacs_core/runtime/jit/tests/direct_self_kernel_test.rs
diff --git a/crates/neovm-core/src/emacs_core/runtime/jit/tests/direct_self.rs b/crates/neovm-core/src/emacs_core/runtime/jit/tests/direct_self_test.rs
similarity index 99%
rename from crates/neovm-core/src/emacs_core/runtime/jit/tests/direct_self.rs
rename to crates/neovm-core/src/emacs_core/runtime/jit/tests/direct_self_test.rs
index 29b0011367..ef43e912b7 100644
--- a/crates/neovm-core/src/emacs_core/runtime/jit/tests/direct_self.rs
+++ b/crates/neovm-core/src/emacs_core/runtime/jit/tests/direct_self_test.rs
@@ -43,11 +43,11 @@ impl Drop for SelfPolicy {
 }
 
 #[cfg(test)]
-#[path = "direct_self_heat.rs"]
+#[path = "direct_self_heat_test.rs"]
 mod heat_tests;
 
 #[cfg(test)]
-#[path = "direct_self_kernel.rs"]
+#[path = "direct_self_kernel_test.rs"]
 mod kernel_tests;
 
 const PROGRAM: &str = r#"(progn
diff --git a/crates/neovm-core/src/emacs_core/runtime/jit/tests/eq_swp_prefilter.rs b/crates/neovm-core/src/emacs_core/runtime/jit/tests/eq_swp_prefilter_test.rs
similarity index 100%
rename from crates/neovm-core/src/emacs_core/runtime/jit/tests/eq_swp_prefilter.rs
rename to crates/neovm-core/src/emacs_core/runtime/jit/tests/eq_swp_prefilter_test.rs
diff --git a/crates/neovm-core/src/emacs_core/runtime/jit/tests/fixnum_comparisons.rs b/crates/neovm-core/src/emacs_core/runtime/jit/tests/fixnum_comparisons_test.rs
similarity index 100%
rename from crates/neovm-core/src/emacs_core/runtime/jit/tests/fixnum_comparisons.rs
rename to crates/neovm-core/src/emacs_core/runtime/jit/tests/fixnum_comparisons_test.rs
diff --git a/crates/neovm-core/src/emacs_core/runtime/jit/tests/fixnum_ranges.rs b/crates/neovm-core/src/emacs_core/runtime/jit/tests/fixnum_ranges_test.rs
similarity index 100%
rename from crates/neovm-core/src/emacs_core/runtime/jit/tests/fixnum_ranges.rs
rename to crates/neovm-core/src/emacs_core/runtime/jit/tests/fixnum_ranges_test.rs
diff --git a/crates/neovm-core/src/emacs_core/runtime/jit/tests/flonum_slots.rs b/crates/neovm-core/src/emacs_core/runtime/jit/tests/flonum_slots_test.rs
similarity index 100%
rename from crates/neovm-core/src/emacs_core/runtime/jit/tests/flonum_slots.rs
rename to crates/neovm-core/src/emacs_core/runtime/jit/tests/flonum_slots_test.rs
diff --git a/crates/neovm-core/src/emacs_core/runtime/jit/tests/gen0_observed_blv_cold_capture.rs b/crates/neovm-core/src/emacs_core/runtime/jit/tests/gen0_observed_blv_cold_capture_test.rs
similarity index 100%
rename from crates/neovm-core/src/emacs_core/runtime/jit/tests/gen0_observed_blv_cold_capture.rs
rename to crates/neovm-core/src/emacs_core/runtime/jit/tests/gen0_observed_blv_cold_capture_test.rs
diff --git a/crates/neovm-core/src/emacs_core/runtime/jit/tests/gen0_observed_collection_revision.rs b/crates/neovm-core/src/emacs_core/runtime/jit/tests/gen0_observed_collection_revision_test.rs
similarity index 100%
rename from crates/neovm-core/src/emacs_core/runtime/jit/tests/gen0_observed_collection_revision.rs
rename to crates/neovm-core/src/emacs_core/runtime/jit/tests/gen0_observed_collection_revision_test.rs
diff --git a/crates/neovm-core/src/emacs_core/runtime/jit/tests/gen0_observed_multi_unbind.rs b/crates/neovm-core/src/emacs_core/runtime/jit/tests/gen0_observed_multi_unbind_test.rs
similarity index 100%
rename from crates/neovm-core/src/emacs_core/runtime/jit/tests/gen0_observed_multi_unbind.rs
rename to crates/neovm-core/src/emacs_core/runtime/jit/tests/gen0_observed_multi_unbind_test.rs
diff --git a/crates/neovm-core/src/emacs_core/runtime/jit/tests/gen0_tracked_collection_revision.rs b/crates/neovm-core/src/emacs_core/runtime/jit/tests/gen0_tracked_collection_revision_test.rs
similarity index 100%
rename from crates/neovm-core/src/emacs_core/runtime/jit/tests/gen0_tracked_collection_revision.rs
rename to crates/neovm-core/src/emacs_core/runtime/jit/tests/gen0_tracked_collection_revision_test.rs
diff --git a/crates/neovm-core/src/emacs_core/runtime/jit/tests/inline_chain_deopt.rs b/crates/neovm-core/src/emacs_core/runtime/jit/tests/inline_chain_deopt_test.rs
similarity index 100%
rename from crates/neovm-core/src/emacs_core/runtime/jit/tests/inline_chain_deopt.rs
rename to crates/neovm-core/src/emacs_core/runtime/jit/tests/inline_chain_deopt_test.rs
diff --git a/crates/neovm-core/src/emacs_core/runtime/jit/tests/inline_closure.rs b/crates/neovm-core/src/emacs_core/runtime/jit/tests/inline_closure_test.rs
similarity index 100%
rename from crates/neovm-core/src/emacs_core/runtime/jit/tests/inline_closure.rs
rename to crates/neovm-core/src/emacs_core/runtime/jit/tests/inline_closure_test.rs
diff --git a/crates/neovm-core/src/emacs_core/runtime/jit/tests/inline_entry_cache.rs b/crates/neovm-core/src/emacs_core/runtime/jit/tests/inline_entry_cache_test.rs
similarity index 100%
rename from crates/neovm-core/src/emacs_core/runtime/jit/tests/inline_entry_cache.rs
rename to crates/neovm-core/src/emacs_core/runtime/jit/tests/inline_entry_cache_test.rs
diff --git a/crates/neovm-core/src/emacs_core/runtime/jit/tests/inline_heap_collection_revision.rs b/crates/neovm-core/src/emacs_core/runtime/jit/tests/inline_heap_collection_revision_test.rs
similarity index 100%
rename from crates/neovm-core/src/emacs_core/runtime/jit/tests/inline_heap_collection_revision.rs
rename to crates/neovm-core/src/emacs_core/runtime/jit/tests/inline_heap_collection_revision_test.rs
diff --git a/crates/neovm-core/src/emacs_core/runtime/jit/tests/inline_heap_gen0_collection_revision.rs b/crates/neovm-core/src/emacs_core/runtime/jit/tests/inline_heap_gen0_collection_revision_test.rs
similarity index 100%
rename from crates/neovm-core/src/emacs_core/runtime/jit/tests/inline_heap_gen0_collection_revision.rs
rename to crates/neovm-core/src/emacs_core/runtime/jit/tests/inline_heap_gen0_collection_revision_test.rs
diff --git a/crates/neovm-core/src/emacs_core/runtime/jit/tests/inline_heap_generational.rs b/crates/neovm-core/src/emacs_core/runtime/jit/tests/inline_heap_generational_test.rs
similarity index 98%
rename from crates/neovm-core/src/emacs_core/runtime/jit/tests/inline_heap_generational.rs
rename to crates/neovm-core/src/emacs_core/runtime/jit/tests/inline_heap_generational_test.rs
index 279b66ec2c..4ebfc1f1e4 100644
--- a/crates/neovm-core/src/emacs_core/runtime/jit/tests/inline_heap_generational.rs
+++ b/crates/neovm-core/src/emacs_core/runtime/jit/tests/inline_heap_generational_test.rs
@@ -513,25 +513,25 @@ fn mapped_blv_default_never_uses_the_owned_cons_trailer_or_a_baked_remembered_fa
     assert_eq!(owner.cons_cdr().cons_car(), Value::make_int(67));
 }
 
-#[path = "inline_heap_collection_revision.rs"]
+#[path = "inline_heap_collection_revision_test.rs"]
 mod collection_revision;
 
 #[cfg(test)]
-#[path = "inline_heap_gen0_collection_revision.rs"]
+#[path = "inline_heap_gen0_collection_revision_test.rs"]
 mod gen0_collection_revision;
 
 #[cfg(test)]
-#[path = "gen0_observed_collection_revision.rs"]
+#[path = "gen0_observed_collection_revision_test.rs"]
 mod gen0_observed_collection_revision;
 
 #[cfg(test)]
-#[path = "string_observed_capacity.rs"]
+#[path = "string_observed_capacity_test.rs"]
 mod string_observed_capacity;
 
 #[cfg(test)]
-#[path = "gen0_observed_multi_unbind.rs"]
+#[path = "gen0_observed_multi_unbind_test.rs"]
 mod gen0_observed_multi_unbind;
 
 #[cfg(test)]
-#[path = "gen0_observed_blv_cold_capture.rs"]
+#[path = "gen0_observed_blv_cold_capture_test.rs"]
 mod gen0_observed_blv_cold_capture;
diff --git a/crates/neovm-core/src/emacs_core/runtime/jit/tests/inline_heap_ops.rs b/crates/neovm-core/src/emacs_core/runtime/jit/tests/inline_heap_ops_test.rs
similarity index 100%
rename from crates/neovm-core/src/emacs_core/runtime/jit/tests/inline_heap_ops.rs
rename to crates/neovm-core/src/emacs_core/runtime/jit/tests/inline_heap_ops_test.rs
diff --git a/crates/neovm-core/src/emacs_core/runtime/jit/tests/inline_hof_captures.rs b/crates/neovm-core/src/emacs_core/runtime/jit/tests/inline_hof_captures_test.rs
similarity index 100%
rename from crates/neovm-core/src/emacs_core/runtime/jit/tests/inline_hof_captures.rs
rename to crates/neovm-core/src/emacs_core/runtime/jit/tests/inline_hof_captures_test.rs
diff --git a/crates/neovm-core/src/emacs_core/runtime/jit/tests/inline_hof_headers.rs b/crates/neovm-core/src/emacs_core/runtime/jit/tests/inline_hof_headers_test.rs
similarity index 100%
rename from crates/neovm-core/src/emacs_core/runtime/jit/tests/inline_hof_headers.rs
rename to crates/neovm-core/src/emacs_core/runtime/jit/tests/inline_hof_headers_test.rs
diff --git a/crates/neovm-core/src/emacs_core/runtime/jit/tests/inline_hof_heap_policy.rs b/crates/neovm-core/src/emacs_core/runtime/jit/tests/inline_hof_heap_policy_test.rs
similarity index 100%
rename from crates/neovm-core/src/emacs_core/runtime/jit/tests/inline_hof_heap_policy.rs
rename to crates/neovm-core/src/emacs_core/runtime/jit/tests/inline_hof_heap_policy_test.rs
diff --git a/crates/neovm-core/src/emacs_core/runtime/jit/tests/inline_hof_length.rs b/crates/neovm-core/src/emacs_core/runtime/jit/tests/inline_hof_length_test.rs
similarity index 100%
rename from crates/neovm-core/src/emacs_core/runtime/jit/tests/inline_hof_length.rs
rename to crates/neovm-core/src/emacs_core/runtime/jit/tests/inline_hof_length_test.rs
diff --git a/crates/neovm-core/src/emacs_core/runtime/jit/tests/inline_hof_runtime.rs b/crates/neovm-core/src/emacs_core/runtime/jit/tests/inline_hof_runtime_test.rs
similarity index 100%
rename from crates/neovm-core/src/emacs_core/runtime/jit/tests/inline_hof_runtime.rs
rename to crates/neovm-core/src/emacs_core/runtime/jit/tests/inline_hof_runtime_test.rs
diff --git a/crates/neovm-core/src/emacs_core/runtime/jit/tests/inline_named_front.rs b/crates/neovm-core/src/emacs_core/runtime/jit/tests/inline_named_front_test.rs
similarity index 100%
rename from crates/neovm-core/src/emacs_core/runtime/jit/tests/inline_named_front.rs
rename to crates/neovm-core/src/emacs_core/runtime/jit/tests/inline_named_front_test.rs
diff --git a/crates/neovm-core/src/emacs_core/runtime/jit/tests/inline_named_runtime.rs b/crates/neovm-core/src/emacs_core/runtime/jit/tests/inline_named_runtime_test.rs
similarity index 100%
rename from crates/neovm-core/src/emacs_core/runtime/jit/tests/inline_named_runtime.rs
rename to crates/neovm-core/src/emacs_core/runtime/jit/tests/inline_named_runtime_test.rs
diff --git a/crates/neovm-core/src/emacs_core/runtime/jit/tests/inline_regalloc.rs b/crates/neovm-core/src/emacs_core/runtime/jit/tests/inline_regalloc_test.rs
similarity index 100%
rename from crates/neovm-core/src/emacs_core/runtime/jit/tests/inline_regalloc.rs
rename to crates/neovm-core/src/emacs_core/runtime/jit/tests/inline_regalloc_test.rs
diff --git a/crates/neovm-core/src/emacs_core/runtime/jit/tests/inline.rs b/crates/neovm-core/src/emacs_core/runtime/jit/tests/inline_test.rs
similarity index 100%
rename from crates/neovm-core/src/emacs_core/runtime/jit/tests/inline.rs
rename to crates/neovm-core/src/emacs_core/runtime/jit/tests/inline_test.rs
diff --git a/crates/neovm-core/src/emacs_core/runtime/jit/tests/inline_v2_closure.rs b/crates/neovm-core/src/emacs_core/runtime/jit/tests/inline_v2_closure_test.rs
similarity index 100%
rename from crates/neovm-core/src/emacs_core/runtime/jit/tests/inline_v2_closure.rs
rename to crates/neovm-core/src/emacs_core/runtime/jit/tests/inline_v2_closure_test.rs
diff --git a/crates/neovm-core/src/emacs_core/runtime/jit/tests/inline_v2_hof.rs b/crates/neovm-core/src/emacs_core/runtime/jit/tests/inline_v2_hof_test.rs
similarity index 100%
rename from crates/neovm-core/src/emacs_core/runtime/jit/tests/inline_v2_hof.rs
rename to crates/neovm-core/src/emacs_core/runtime/jit/tests/inline_v2_hof_test.rs
diff --git a/crates/neovm-core/src/emacs_core/runtime/jit/tests/inline_v2.rs b/crates/neovm-core/src/emacs_core/runtime/jit/tests/inline_v2_test.rs
similarity index 100%
rename from crates/neovm-core/src/emacs_core/runtime/jit/tests/inline_v2.rs
rename to crates/neovm-core/src/emacs_core/runtime/jit/tests/inline_v2_test.rs
diff --git a/crates/neovm-core/src/emacs_core/runtime/jit/tests/inline_vars.rs b/crates/neovm-core/src/emacs_core/runtime/jit/tests/inline_vars_test.rs
similarity index 100%
rename from crates/neovm-core/src/emacs_core/runtime/jit/tests/inline_vars.rs
rename to crates/neovm-core/src/emacs_core/runtime/jit/tests/inline_vars_test.rs
diff --git a/crates/neovm-core/src/emacs_core/runtime/jit/tests/intrinsics.rs b/crates/neovm-core/src/emacs_core/runtime/jit/tests/intrinsics_test.rs
similarity index 100%
rename from crates/neovm-core/src/emacs_core/runtime/jit/tests/intrinsics.rs
rename to crates/neovm-core/src/emacs_core/runtime/jit/tests/intrinsics_test.rs
diff --git a/crates/neovm-core/src/emacs_core/runtime/jit/tests/leaf_calls.rs b/crates/neovm-core/src/emacs_core/runtime/jit/tests/leaf_calls_test.rs
similarity index 100%
rename from crates/neovm-core/src/emacs_core/runtime/jit/tests/leaf_calls.rs
rename to crates/neovm-core/src/emacs_core/runtime/jit/tests/leaf_calls_test.rs
diff --git a/crates/neovm-core/src/emacs_core/runtime/jit/tests/mir_calls.rs b/crates/neovm-core/src/emacs_core/runtime/jit/tests/mir_calls_test.rs
similarity index 100%
rename from crates/neovm-core/src/emacs_core/runtime/jit/tests/mir_calls.rs
rename to crates/neovm-core/src/emacs_core/runtime/jit/tests/mir_calls_test.rs
diff --git a/crates/neovm-core/src/emacs_core/runtime/jit/tests/mir_cons_deopt.rs b/crates/neovm-core/src/emacs_core/runtime/jit/tests/mir_cons_deopt_test.rs
similarity index 100%
rename from crates/neovm-core/src/emacs_core/runtime/jit/tests/mir_cons_deopt.rs
rename to crates/neovm-core/src/emacs_core/runtime/jit/tests/mir_cons_deopt_test.rs
diff --git a/crates/neovm-core/src/emacs_core/runtime/jit/tests/mir_inline_guards.rs b/crates/neovm-core/src/emacs_core/runtime/jit/tests/mir_inline_guards_test.rs
similarity index 100%
rename from crates/neovm-core/src/emacs_core/runtime/jit/tests/mir_inline_guards.rs
rename to crates/neovm-core/src/emacs_core/runtime/jit/tests/mir_inline_guards_test.rs
diff --git a/crates/neovm-core/src/emacs_core/runtime/jit/tests/mir_leaf_effects.rs b/crates/neovm-core/src/emacs_core/runtime/jit/tests/mir_leaf_effects_test.rs
similarity index 100%
rename from crates/neovm-core/src/emacs_core/runtime/jit/tests/mir_leaf_effects.rs
rename to crates/neovm-core/src/emacs_core/runtime/jit/tests/mir_leaf_effects_test.rs
diff --git a/crates/neovm-core/src/emacs_core/runtime/jit/tests/mir_named_calls.rs b/crates/neovm-core/src/emacs_core/runtime/jit/tests/mir_named_calls_test.rs
similarity index 100%
rename from crates/neovm-core/src/emacs_core/runtime/jit/tests/mir_named_calls.rs
rename to crates/neovm-core/src/emacs_core/runtime/jit/tests/mir_named_calls_test.rs
diff --git a/crates/neovm-core/src/emacs_core/runtime/jit/tests/mir_reach_dead.rs b/crates/neovm-core/src/emacs_core/runtime/jit/tests/mir_reach_dead_test.rs
similarity index 100%
rename from crates/neovm-core/src/emacs_core/runtime/jit/tests/mir_reach_dead.rs
rename to crates/neovm-core/src/emacs_core/runtime/jit/tests/mir_reach_dead_test.rs
diff --git a/crates/neovm-core/src/emacs_core/runtime/jit/tests/native_frame_detach.rs b/crates/neovm-core/src/emacs_core/runtime/jit/tests/native_frame_detach_test.rs
similarity index 100%
rename from crates/neovm-core/src/emacs_core/runtime/jit/tests/native_frame_detach.rs
rename to crates/neovm-core/src/emacs_core/runtime/jit/tests/native_frame_detach_test.rs
diff --git a/crates/neovm-core/src/emacs_core/runtime/jit/tests/observability.rs b/crates/neovm-core/src/emacs_core/runtime/jit/tests/observability_test.rs
similarity index 100%
rename from crates/neovm-core/src/emacs_core/runtime/jit/tests/observability.rs
rename to crates/neovm-core/src/emacs_core/runtime/jit/tests/observability_test.rs
diff --git a/crates/neovm-core/src/emacs_core/runtime/jit/tests/opt_lower.rs b/crates/neovm-core/src/emacs_core/runtime/jit/tests/opt_lower_test.rs
similarity index 100%
rename from crates/neovm-core/src/emacs_core/runtime/jit/tests/opt_lower.rs
rename to crates/neovm-core/src/emacs_core/runtime/jit/tests/opt_lower_test.rs
diff --git a/crates/neovm-core/src/emacs_core/runtime/jit/tests/osr_bindings.rs b/crates/neovm-core/src/emacs_core/runtime/jit/tests/osr_bindings_test.rs
similarity index 100%
rename from crates/neovm-core/src/emacs_core/runtime/jit/tests/osr_bindings.rs
rename to crates/neovm-core/src/emacs_core/runtime/jit/tests/osr_bindings_test.rs
diff --git a/crates/neovm-core/src/emacs_core/runtime/jit/tests/osr_entry_guards.rs b/crates/neovm-core/src/emacs_core/runtime/jit/tests/osr_entry_guards_test.rs
similarity index 100%
rename from crates/neovm-core/src/emacs_core/runtime/jit/tests/osr_entry_guards.rs
rename to crates/neovm-core/src/emacs_core/runtime/jit/tests/osr_entry_guards_test.rs
diff --git a/crates/neovm-core/src/emacs_core/runtime/jit/tests/osr_poll.rs b/crates/neovm-core/src/emacs_core/runtime/jit/tests/osr_poll_test.rs
similarity index 100%
rename from crates/neovm-core/src/emacs_core/runtime/jit/tests/osr_poll.rs
rename to crates/neovm-core/src/emacs_core/runtime/jit/tests/osr_poll_test.rs
diff --git a/crates/neovm-core/src/emacs_core/runtime/jit/tests/osr_raw.rs b/crates/neovm-core/src/emacs_core/runtime/jit/tests/osr_raw_test.rs
similarity index 100%
rename from crates/neovm-core/src/emacs_core/runtime/jit/tests/osr_raw.rs
rename to crates/neovm-core/src/emacs_core/runtime/jit/tests/osr_raw_test.rs
diff --git a/crates/neovm-core/src/emacs_core/runtime/jit/tests/predicate_branches.rs b/crates/neovm-core/src/emacs_core/runtime/jit/tests/predicate_branches_test.rs
similarity index 100%
rename from crates/neovm-core/src/emacs_core/runtime/jit/tests/predicate_branches.rs
rename to crates/neovm-core/src/emacs_core/runtime/jit/tests/predicate_branches_test.rs
diff --git a/crates/neovm-core/src/emacs_core/runtime/jit/tests/shared_module.rs b/crates/neovm-core/src/emacs_core/runtime/jit/tests/shared_module_test.rs
similarity index 100%
rename from crates/neovm-core/src/emacs_core/runtime/jit/tests/shared_module.rs
rename to crates/neovm-core/src/emacs_core/runtime/jit/tests/shared_module_test.rs
diff --git a/crates/neovm-core/src/emacs_core/runtime/jit/tests/source_slots.rs b/crates/neovm-core/src/emacs_core/runtime/jit/tests/source_slots_test.rs
similarity index 100%
rename from crates/neovm-core/src/emacs_core/runtime/jit/tests/source_slots.rs
rename to crates/neovm-core/src/emacs_core/runtime/jit/tests/source_slots_test.rs
diff --git a/crates/neovm-core/src/emacs_core/runtime/jit/tests/spec_frames.rs b/crates/neovm-core/src/emacs_core/runtime/jit/tests/spec_frames_test.rs
similarity index 100%
rename from crates/neovm-core/src/emacs_core/runtime/jit/tests/spec_frames.rs
rename to crates/neovm-core/src/emacs_core/runtime/jit/tests/spec_frames_test.rs
diff --git a/crates/neovm-core/src/emacs_core/runtime/jit/tests/spec_gate.rs b/crates/neovm-core/src/emacs_core/runtime/jit/tests/spec_gate_test.rs
similarity index 100%
rename from crates/neovm-core/src/emacs_core/runtime/jit/tests/spec_gate.rs
rename to crates/neovm-core/src/emacs_core/runtime/jit/tests/spec_gate_test.rs
diff --git a/crates/neovm-core/src/emacs_core/runtime/jit/tests/spec_rest_calls.rs b/crates/neovm-core/src/emacs_core/runtime/jit/tests/spec_rest_calls_test.rs
similarity index 100%
rename from crates/neovm-core/src/emacs_core/runtime/jit/tests/spec_rest_calls.rs
rename to crates/neovm-core/src/emacs_core/runtime/jit/tests/spec_rest_calls_test.rs
diff --git a/crates/neovm-core/src/emacs_core/runtime/jit/tests/stack_guard.rs b/crates/neovm-core/src/emacs_core/runtime/jit/tests/stack_guard_test.rs
similarity index 100%
rename from crates/neovm-core/src/emacs_core/runtime/jit/tests/stack_guard.rs
rename to crates/neovm-core/src/emacs_core/runtime/jit/tests/stack_guard_test.rs
diff --git a/crates/neovm-core/src/emacs_core/runtime/jit/tests/string_observed_capacity.rs b/crates/neovm-core/src/emacs_core/runtime/jit/tests/string_observed_capacity_test.rs
similarity index 100%
rename from crates/neovm-core/src/emacs_core/runtime/jit/tests/string_observed_capacity.rs
rename to crates/neovm-core/src/emacs_core/runtime/jit/tests/string_observed_capacity_test.rs
diff --git a/crates/neovm-core/src/emacs_core/runtime/jit/tests/switch_dispatch.rs b/crates/neovm-core/src/emacs_core/runtime/jit/tests/switch_dispatch_test.rs
similarity index 100%
rename from crates/neovm-core/src/emacs_core/runtime/jit/tests/switch_dispatch.rs
rename to crates/neovm-core/src/emacs_core/runtime/jit/tests/switch_dispatch_test.rs
diff --git a/crates/neovm-core/src/emacs_core/runtime/jit/tests/switch_inline.rs b/crates/neovm-core/src/emacs_core/runtime/jit/tests/switch_inline_test.rs
similarity index 100%
rename from crates/neovm-core/src/emacs_core/runtime/jit/tests/switch_inline.rs
rename to crates/neovm-core/src/emacs_core/runtime/jit/tests/switch_inline_test.rs
diff --git a/crates/neovm-core/src/emacs_core/runtime/jit/tests/tail_calls.rs b/crates/neovm-core/src/emacs_core/runtime/jit/tests/tail_calls_test.rs
similarity index 100%
rename from crates/neovm-core/src/emacs_core/runtime/jit/tests/tail_calls.rs
rename to crates/neovm-core/src/emacs_core/runtime/jit/tests/tail_calls_test.rs
diff --git a/crates/neovm-core/src/emacs_core/runtime/jit/tests/varref_inline.rs b/crates/neovm-core/src/emacs_core/runtime/jit/tests/varref_inline_test.rs
similarity index 100%
rename from crates/neovm-core/src/emacs_core/runtime/jit/tests/varref_inline.rs
rename to crates/neovm-core/src/emacs_core/runtime/jit/tests/varref_inline_test.rs
diff --git a/crates/neovm-core/src/emacs_core/runtime/jit/vframe.rs b/crates/neovm-core/src/emacs_core/runtime/jit/vframe.rs
index 6fe2ac9f5e..6183c993c4 100644
--- a/crates/neovm-core/src/emacs_core/runtime/jit/vframe.rs
+++ b/crates/neovm-core/src/emacs_core/runtime/jit/vframe.rs
@@ -527,5 +527,5 @@ impl DeoptChain {
 }
 
 #[cfg(test)]
-#[path = "tests/inline_chain_deopt.rs"]
+#[path = "tests/inline_chain_deopt_test.rs"]
 mod tests;
diff --git a/crates/neovm-core/src/emacs_core/runtime/owned_roots/mod.rs b/crates/neovm-core/src/emacs_core/runtime/owned_roots/mod.rs
index 538a6750c5..7ffa54eadd 100644
--- a/crates/neovm-core/src/emacs_core/runtime/owned_roots/mod.rs
+++ b/crates/neovm-core/src/emacs_core/runtime/owned_roots/mod.rs
@@ -64,45 +64,5 @@ impl Context {
 }
 
 #[cfg(test)]
-mod tests {
-    use super::*;
-
-    #[test]
-    fn cloned_lease_survives_exact_gc_and_retires_with_last_owner() {
-        let mut context = Context::new();
-        context.gc_collect_exact();
-        let baseline = context.tagged_heap.allocated_count();
-        let value = Value::cons(Value::fixnum(17), Value::vector(vec![Value::fixnum(23)]));
-        let lease = context.retain_gc_roots([value]);
-        let pending = lease.clone();
-        drop(lease);
-        context.gc_collect_exact();
-        assert_eq!(
-            context.tagged_heap.allocated_count(),
-            baseline + 2,
-            "a pending native owner must keep the whole captured graph alive"
-        );
-        assert_eq!(value.cons_car(), Value::fixnum(17));
-        assert_eq!(
-            value.cons_cdr().as_vector_data().unwrap().as_slice(),
-            &[Value::fixnum(23)]
-        );
-        drop(pending);
-        context.gc_collect_exact();
-        assert_eq!(context.tagged_heap.allocated_count(), baseline);
-        assert!(context.owned_roots.leases.borrow().is_empty());
-    }
-
-    #[test]
-    fn retired_leases_do_not_accumulate_between_collections() {
-        let context = Context::new();
-        let value = Value::cons(Value::fixnum(1), Value::NIL);
-        for _ in 0..1000 {
-            let lease = context.retain_gc_roots([value]);
-            assert_eq!(context.owned_roots.leases.borrow().len(), 1);
-            drop(lease);
-        }
-        let immediate = context.retain_gc_roots([Value::NIL, Value::fixnum(2)]);
-        assert!(immediate.values.is_empty());
-    }
-}
+#[path = "tests/owned_roots_test.rs"]
+mod tests;
diff --git a/crates/neovm-core/src/emacs_core/runtime/owned_roots/tests/owned_roots_test.rs b/crates/neovm-core/src/emacs_core/runtime/owned_roots/tests/owned_roots_test.rs
new file mode 100644
index 0000000000..02890ef234
--- /dev/null
+++ b/crates/neovm-core/src/emacs_core/runtime/owned_roots/tests/owned_roots_test.rs
@@ -0,0 +1,40 @@
+use super::*;
+
+#[test]
+fn cloned_lease_survives_exact_gc_and_retires_with_last_owner() {
+    let mut context = Context::new();
+    context.gc_collect_exact();
+    let baseline = context.tagged_heap.allocated_count();
+    let value = Value::cons(Value::fixnum(17), Value::vector(vec![Value::fixnum(23)]));
+    let lease = context.retain_gc_roots([value]);
+    let pending = lease.clone();
+    drop(lease);
+    context.gc_collect_exact();
+    assert_eq!(
+        context.tagged_heap.allocated_count(),
+        baseline + 2,
+        "a pending native owner must keep the whole captured graph alive"
+    );
+    assert_eq!(value.cons_car(), Value::fixnum(17));
+    assert_eq!(
+        value.cons_cdr().as_vector_data().unwrap().as_slice(),
+        &[Value::fixnum(23)]
+    );
+    drop(pending);
+    context.gc_collect_exact();
+    assert_eq!(context.tagged_heap.allocated_count(), baseline);
+    assert!(context.owned_roots.leases.borrow().is_empty());
+}
+
+#[test]
+fn retired_leases_do_not_accumulate_between_collections() {
+    let context = Context::new();
+    let value = Value::cons(Value::fixnum(1), Value::NIL);
+    for _ in 0..1000 {
+        let lease = context.retain_gc_roots([value]);
+        assert_eq!(context.owned_roots.leases.borrow().len(), 1);
+        drop(lease);
+    }
+    let immediate = context.retain_gc_roots([Value::NIL, Value::fixnum(2)]);
+    assert!(immediate.values.is_empty());
+}
diff --git a/crates/neovm-core/src/emacs_core/runtime/pdump/charset_image.rs b/crates/neovm-core/src/emacs_core/runtime/pdump/charset_image.rs
index 1f8f54098b..a2c9f9b37c 100644
--- a/crates/neovm-core/src/emacs_core/runtime/pdump/charset_image.rs
+++ b/crates/neovm-core/src/emacs_core/runtime/pdump/charset_image.rs
@@ -555,5 +555,5 @@ pub(crate) fn empty_charset_registry() -> DumpCharsetRegistry {
 mod tests;
 
 #[cfg(test)]
-#[path = "charset_image/tests/mule_order.rs"]
+#[path = "charset_image/tests/mule_order_test.rs"]
 mod mule_order_tests;
diff --git a/crates/neovm-core/src/emacs_core/runtime/pdump/charset_image/tests/mule_order.rs b/crates/neovm-core/src/emacs_core/runtime/pdump/charset_image/tests/mule_order_test.rs
similarity index 100%
rename from crates/neovm-core/src/emacs_core/runtime/pdump/charset_image/tests/mule_order.rs
rename to crates/neovm-core/src/emacs_core/runtime/pdump/charset_image/tests/mule_order_test.rs
diff --git a/crates/neovm-core/src/emacs_core/runtime/pdump/mod.rs b/crates/neovm-core/src/emacs_core/runtime/pdump/mod.rs
index 0e4b70d262..75f88f5198 100644
--- a/crates/neovm-core/src/emacs_core/runtime/pdump/mod.rs
+++ b/crates/neovm-core/src/emacs_core/runtime/pdump/mod.rs
@@ -854,5 +854,5 @@ pub(crate) fn take_after_pdump_load_hook_pending(eval: &mut Context) -> bool {
 }
 
 #[cfg(test)]
-#[path = "tests/mod.rs"]
+#[path = "tests/pdump_test.rs"]
 mod tests;
diff --git a/crates/neovm-core/src/emacs_core/runtime/pdump/tests/bool_vectors.rs b/crates/neovm-core/src/emacs_core/runtime/pdump/tests/bool_vectors_test.rs
similarity index 100%
rename from crates/neovm-core/src/emacs_core/runtime/pdump/tests/bool_vectors.rs
rename to crates/neovm-core/src/emacs_core/runtime/pdump/tests/bool_vectors_test.rs
diff --git a/crates/neovm-core/src/emacs_core/runtime/pdump/tests/bytecode_slot_objects.rs b/crates/neovm-core/src/emacs_core/runtime/pdump/tests/bytecode_slot_objects_test.rs
similarity index 100%
rename from crates/neovm-core/src/emacs_core/runtime/pdump/tests/bytecode_slot_objects.rs
rename to crates/neovm-core/src/emacs_core/runtime/pdump/tests/bytecode_slot_objects_test.rs
diff --git a/crates/neovm-core/src/emacs_core/runtime/pdump/tests/decode_hardening.rs b/crates/neovm-core/src/emacs_core/runtime/pdump/tests/decode_hardening_test.rs
similarity index 100%
rename from crates/neovm-core/src/emacs_core/runtime/pdump/tests/decode_hardening.rs
rename to crates/neovm-core/src/emacs_core/runtime/pdump/tests/decode_hardening_test.rs
diff --git a/crates/neovm-core/src/emacs_core/runtime/pdump/tests/mod.rs b/crates/neovm-core/src/emacs_core/runtime/pdump/tests/pdump_test.rs
similarity index 99%
rename from crates/neovm-core/src/emacs_core/runtime/pdump/tests/mod.rs
rename to crates/neovm-core/src/emacs_core/runtime/pdump/tests/pdump_test.rs
index c97aea93dd..43be235211 100644
--- a/crates/neovm-core/src/emacs_core/runtime/pdump/tests/mod.rs
+++ b/crates/neovm-core/src/emacs_core/runtime/pdump/tests/pdump_test.rs
@@ -2304,8 +2304,11 @@ fn baked_stub_template_is_stack_state_independent() {
     );
 }
 
+#[path = "bool_vectors_test.rs"]
 mod bool_vectors;
+#[path = "bytecode_slot_objects_test.rs"]
 mod bytecode_slot_objects;
 
 #[cfg(test)]
+#[path = "decode_hardening_test.rs"]
 mod decode_hardening;
diff --git a/crates/neovm-core/src/emacs_core/runtime/plist/mod.rs b/crates/neovm-core/src/emacs_core/runtime/plist/mod.rs
index f3fc5b2ac8..fc26b59b74 100644
--- a/crates/neovm-core/src/emacs_core/runtime/plist/mod.rs
+++ b/crates/neovm-core/src/emacs_core/runtime/plist/mod.rs
@@ -421,5 +421,5 @@ pub fn plist_member(plist: Value, prop: &Value) -> Value {
 }
 
 #[cfg(test)]
-#[path = "tests/collection_capture.rs"]
+#[path = "tests/collection_capture_test.rs"]
 mod collection_capture;
diff --git a/crates/neovm-core/src/emacs_core/runtime/plist/tests/collection_capture.rs b/crates/neovm-core/src/emacs_core/runtime/plist/tests/collection_capture_test.rs
similarity index 100%
rename from crates/neovm-core/src/emacs_core/runtime/plist/tests/collection_capture.rs
rename to crates/neovm-core/src/emacs_core/runtime/plist/tests/collection_capture_test.rs
diff --git a/crates/neovm-core/src/emacs_core/runtime/runtime_identity/mod.rs b/crates/neovm-core/src/emacs_core/runtime/runtime_identity/mod.rs
index 482052ca18..f86c8f05cf 100644
--- a/crates/neovm-core/src/emacs_core/runtime/runtime_identity/mod.rs
+++ b/crates/neovm-core/src/emacs_core/runtime/runtime_identity/mod.rs
@@ -459,5 +459,5 @@ pub(crate) fn install(eval: &mut Context) {
 }
 
 #[cfg(test)]
-#[path = "tests/mod.rs"]
+#[path = "tests/runtime_identity_test.rs"]
 mod tests;
diff --git a/crates/neovm-core/src/emacs_core/runtime/runtime_identity/tests/mod.rs b/crates/neovm-core/src/emacs_core/runtime/runtime_identity/tests/runtime_identity_test.rs
similarity index 100%
rename from crates/neovm-core/src/emacs_core/runtime/runtime_identity/tests/mod.rs
rename to crates/neovm-core/src/emacs_core/runtime/runtime_identity/tests/runtime_identity_test.rs
diff --git a/crates/neovm-core/src/emacs_core/runtime/symbol/mod.rs b/crates/neovm-core/src/emacs_core/runtime/symbol/mod.rs
index 2d56e6690a..2104198ce6 100644
--- a/crates/neovm-core/src/emacs_core/runtime/symbol/mod.rs
+++ b/crates/neovm-core/src/emacs_core/runtime/symbol/mod.rs
@@ -5199,18 +5199,18 @@ impl Drop for ObarraySymbolCellSkipGuard {
 }
 
 #[cfg(test)]
-#[path = "tests/mod.rs"]
+#[path = "tests/symbol_test.rs"]
 mod tests;
 
 #[cfg(test)]
-#[path = "tests/jit_layout.rs"]
+#[path = "tests/jit_layout_test.rs"]
 mod jit_layout_tests;
 
 #[cfg(test)]
-#[path = "tests/fn_stamps.rs"]
+#[path = "tests/fn_stamps_test.rs"]
 mod fn_stamps_tests;
 
 /// Ledger 196: the buffer-local-read class ledger 191 named, pinned per site.
 #[cfg(test)]
-#[path = "tests/buffer_local_global_read.rs"]
+#[path = "tests/buffer_local_global_read_test.rs"]
 mod buffer_local_global_read_tests;
diff --git a/crates/neovm-core/src/emacs_core/runtime/symbol/tests/buffer_local_global_read.rs b/crates/neovm-core/src/emacs_core/runtime/symbol/tests/buffer_local_global_read_test.rs
similarity index 100%
rename from crates/neovm-core/src/emacs_core/runtime/symbol/tests/buffer_local_global_read.rs
rename to crates/neovm-core/src/emacs_core/runtime/symbol/tests/buffer_local_global_read_test.rs
diff --git a/crates/neovm-core/src/emacs_core/runtime/symbol/tests/fn_stamps.rs b/crates/neovm-core/src/emacs_core/runtime/symbol/tests/fn_stamps_test.rs
similarity index 100%
rename from crates/neovm-core/src/emacs_core/runtime/symbol/tests/fn_stamps.rs
rename to crates/neovm-core/src/emacs_core/runtime/symbol/tests/fn_stamps_test.rs
diff --git a/crates/neovm-core/src/emacs_core/runtime/symbol/tests/function_regression.rs b/crates/neovm-core/src/emacs_core/runtime/symbol/tests/function_regression_test.rs
similarity index 100%
rename from crates/neovm-core/src/emacs_core/runtime/symbol/tests/function_regression.rs
rename to crates/neovm-core/src/emacs_core/runtime/symbol/tests/function_regression_test.rs
diff --git a/crates/neovm-core/src/emacs_core/runtime/symbol/tests/jit_layout.rs b/crates/neovm-core/src/emacs_core/runtime/symbol/tests/jit_layout_test.rs
similarity index 100%
rename from crates/neovm-core/src/emacs_core/runtime/symbol/tests/jit_layout.rs
rename to crates/neovm-core/src/emacs_core/runtime/symbol/tests/jit_layout_test.rs
diff --git a/crates/neovm-core/src/emacs_core/runtime/symbol/tests/plist_regression.rs b/crates/neovm-core/src/emacs_core/runtime/symbol/tests/plist_regression_test.rs
similarity index 100%
rename from crates/neovm-core/src/emacs_core/runtime/symbol/tests/plist_regression.rs
rename to crates/neovm-core/src/emacs_core/runtime/symbol/tests/plist_regression_test.rs
diff --git a/crates/neovm-core/src/emacs_core/runtime/symbol/tests/redirect_regression.rs b/crates/neovm-core/src/emacs_core/runtime/symbol/tests/redirect_regression_test.rs
similarity index 100%
rename from crates/neovm-core/src/emacs_core/runtime/symbol/tests/redirect_regression.rs
rename to crates/neovm-core/src/emacs_core/runtime/symbol/tests/redirect_regression_test.rs
diff --git a/crates/neovm-core/src/emacs_core/runtime/symbol/tests/mod.rs b/crates/neovm-core/src/emacs_core/runtime/symbol/tests/symbol_test.rs
similarity index 100%
rename from crates/neovm-core/src/emacs_core/runtime/symbol/tests/mod.rs
rename to crates/neovm-core/src/emacs_core/runtime/symbol/tests/symbol_test.rs
diff --git a/crates/neovm-core/src/emacs_core/runtime/threads/mod.rs b/crates/neovm-core/src/emacs_core/runtime/threads/mod.rs
index d77b739830..bd702c398c 100644
--- a/crates/neovm-core/src/emacs_core/runtime/threads/mod.rs
+++ b/crates/neovm-core/src/emacs_core/runtime/threads/mod.rs
@@ -1573,5 +1573,5 @@ pub(crate) fn sf_with_mutex(eval: &mut super::eval::Context, tail: &[Value]) ->
 // Tests
 // ===========================================================================
 #[cfg(test)]
-#[path = "tests/mod.rs"]
+#[path = "tests/threads_test.rs"]
 mod tests;
diff --git a/crates/neovm-core/src/emacs_core/runtime/threads/tests/mod.rs b/crates/neovm-core/src/emacs_core/runtime/threads/tests/threads_test.rs
similarity index 100%
rename from crates/neovm-core/src/emacs_core/runtime/threads/tests/mod.rs
rename to crates/neovm-core/src/emacs_core/runtime/threads/tests/threads_test.rs
diff --git a/crates/neovm-core/src/emacs_core/runtime/value/mod.rs b/crates/neovm-core/src/emacs_core/runtime/value/mod.rs
index 691c4f8cfb..99c98bb7c3 100644
--- a/crates/neovm-core/src/emacs_core/runtime/value/mod.rs
+++ b/crates/neovm-core/src/emacs_core/runtime/value/mod.rs
@@ -5567,21 +5567,21 @@ use hash_index::{HashIndex, fx_hash_key, stored_hash};
 // Tests
 // ---------------------------------------------------------------------------
 #[cfg(test)]
-#[path = "tests/mod.rs"]
+#[path = "tests/value_test.rs"]
 mod tests;
 
 #[cfg(test)]
-#[path = "tests/bytecode_capture.rs"]
+#[path = "tests/bytecode_capture_test.rs"]
 mod bytecode_capture_tests;
 
 #[cfg(test)]
-#[path = "tests/metadata_capture.rs"]
+#[path = "tests/metadata_capture_test.rs"]
 mod metadata_capture_tests;
 
 #[cfg(test)]
-#[path = "tests/heap_mut_closure_guard.rs"]
+#[path = "tests/heap_mut_closure_guard_test.rs"]
 mod heap_mut_closure_guard;
 
 #[cfg(test)]
-#[path = "tests/gc_generational_hydration.rs"]
+#[path = "tests/gc_generational_hydration_test.rs"]
 mod gc_generational_hydration;
diff --git a/crates/neovm-core/src/emacs_core/runtime/value/tests/bytecode_capture.rs b/crates/neovm-core/src/emacs_core/runtime/value/tests/bytecode_capture_test.rs
similarity index 100%
rename from crates/neovm-core/src/emacs_core/runtime/value/tests/bytecode_capture.rs
rename to crates/neovm-core/src/emacs_core/runtime/value/tests/bytecode_capture_test.rs
diff --git a/crates/neovm-core/src/emacs_core/runtime/value/tests/equal_lookup_gnu.rs b/crates/neovm-core/src/emacs_core/runtime/value/tests/equal_lookup_gnu_test.rs
similarity index 100%
rename from crates/neovm-core/src/emacs_core/runtime/value/tests/equal_lookup_gnu.rs
rename to crates/neovm-core/src/emacs_core/runtime/value/tests/equal_lookup_gnu_test.rs
diff --git a/crates/neovm-core/src/emacs_core/runtime/value/tests/gc_generational_hydration.rs b/crates/neovm-core/src/emacs_core/runtime/value/tests/gc_generational_hydration_test.rs
similarity index 100%
rename from crates/neovm-core/src/emacs_core/runtime/value/tests/gc_generational_hydration.rs
rename to crates/neovm-core/src/emacs_core/runtime/value/tests/gc_generational_hydration_test.rs
diff --git a/crates/neovm-core/src/emacs_core/runtime/value/tests/hash_probe.rs b/crates/neovm-core/src/emacs_core/runtime/value/tests/hash_probe_test.rs
similarity index 100%
rename from crates/neovm-core/src/emacs_core/runtime/value/tests/hash_probe.rs
rename to crates/neovm-core/src/emacs_core/runtime/value/tests/hash_probe_test.rs
diff --git a/crates/neovm-core/src/emacs_core/runtime/value/tests/heap_mut_closure_guard.rs b/crates/neovm-core/src/emacs_core/runtime/value/tests/heap_mut_closure_guard_test.rs
similarity index 100%
rename from crates/neovm-core/src/emacs_core/runtime/value/tests/heap_mut_closure_guard.rs
rename to crates/neovm-core/src/emacs_core/runtime/value/tests/heap_mut_closure_guard_test.rs
diff --git a/crates/neovm-core/src/emacs_core/runtime/value/tests/jump_table_lookup.rs b/crates/neovm-core/src/emacs_core/runtime/value/tests/jump_table_lookup_test.rs
similarity index 100%
rename from crates/neovm-core/src/emacs_core/runtime/value/tests/jump_table_lookup.rs
rename to crates/neovm-core/src/emacs_core/runtime/value/tests/jump_table_lookup_test.rs
diff --git a/crates/neovm-core/src/emacs_core/runtime/value/tests/metadata_capture.rs b/crates/neovm-core/src/emacs_core/runtime/value/tests/metadata_capture_test.rs
similarity index 100%
rename from crates/neovm-core/src/emacs_core/runtime/value/tests/metadata_capture.rs
rename to crates/neovm-core/src/emacs_core/runtime/value/tests/metadata_capture_test.rs
diff --git a/crates/neovm-core/src/emacs_core/runtime/value/tests/mod.rs b/crates/neovm-core/src/emacs_core/runtime/value/tests/value_test.rs
similarity index 99%
rename from crates/neovm-core/src/emacs_core/runtime/value/tests/mod.rs
rename to crates/neovm-core/src/emacs_core/runtime/value/tests/value_test.rs
index 46c5405846..a7f5899b65 100644
--- a/crates/neovm-core/src/emacs_core/runtime/value/tests/mod.rs
+++ b/crates/neovm-core/src/emacs_core/runtime/value/tests/value_test.rs
@@ -1328,6 +1328,9 @@ fn list_iter_terminates_on_a_circular_list() {
     );
 }
 
+#[path = "equal_lookup_gnu_test.rs"]
 mod equal_lookup_gnu;
+#[path = "hash_probe_test.rs"]
 mod hash_probe;
+#[path = "jump_table_lookup_test.rs"]
 pub(super) mod jump_table_lookup;
diff --git a/crates/neovm-core/src/emacs_core/runtime/value_reader/mod.rs b/crates/neovm-core/src/emacs_core/runtime/value_reader/mod.rs
index 2eeafd49ec..3903149e19 100644
--- a/crates/neovm-core/src/emacs_core/runtime/value_reader/mod.rs
+++ b/crates/neovm-core/src/emacs_core/runtime/value_reader/mod.rs
@@ -3155,5 +3155,5 @@ fn maybe_recombine_latin1_emacs(data: Vec<u8>) -> crate::heap_types::LispString
 // Tests
 // ---------------------------------------------------------------------------
 #[cfg(test)]
-#[path = "tests/mod.rs"]
+#[path = "tests/value_reader_test.rs"]
 mod tests;
diff --git a/crates/neovm-core/src/emacs_core/runtime/value_reader/tests/mod.rs b/crates/neovm-core/src/emacs_core/runtime/value_reader/tests/value_reader_test.rs
similarity index 100%
rename from crates/neovm-core/src/emacs_core/runtime/value_reader/tests/mod.rs
rename to crates/neovm-core/src/emacs_core/runtime/value_reader/tests/value_reader_test.rs
diff --git a/crates/neovm-core/src/emacs_core/system/callproc/mod.rs b/crates/neovm-core/src/emacs_core/system/callproc/mod.rs
index b58816085b..09e8b0e089 100644
--- a/crates/neovm-core/src/emacs_core/system/callproc/mod.rs
+++ b/crates/neovm-core/src/emacs_core/system/callproc/mod.rs
@@ -1668,13 +1668,13 @@ fn parse_output_lines(stdout: &[u8]) -> Value {
 }
 
 #[cfg(test)]
-#[path = "tests/raw_bytes.rs"]
+#[path = "tests/raw_bytes_test.rs"]
 mod raw_bytes_tests;
 
 #[cfg(test)]
-#[path = "tests/read_coding.rs"]
+#[path = "tests/read_coding_test.rs"]
 mod read_coding_tests;
 
 #[cfg(test)]
-#[path = "tests/working_dir_infile.rs"]
+#[path = "tests/working_dir_infile_test.rs"]
 mod working_dir_infile_tests;
diff --git a/crates/neovm-core/src/emacs_core/system/callproc/spawn.rs b/crates/neovm-core/src/emacs_core/system/callproc/spawn.rs
index 28407d1893..254aea3f6f 100644
--- a/crates/neovm-core/src/emacs_core/system/callproc/spawn.rs
+++ b/crates/neovm-core/src/emacs_core/system/callproc/spawn.rs
@@ -1131,5 +1131,5 @@ mod posix {
 }
 
 #[cfg(all(test, unix))]
-#[path = "tests/spawn.rs"]
+#[path = "tests/spawn_test.rs"]
 mod tests;
diff --git a/crates/neovm-core/src/emacs_core/system/callproc/tests/raw_bytes.rs b/crates/neovm-core/src/emacs_core/system/callproc/tests/raw_bytes_test.rs
similarity index 100%
rename from crates/neovm-core/src/emacs_core/system/callproc/tests/raw_bytes.rs
rename to crates/neovm-core/src/emacs_core/system/callproc/tests/raw_bytes_test.rs
diff --git a/crates/neovm-core/src/emacs_core/system/callproc/tests/read_coding.rs b/crates/neovm-core/src/emacs_core/system/callproc/tests/read_coding_test.rs
similarity index 100%
rename from crates/neovm-core/src/emacs_core/system/callproc/tests/read_coding.rs
rename to crates/neovm-core/src/emacs_core/system/callproc/tests/read_coding_test.rs
diff --git a/crates/neovm-core/src/emacs_core/system/callproc/tests/spawn.rs b/crates/neovm-core/src/emacs_core/system/callproc/tests/spawn_test.rs
similarity index 100%
rename from crates/neovm-core/src/emacs_core/system/callproc/tests/spawn.rs
rename to crates/neovm-core/src/emacs_core/system/callproc/tests/spawn_test.rs
diff --git a/crates/neovm-core/src/emacs_core/system/callproc/tests/working_dir_infile.rs b/crates/neovm-core/src/emacs_core/system/callproc/tests/working_dir_infile_test.rs
similarity index 100%
rename from crates/neovm-core/src/emacs_core/system/callproc/tests/working_dir_infile.rs
rename to crates/neovm-core/src/emacs_core/system/callproc/tests/working_dir_infile_test.rs
diff --git a/crates/neovm-core/src/emacs_core/system/dbusbind/tests/call.rs b/crates/neovm-core/src/emacs_core/system/dbusbind/tests/call_test.rs
similarity index 91%
rename from crates/neovm-core/src/emacs_core/system/dbusbind/tests/call.rs
rename to crates/neovm-core/src/emacs_core/system/dbusbind/tests/call_test.rs
index 9b82f82acd..85994ee54f 100644
--- a/crates/neovm-core/src/emacs_core/system/dbusbind/tests/call.rs
+++ b/crates/neovm-core/src/emacs_core/system/dbusbind/tests/call_test.rs
@@ -5,7 +5,8 @@
 use crate::emacs_core::eval::Context;
 
 fn load_dbus(eval: &mut Context) -> bool {
-    match eval.eval_str("(progn (require 'dbus) (dbus-ignore-errors (dbus-get-unique-name :session)))")
+    match eval
+        .eval_str("(progn (require 'dbus) (dbus-ignore-errors (dbus-get-unique-name :session)))")
     {
         Ok(name) if name.is_string() => true,
         Ok(_) => false,
diff --git a/crates/neovm-core/src/emacs_core/system/dbusbind/tests/connection.rs b/crates/neovm-core/src/emacs_core/system/dbusbind/tests/connection_test.rs
similarity index 97%
rename from crates/neovm-core/src/emacs_core/system/dbusbind/tests/connection.rs
rename to crates/neovm-core/src/emacs_core/system/dbusbind/tests/connection_test.rs
index 348c334995..ce5360b16d 100644
--- a/crates/neovm-core/src/emacs_core/system/dbusbind/tests/connection.rs
+++ b/crates/neovm-core/src/emacs_core/system/dbusbind/tests/connection_test.rs
@@ -11,7 +11,9 @@ fn session_bus_unique_name_has_gnu_shape() {
     let refs = match super::super::connection::init_bus(
         &mut ctx,
         vec![Value::keyword_by_name(":session")],
-    ).kinded() {
+    )
+    .kinded()
+    {
         Ok(value) => value,
         Err(FlowKind::Signal(signal)) if signal.symbol_name() == "dbus-error" => return,
         Err(err) => panic!("unexpected init-bus failure: {err:?}"),
diff --git a/crates/neovm-core/src/emacs_core/system/dbusbind/tests/mod.rs b/crates/neovm-core/src/emacs_core/system/dbusbind/tests/mod.rs
index 06bacde3f1..469c291702 100644
--- a/crates/neovm-core/src/emacs_core/system/dbusbind/tests/mod.rs
+++ b/crates/neovm-core/src/emacs_core/system/dbusbind/tests/mod.rs
@@ -1,10 +1,15 @@
+#[path = "surface_test.rs"]
 mod surface;
 
 std::cfg_select! {
     neomacs_have_dbus => {
+        #[path = "call_test.rs"]
         mod call;
+        #[path = "connection_test.rs"]
         mod connection;
+        #[path = "signal_test.rs"]
         mod signal;
+        #[path = "types_test.rs"]
         mod types;
     }
     _ => {}
diff --git a/crates/neovm-core/src/emacs_core/system/dbusbind/tests/signal.rs b/crates/neovm-core/src/emacs_core/system/dbusbind/tests/signal_test.rs
similarity index 98%
rename from crates/neovm-core/src/emacs_core/system/dbusbind/tests/signal.rs
rename to crates/neovm-core/src/emacs_core/system/dbusbind/tests/signal_test.rs
index cd10cd102f..ff19497de5 100644
--- a/crates/neovm-core/src/emacs_core/system/dbusbind/tests/signal.rs
+++ b/crates/neovm-core/src/emacs_core/system/dbusbind/tests/signal_test.rs
@@ -37,7 +37,8 @@ fn handler_slot(queued: Value) -> Value {
 }
 
 fn load_dbus(eval: &mut Context) -> bool {
-    match eval.eval_str("(progn (require 'dbus) (dbus-ignore-errors (dbus-get-unique-name :session)))")
+    match eval
+        .eval_str("(progn (require 'dbus) (dbus-ignore-errors (dbus-get-unique-name :session)))")
     {
         Ok(name) if name.is_string() => true,
         Ok(_) => false,
diff --git a/crates/neovm-core/src/emacs_core/system/dbusbind/tests/surface.rs b/crates/neovm-core/src/emacs_core/system/dbusbind/tests/surface_test.rs
similarity index 100%
rename from crates/neovm-core/src/emacs_core/system/dbusbind/tests/surface.rs
rename to crates/neovm-core/src/emacs_core/system/dbusbind/tests/surface_test.rs
diff --git a/crates/neovm-core/src/emacs_core/system/dbusbind/tests/types.rs b/crates/neovm-core/src/emacs_core/system/dbusbind/tests/types_test.rs
similarity index 81%
rename from crates/neovm-core/src/emacs_core/system/dbusbind/tests/types.rs
rename to crates/neovm-core/src/emacs_core/system/dbusbind/tests/types_test.rs
index 2c312ca687..c2bb46634b 100644
--- a/crates/neovm-core/src/emacs_core/system/dbusbind/tests/types.rs
+++ b/crates/neovm-core/src/emacs_core/system/dbusbind/tests/types_test.rs
@@ -11,8 +11,14 @@ fn gnu_object_to_dbus_type_matches_dbusbind_c() {
     crate::test_utils::init_test_tracing();
     assert_eq!(object_to_arg_type(Value::T).unwrap(), ArgType::Boolean);
     assert_eq!(object_to_arg_type(Value::NIL).unwrap(), ArgType::Boolean);
-    assert_eq!(object_to_arg_type(Value::fixnum(3)).unwrap(), ArgType::UInt32);
-    assert_eq!(object_to_arg_type(Value::fixnum(-3)).unwrap(), ArgType::Int32);
+    assert_eq!(
+        object_to_arg_type(Value::fixnum(3)).unwrap(),
+        ArgType::UInt32
+    );
+    assert_eq!(
+        object_to_arg_type(Value::fixnum(-3)).unwrap(),
+        ArgType::Int32
+    );
     assert_eq!(
         object_to_arg_type(Value::make_float(1.5)).unwrap(),
         ArgType::Double
diff --git a/crates/neovm-core/src/emacs_core/system/dynamic_module/mod.rs b/crates/neovm-core/src/emacs_core/system/dynamic_module/mod.rs
index f34babfaac..bdb4c60266 100644
--- a/crates/neovm-core/src/emacs_core/system/dynamic_module/mod.rs
+++ b/crates/neovm-core/src/emacs_core/system/dynamic_module/mod.rs
@@ -2420,5 +2420,5 @@ pub fn apply_module_function(ctx: &mut Context, func: Value, args: Vec<Value>) -
 mod tests;
 
 #[cfg(test)]
-#[path = "tests/gc_tls_ownership.rs"]
+#[path = "tests/gc_tls_ownership_test.rs"]
 mod gc_tls_ownership_tests;
diff --git a/crates/neovm-core/src/emacs_core/system/dynamic_module/tests/gc_tls_ownership.rs b/crates/neovm-core/src/emacs_core/system/dynamic_module/tests/gc_tls_ownership_test.rs
similarity index 100%
rename from crates/neovm-core/src/emacs_core/system/dynamic_module/tests/gc_tls_ownership.rs
rename to crates/neovm-core/src/emacs_core/system/dynamic_module/tests/gc_tls_ownership_test.rs
diff --git a/crates/neovm-core/src/emacs_core/system/fileio/mod.rs b/crates/neovm-core/src/emacs_core/system/fileio/mod.rs
index 8b4e693c90..4c61e7e321 100644
--- a/crates/neovm-core/src/emacs_core/system/fileio/mod.rs
+++ b/crates/neovm-core/src/emacs_core/system/fileio/mod.rs
@@ -7263,9 +7263,9 @@ pub fn register_bootstrap_vars(obarray: &mut crate::emacs_core::symbol::Obarray)
 // Tests
 // ===========================================================================
 #[cfg(test)]
-#[path = "tests/mod.rs"]
+#[path = "tests/fileio_test.rs"]
 mod tests;
 
 #[cfg(test)]
-#[path = "tests/fix8.rs"]
+#[path = "tests/fix8_test.rs"]
 mod fix8_tests;
diff --git a/crates/neovm-core/src/emacs_core/system/fileio/tests/mod.rs b/crates/neovm-core/src/emacs_core/system/fileio/tests/fileio_test.rs
similarity index 99%
rename from crates/neovm-core/src/emacs_core/system/fileio/tests/mod.rs
rename to crates/neovm-core/src/emacs_core/system/fileio/tests/fileio_test.rs
index 6994f652ee..ee409198ab 100644
--- a/crates/neovm-core/src/emacs_core/system/fileio/tests/mod.rs
+++ b/crates/neovm-core/src/emacs_core/system/fileio/tests/fileio_test.rs
@@ -8,8 +8,10 @@ use std::io::{self, Write};
 #[cfg(unix)]
 use std::os::unix::ffi::{OsStrExt, OsStringExt};
 
+#[path = "backup_test.rs"]
 mod backup_test;
 #[cfg(target_os = "windows")]
+#[path = "windows_test.rs"]
 mod windows_test;
 
 fn bootstrap_eval(src: &str) -> Vec<String> {
diff --git a/crates/neovm-core/src/emacs_core/system/fileio/tests/fix8.rs b/crates/neovm-core/src/emacs_core/system/fileio/tests/fix8_test.rs
similarity index 100%
rename from crates/neovm-core/src/emacs_core/system/fileio/tests/fix8.rs
rename to crates/neovm-core/src/emacs_core/system/fileio/tests/fix8_test.rs
diff --git a/crates/neovm-core/src/emacs_core/system/filelock/mod.rs b/crates/neovm-core/src/emacs_core/system/filelock/mod.rs
index e7d660637d..1278f61328 100644
--- a/crates/neovm-core/src/emacs_core/system/filelock/mod.rs
+++ b/crates/neovm-core/src/emacs_core/system/filelock/mod.rs
@@ -801,5 +801,5 @@ pub(crate) fn builtin_unlock_buffer(
 }
 
 #[cfg(test)]
-#[path = "tests/mod.rs"]
+#[path = "tests/filelock_test.rs"]
 mod tests;
diff --git a/crates/neovm-core/src/emacs_core/system/filelock/tests/mod.rs b/crates/neovm-core/src/emacs_core/system/filelock/tests/filelock_test.rs
similarity index 100%
rename from crates/neovm-core/src/emacs_core/system/filelock/tests/mod.rs
rename to crates/neovm-core/src/emacs_core/system/filelock/tests/filelock_test.rs
diff --git a/crates/neovm-core/src/emacs_core/system/network/mod.rs b/crates/neovm-core/src/emacs_core/system/network/mod.rs
index 618cf18cf0..2a34c65149 100644
--- a/crates/neovm-core/src/emacs_core/system/network/mod.rs
+++ b/crates/neovm-core/src/emacs_core/system/network/mod.rs
@@ -388,5 +388,5 @@ fn expect_int(value: &Value) -> Result<i64, Flow> {
 // Tests
 // ---------------------------------------------------------------------------
 #[cfg(test)]
-#[path = "tests/mod.rs"]
+#[path = "tests/network_test.rs"]
 mod tests;
diff --git a/crates/neovm-core/src/emacs_core/system/network/tests/mod.rs b/crates/neovm-core/src/emacs_core/system/network/tests/network_test.rs
similarity index 100%
rename from crates/neovm-core/src/emacs_core/system/network/tests/mod.rs
rename to crates/neovm-core/src/emacs_core/system/network/tests/network_test.rs
diff --git a/crates/neovm-core/src/emacs_core/system/os_signal/mod.rs b/crates/neovm-core/src/emacs_core/system/os_signal/mod.rs
index 393da9122d..a58819d9bb 100644
--- a/crates/neovm-core/src/emacs_core/system/os_signal/mod.rs
+++ b/crates/neovm-core/src/emacs_core/system/os_signal/mod.rs
@@ -879,5 +879,5 @@ pub(crate) fn drain_pending_os_signals(
 }
 
 #[cfg(test)]
-#[path = "tests/mod.rs"]
+#[path = "tests/os_signal_test.rs"]
 mod os_signal_test;
diff --git a/crates/neovm-core/src/emacs_core/system/os_signal/tests/mod.rs b/crates/neovm-core/src/emacs_core/system/os_signal/tests/os_signal_test.rs
similarity index 100%
rename from crates/neovm-core/src/emacs_core/system/os_signal/tests/mod.rs
rename to crates/neovm-core/src/emacs_core/system/os_signal/tests/os_signal_test.rs
diff --git a/crates/neovm-core/src/emacs_core/system/path_exec/mod.rs b/crates/neovm-core/src/emacs_core/system/path_exec/mod.rs
index 782a7e4b78..5d26ff0d7d 100644
--- a/crates/neovm-core/src/emacs_core/system/path_exec/mod.rs
+++ b/crates/neovm-core/src/emacs_core/system/path_exec/mod.rs
@@ -213,5 +213,5 @@ pub fn resolve() -> Option<PathExec> {
 }
 
 #[cfg(test)]
-#[path = "tests/mod.rs"]
+#[path = "tests/path_exec_test.rs"]
 mod tests;
diff --git a/crates/neovm-core/src/emacs_core/system/path_exec/tests/mod.rs b/crates/neovm-core/src/emacs_core/system/path_exec/tests/path_exec_test.rs
similarity index 100%
rename from crates/neovm-core/src/emacs_core/system/path_exec/tests/mod.rs
rename to crates/neovm-core/src/emacs_core/system/path_exec/tests/path_exec_test.rs
diff --git a/crates/neovm-core/src/emacs_core/system/platform/c_features/tests/surface.rs b/crates/neovm-core/src/emacs_core/system/platform/c_features/tests/surface_test.rs
similarity index 100%
rename from crates/neovm-core/src/emacs_core/system/platform/c_features/tests/surface.rs
rename to crates/neovm-core/src/emacs_core/system/platform/c_features/tests/surface_test.rs
diff --git a/crates/neovm-core/src/emacs_core/system/post_image_init/mod.rs b/crates/neovm-core/src/emacs_core/system/post_image_init/mod.rs
index 15d2dc68f9..be42c8b39b 100644
--- a/crates/neovm-core/src/emacs_core/system/post_image_init/mod.rs
+++ b/crates/neovm-core/src/emacs_core/system/post_image_init/mod.rs
@@ -1216,5 +1216,5 @@ pub(crate) fn apply_post_image_init(eval: &mut Context) {
 }
 
 #[cfg(test)]
-#[path = "tests/mod.rs"]
+#[path = "tests/post_image_init_test.rs"]
 mod post_image_init_test;
diff --git a/crates/neovm-core/src/emacs_core/system/post_image_init/tests/mod.rs b/crates/neovm-core/src/emacs_core/system/post_image_init/tests/post_image_init_test.rs
similarity index 100%
rename from crates/neovm-core/src/emacs_core/system/post_image_init/tests/mod.rs
rename to crates/neovm-core/src/emacs_core/system/post_image_init/tests/post_image_init_test.rs
diff --git a/crates/neovm-core/src/emacs_core/system/process/mod.rs b/crates/neovm-core/src/emacs_core/system/process/mod.rs
index bb57c6f927..2a71bb9eab 100644
--- a/crates/neovm-core/src/emacs_core/system/process/mod.rs
+++ b/crates/neovm-core/src/emacs_core/system/process/mod.rs
@@ -514,7 +514,7 @@ use crate::heap_types::LispString;
 // Tests
 // ---------------------------------------------------------------------------
 #[cfg(test)]
-#[path = "tests/raw_bytes.rs"]
+#[path = "tests/raw_bytes_test.rs"]
 mod raw_bytes_tests;
 
 mod builtins;
@@ -529,5 +529,5 @@ pub(crate) use helpers::*;
 mod types;
 pub use types::*;
 #[cfg(test)]
-#[path = "tests/mod.rs"]
+#[path = "tests/process_test.rs"]
 mod tests;
diff --git a/crates/neovm-core/src/emacs_core/system/process/tests/mod.rs b/crates/neovm-core/src/emacs_core/system/process/tests/process_test.rs
similarity index 100%
rename from crates/neovm-core/src/emacs_core/system/process/tests/mod.rs
rename to crates/neovm-core/src/emacs_core/system/process/tests/process_test.rs
diff --git a/crates/neovm-core/src/emacs_core/system/process/tests/raw_bytes.rs b/crates/neovm-core/src/emacs_core/system/process/tests/raw_bytes_test.rs
similarity index 100%
rename from crates/neovm-core/src/emacs_core/system/process/tests/raw_bytes.rs
rename to crates/neovm-core/src/emacs_core/system/process/tests/raw_bytes_test.rs
diff --git a/crates/neovm-core/src/emacs_core/system/shell_file_name/mod.rs b/crates/neovm-core/src/emacs_core/system/shell_file_name/mod.rs
index a1eecc31b1..c19d41e381 100644
--- a/crates/neovm-core/src/emacs_core/system/shell_file_name/mod.rs
+++ b/crates/neovm-core/src/emacs_core/system/shell_file_name/mod.rs
@@ -96,5 +96,5 @@ pub(crate) fn install(eval: &mut Context) {
 }
 
 #[cfg(test)]
-#[path = "tests/mod.rs"]
+#[path = "tests/shell_file_name_test.rs"]
 mod tests;
diff --git a/crates/neovm-core/src/emacs_core/system/shell_file_name/tests/mod.rs b/crates/neovm-core/src/emacs_core/system/shell_file_name/tests/shell_file_name_test.rs
similarity index 100%
rename from crates/neovm-core/src/emacs_core/system/shell_file_name/tests/mod.rs
rename to crates/neovm-core/src/emacs_core/system/shell_file_name/tests/shell_file_name_test.rs
diff --git a/crates/neovm-core/src/emacs_core/system/sqlite/mod.rs b/crates/neovm-core/src/emacs_core/system/sqlite/mod.rs
index c084ce4e45..fd0f6c5a0b 100644
--- a/crates/neovm-core/src/emacs_core/system/sqlite/mod.rs
+++ b/crates/neovm-core/src/emacs_core/system/sqlite/mod.rs
@@ -1009,9 +1009,9 @@ use enabled::{SqliteBindSymbol, SqliteOperation, SqliteReturnType, value_is_fals
 use rusqlite::ffi;
 
 #[cfg(all(test, feature = "sqlite"))]
-#[path = "tests/enabled.rs"]
+#[path = "tests/enabled_test.rs"]
 mod tests;
 
 #[cfg(all(test, not(feature = "sqlite")))]
-#[path = "tests/disabled.rs"]
+#[path = "tests/disabled_test.rs"]
 mod tests;
diff --git a/crates/neovm-core/src/emacs_core/system/sqlite/tests/disabled.rs b/crates/neovm-core/src/emacs_core/system/sqlite/tests/disabled_test.rs
similarity index 100%
rename from crates/neovm-core/src/emacs_core/system/sqlite/tests/disabled.rs
rename to crates/neovm-core/src/emacs_core/system/sqlite/tests/disabled_test.rs
diff --git a/crates/neovm-core/src/emacs_core/system/sqlite/tests/enabled.rs b/crates/neovm-core/src/emacs_core/system/sqlite/tests/enabled_test.rs
similarity index 100%
rename from crates/neovm-core/src/emacs_core/system/sqlite/tests/enabled.rs
rename to crates/neovm-core/src/emacs_core/system/sqlite/tests/enabled_test.rs
diff --git a/crates/neovm-core/src/emacs_core/system/timefns/mod.rs b/crates/neovm-core/src/emacs_core/system/timefns/mod.rs
index 1e6b873059..d12b2fc1a0 100644
--- a/crates/neovm-core/src/emacs_core/system/timefns/mod.rs
+++ b/crates/neovm-core/src/emacs_core/system/timefns/mod.rs
@@ -2145,5 +2145,5 @@ pub(crate) fn builtin_set_time_zone_rule(args: Vec<Value>) -> EvalResult {
 // ---------------------------------------------------------------------------
 
 #[cfg(test)]
-#[path = "tests/mod.rs"]
+#[path = "tests/timefns_test.rs"]
 mod tests;
diff --git a/crates/neovm-core/src/emacs_core/system/timefns/tests/mod.rs b/crates/neovm-core/src/emacs_core/system/timefns/tests/timefns_test.rs
similarity index 100%
rename from crates/neovm-core/src/emacs_core/system/timefns/tests/mod.rs
rename to crates/neovm-core/src/emacs_core/system/timefns/tests/timefns_test.rs
diff --git a/crates/neovm-core/src/emacs_core/system/timer/mod.rs b/crates/neovm-core/src/emacs_core/system/timer/mod.rs
index a459326679..972c43fcb3 100644
--- a/crates/neovm-core/src/emacs_core/system/timer/mod.rs
+++ b/crates/neovm-core/src/emacs_core/system/timer/mod.rs
@@ -375,5 +375,5 @@ pub(crate) fn builtin_sleep_for(eval: &mut super::eval::Context, args: Vec<Value
 // Tests
 // ===========================================================================
 #[cfg(test)]
-#[path = "tests/mod.rs"]
+#[path = "tests/timer_test.rs"]
 mod tests;
diff --git a/crates/neovm-core/src/emacs_core/system/timer/tests/mod.rs b/crates/neovm-core/src/emacs_core/system/timer/tests/timer_test.rs
similarity index 100%
rename from crates/neovm-core/src/emacs_core/system/timer/tests/mod.rs
rename to crates/neovm-core/src/emacs_core/system/timer/tests/timer_test.rs
diff --git a/crates/neovm-core/src/emacs_core/system/tls/tests/runtime.rs b/crates/neovm-core/src/emacs_core/system/tls/tests/runtime_test.rs
similarity index 100%
rename from crates/neovm-core/src/emacs_core/system/tls/tests/runtime.rs
rename to crates/neovm-core/src/emacs_core/system/tls/tests/runtime_test.rs
diff --git a/crates/neovm-core/src/emacs_core/tests/architecture/layout.rs b/crates/neovm-core/src/emacs_core/tests/architecture/layout_test.rs
similarity index 100%
rename from crates/neovm-core/src/emacs_core/tests/architecture/layout.rs
rename to crates/neovm-core/src/emacs_core/tests/architecture/layout_test.rs
diff --git a/crates/neovm-core/src/emacs_core/tests/architecture/runtime_string_guard.rs b/crates/neovm-core/src/emacs_core/tests/architecture/runtime_string_guard_test.rs
similarity index 100%
rename from crates/neovm-core/src/emacs_core/tests/architecture/runtime_string_guard.rs
rename to crates/neovm-core/src/emacs_core/tests/architecture/runtime_string_guard_test.rs
diff --git a/crates/neovm-core/src/emacs_core/tests/architecture/symbol_id_guard.rs b/crates/neovm-core/src/emacs_core/tests/architecture/symbol_id_guard_test.rs
similarity index 100%
rename from crates/neovm-core/src/emacs_core/tests/architecture/symbol_id_guard.rs
rename to crates/neovm-core/src/emacs_core/tests/architecture/symbol_id_guard_test.rs
diff --git a/crates/neovm-core/src/emacs_core/tests/architecture/transmute_guard.rs b/crates/neovm-core/src/emacs_core/tests/architecture/transmute_guard_test.rs
similarity index 100%
rename from crates/neovm-core/src/emacs_core/tests/architecture/transmute_guard.rs
rename to crates/neovm-core/src/emacs_core/tests/architecture/transmute_guard_test.rs
diff --git a/crates/neovm-core/src/emacs_core/tests/build_support/compile_main_rule.rs b/crates/neovm-core/src/emacs_core/tests/build_support/compile_main_rule_test.rs
similarity index 100%
rename from crates/neovm-core/src/emacs_core/tests/build_support/compile_main_rule.rs
rename to crates/neovm-core/src/emacs_core/tests/build_support/compile_main_rule_test.rs
diff --git a/crates/neovm-core/src/emacs_core/tests/build_support/generated_lisp.rs b/crates/neovm-core/src/emacs_core/tests/build_support/generated_lisp_test.rs
similarity index 100%
rename from crates/neovm-core/src/emacs_core/tests/build_support/generated_lisp.rs
rename to crates/neovm-core/src/emacs_core/tests/build_support/generated_lisp_test.rs
diff --git a/crates/neovm-core/src/emacs_core/tests/compat_regressions/mod.rs b/crates/neovm-core/src/emacs_core/tests/compat_regressions/mod.rs
index e57777e3c9..7942ce47e7 100644
--- a/crates/neovm-core/src/emacs_core/tests/compat_regressions/mod.rs
+++ b/crates/neovm-core/src/emacs_core/tests/compat_regressions/mod.rs
@@ -3,5 +3,5 @@
 //! These tests lock behavior for GNU Emacs compatibility paths that were
 //! historically implemented in `compat_internal`.
 #[cfg(test)]
-#[path = "tests/mod.rs"]
+#[path = "tests/compat_regressions_test.rs"]
 mod tests;
diff --git a/crates/neovm-core/src/emacs_core/tests/compat_regressions/tests/mod.rs b/crates/neovm-core/src/emacs_core/tests/compat_regressions/tests/compat_regressions_test.rs
similarity index 100%
rename from crates/neovm-core/src/emacs_core/tests/compat_regressions/tests/mod.rs
rename to crates/neovm-core/src/emacs_core/tests/compat_regressions/tests/compat_regressions_test.rs
diff --git a/crates/neovm-core/src/emacs_core/tests/gnu_surface/defvar_special.rs b/crates/neovm-core/src/emacs_core/tests/gnu_surface/defvar_special_test.rs
similarity index 100%
rename from crates/neovm-core/src/emacs_core/tests/gnu_surface/defvar_special.rs
rename to crates/neovm-core/src/emacs_core/tests/gnu_surface/defvar_special_test.rs
diff --git a/crates/neovm-core/src/emacs_core/tests/gnu_surface/subr.rs b/crates/neovm-core/src/emacs_core/tests/gnu_surface/subr_test.rs
similarity index 100%
rename from crates/neovm-core/src/emacs_core/tests/gnu_surface/subr.rs
rename to crates/neovm-core/src/emacs_core/tests/gnu_surface/subr_test.rs
diff --git a/crates/neovm-core/src/emacs_core/text/boolvec/mod.rs b/crates/neovm-core/src/emacs_core/text/boolvec/mod.rs
index 46359dfcf2..9877fb0222 100644
--- a/crates/neovm-core/src/emacs_core/text/boolvec/mod.rs
+++ b/crates/neovm-core/src/emacs_core/text/boolvec/mod.rs
@@ -524,5 +524,5 @@ pub(crate) fn builtin_bool_vector_count_consecutive(args: Vec<Value>) -> EvalRes
 }
 
 #[cfg(test)]
-#[path = "tests/mod.rs"]
+#[path = "tests/boolvec_test.rs"]
 mod tests;
diff --git a/crates/neovm-core/src/emacs_core/text/boolvec/tests/mod.rs b/crates/neovm-core/src/emacs_core/text/boolvec/tests/boolvec_test.rs
similarity index 100%
rename from crates/neovm-core/src/emacs_core/text/boolvec/tests/mod.rs
rename to crates/neovm-core/src/emacs_core/text/boolvec/tests/boolvec_test.rs
diff --git a/crates/neovm-core/src/emacs_core/text/casefiddle/mod.rs b/crates/neovm-core/src/emacs_core/text/casefiddle/mod.rs
index 645e0aef53..2aed0d9c50 100644
--- a/crates/neovm-core/src/emacs_core/text/casefiddle/mod.rs
+++ b/crates/neovm-core/src/emacs_core/text/casefiddle/mod.rs
@@ -1241,5 +1241,5 @@ pub(crate) fn builtin_char_resolve_modifiers(args: Vec<Value>) -> EvalResult {
 // Tests
 // ---------------------------------------------------------------------------
 #[cfg(test)]
-#[path = "tests/mod.rs"]
+#[path = "tests/casefiddle_test.rs"]
 mod tests;
diff --git a/crates/neovm-core/src/emacs_core/text/casefiddle/tests/mod.rs b/crates/neovm-core/src/emacs_core/text/casefiddle/tests/casefiddle_test.rs
similarity index 100%
rename from crates/neovm-core/src/emacs_core/text/casefiddle/tests/mod.rs
rename to crates/neovm-core/src/emacs_core/text/casefiddle/tests/casefiddle_test.rs
diff --git a/crates/neovm-core/src/emacs_core/text/casetab/mod.rs b/crates/neovm-core/src/emacs_core/text/casetab/mod.rs
index dfc7882011..71e22163a4 100644
--- a/crates/neovm-core/src/emacs_core/text/casetab/mod.rs
+++ b/crates/neovm-core/src/emacs_core/text/casetab/mod.rs
@@ -840,9 +840,9 @@ pub fn is_case_table(v: &Value) -> bool {
 // Tests
 // ---------------------------------------------------------------------------
 #[cfg(test)]
-#[path = "tests/mod.rs"]
+#[path = "tests/casetab_test.rs"]
 mod tests;
 
 #[cfg(test)]
-#[path = "tests/gc_tls_ownership.rs"]
+#[path = "tests/gc_tls_ownership_test.rs"]
 mod gc_tls_ownership_tests;
diff --git a/crates/neovm-core/src/emacs_core/text/casetab/tests/mod.rs b/crates/neovm-core/src/emacs_core/text/casetab/tests/casetab_test.rs
similarity index 100%
rename from crates/neovm-core/src/emacs_core/text/casetab/tests/mod.rs
rename to crates/neovm-core/src/emacs_core/text/casetab/tests/casetab_test.rs
diff --git a/crates/neovm-core/src/emacs_core/text/casetab/tests/gc_tls_ownership.rs b/crates/neovm-core/src/emacs_core/text/casetab/tests/gc_tls_ownership_test.rs
similarity index 100%
rename from crates/neovm-core/src/emacs_core/text/casetab/tests/gc_tls_ownership.rs
rename to crates/neovm-core/src/emacs_core/text/casetab/tests/gc_tls_ownership_test.rs
diff --git a/crates/neovm-core/src/emacs_core/text/category/mod.rs b/crates/neovm-core/src/emacs_core/text/category/mod.rs
index 6b02193bd5..bbfce15417 100644
--- a/crates/neovm-core/src/emacs_core/text/category/mod.rs
+++ b/crates/neovm-core/src/emacs_core/text/category/mod.rs
@@ -760,9 +760,9 @@ pub(crate) fn builtin_set_category_table_in_buffers(
 }
 
 #[cfg(test)]
-#[path = "tests/mod.rs"]
+#[path = "tests/category_test.rs"]
 mod tests;
 
 #[cfg(test)]
-#[path = "tests/gc_tls_ownership.rs"]
+#[path = "tests/gc_tls_ownership_test.rs"]
 mod gc_tls_ownership_tests;
diff --git a/crates/neovm-core/src/emacs_core/text/category/tests/mod.rs b/crates/neovm-core/src/emacs_core/text/category/tests/category_test.rs
similarity index 100%
rename from crates/neovm-core/src/emacs_core/text/category/tests/mod.rs
rename to crates/neovm-core/src/emacs_core/text/category/tests/category_test.rs
diff --git a/crates/neovm-core/src/emacs_core/text/category/tests/gc_tls_ownership.rs b/crates/neovm-core/src/emacs_core/text/category/tests/gc_tls_ownership_test.rs
similarity index 100%
rename from crates/neovm-core/src/emacs_core/text/category/tests/gc_tls_ownership.rs
rename to crates/neovm-core/src/emacs_core/text/category/tests/gc_tls_ownership_test.rs
diff --git a/crates/neovm-core/src/emacs_core/text/ccl/mod.rs b/crates/neovm-core/src/emacs_core/text/ccl/mod.rs
index fa1640066f..a4822d0ed1 100644
--- a/crates/neovm-core/src/emacs_core/text/ccl/mod.rs
+++ b/crates/neovm-core/src/emacs_core/text/ccl/mod.rs
@@ -1512,9 +1512,9 @@ pub(crate) fn builtin_register_code_conversion_map_impl(args: Vec<Value>) -> Eva
     Ok(Value::fixnum(map_id))
 }
 #[cfg(test)]
-#[path = "tests/mod.rs"]
+#[path = "tests/ccl_test.rs"]
 mod tests;
 
 #[cfg(test)]
-#[path = "tests/gc_tls_ownership.rs"]
+#[path = "tests/gc_tls_ownership_test.rs"]
 mod gc_tls_ownership_tests;
diff --git a/crates/neovm-core/src/emacs_core/text/ccl/tests/mod.rs b/crates/neovm-core/src/emacs_core/text/ccl/tests/ccl_test.rs
similarity index 100%
rename from crates/neovm-core/src/emacs_core/text/ccl/tests/mod.rs
rename to crates/neovm-core/src/emacs_core/text/ccl/tests/ccl_test.rs
diff --git a/crates/neovm-core/src/emacs_core/text/ccl/tests/gc_tls_ownership.rs b/crates/neovm-core/src/emacs_core/text/ccl/tests/gc_tls_ownership_test.rs
similarity index 100%
rename from crates/neovm-core/src/emacs_core/text/ccl/tests/gc_tls_ownership.rs
rename to crates/neovm-core/src/emacs_core/text/ccl/tests/gc_tls_ownership_test.rs
diff --git a/crates/neovm-core/src/emacs_core/text/charset/mod.rs b/crates/neovm-core/src/emacs_core/text/charset/mod.rs
index 180e41f996..b5ed0d7bfc 100644
--- a/crates/neovm-core/src/emacs_core/text/charset/mod.rs
+++ b/crates/neovm-core/src/emacs_core/text/charset/mod.rs
@@ -2863,9 +2863,9 @@ fn classify_string_charsets(ls: &crate::heap_types::LispString) -> Vec<&'static
 // Tests
 // ---------------------------------------------------------------------------
 #[cfg(test)]
-#[path = "tests/mod.rs"]
+#[path = "tests/charset_test.rs"]
 mod tests;
 
 #[cfg(test)]
-#[path = "tests/gc_tls_ownership.rs"]
+#[path = "tests/gc_tls_ownership_test.rs"]
 mod gc_tls_ownership_tests;
diff --git a/crates/neovm-core/src/emacs_core/text/charset/tests/mod.rs b/crates/neovm-core/src/emacs_core/text/charset/tests/charset_test.rs
similarity index 99%
rename from crates/neovm-core/src/emacs_core/text/charset/tests/mod.rs
rename to crates/neovm-core/src/emacs_core/text/charset/tests/charset_test.rs
index d6da6ad496..2b0e5855ab 100644
--- a/crates/neovm-core/src/emacs_core/text/charset/tests/mod.rs
+++ b/crates/neovm-core/src/emacs_core/text/charset/tests/charset_test.rs
@@ -1585,7 +1585,9 @@ fn a_resolved_charset_decoder_answers_exactly_like_the_registry() {
 }
 
 #[cfg(test)]
+#[path = "prepared_mule_test.rs"]
 mod prepared_mule;
 
 #[cfg(test)]
+#[path = "mule_identity_test.rs"]
 mod mule_identity;
diff --git a/crates/neovm-core/src/emacs_core/text/charset/tests/gc_tls_ownership.rs b/crates/neovm-core/src/emacs_core/text/charset/tests/gc_tls_ownership_test.rs
similarity index 100%
rename from crates/neovm-core/src/emacs_core/text/charset/tests/gc_tls_ownership.rs
rename to crates/neovm-core/src/emacs_core/text/charset/tests/gc_tls_ownership_test.rs
diff --git a/crates/neovm-core/src/emacs_core/text/charset/tests/mule_identity.rs b/crates/neovm-core/src/emacs_core/text/charset/tests/mule_identity_test.rs
similarity index 100%
rename from crates/neovm-core/src/emacs_core/text/charset/tests/mule_identity.rs
rename to crates/neovm-core/src/emacs_core/text/charset/tests/mule_identity_test.rs
diff --git a/crates/neovm-core/src/emacs_core/text/charset/tests/prepared_mule.rs b/crates/neovm-core/src/emacs_core/text/charset/tests/prepared_mule_test.rs
similarity index 100%
rename from crates/neovm-core/src/emacs_core/text/charset/tests/prepared_mule.rs
rename to crates/neovm-core/src/emacs_core/text/charset/tests/prepared_mule_test.rs
diff --git a/crates/neovm-core/src/emacs_core/text/chartable/mod.rs b/crates/neovm-core/src/emacs_core/text/chartable/mod.rs
index 210a0dd7c9..a93d2d7555 100644
--- a/crates/neovm-core/src/emacs_core/text/chartable/mod.rs
+++ b/crates/neovm-core/src/emacs_core/text/chartable/mod.rs
@@ -2078,9 +2078,9 @@ pub(crate) use super::boolvec::{
 // Tests
 // ---------------------------------------------------------------------------
 #[cfg(test)]
-#[path = "tests/mod.rs"]
+#[path = "tests/chartable_test.rs"]
 mod tests;
 
 #[cfg(test)]
-#[path = "tests/collection_lookup_capture.rs"]
+#[path = "tests/collection_lookup_capture_test.rs"]
 mod collection_lookup_capture;
diff --git a/crates/neovm-core/src/emacs_core/text/chartable/tests/mod.rs b/crates/neovm-core/src/emacs_core/text/chartable/tests/chartable_test.rs
similarity index 100%
rename from crates/neovm-core/src/emacs_core/text/chartable/tests/mod.rs
rename to crates/neovm-core/src/emacs_core/text/chartable/tests/chartable_test.rs
diff --git a/crates/neovm-core/src/emacs_core/text/chartable/tests/collection_lookup_capture.rs b/crates/neovm-core/src/emacs_core/text/chartable/tests/collection_lookup_capture_test.rs
similarity index 100%
rename from crates/neovm-core/src/emacs_core/text/chartable/tests/collection_lookup_capture.rs
rename to crates/neovm-core/src/emacs_core/text/chartable/tests/collection_lookup_capture_test.rs
diff --git a/crates/neovm-core/src/emacs_core/text/coding/mod.rs b/crates/neovm-core/src/emacs_core/text/coding/mod.rs
index f39fa27a3d..deee89f456 100644
--- a/crates/neovm-core/src/emacs_core/text/coding/mod.rs
+++ b/crates/neovm-core/src/emacs_core/text/coding/mod.rs
@@ -5715,5 +5715,5 @@ pub fn register_bootstrap_vars(obarray: &mut crate::emacs_core::symbol::Obarray)
 // Tests
 // ===========================================================================
 #[cfg(test)]
-#[path = "tests/mod.rs"]
+#[path = "tests/coding_test.rs"]
 mod tests;
diff --git a/crates/neovm-core/src/emacs_core/text/coding/tests/mod.rs b/crates/neovm-core/src/emacs_core/text/coding/tests/coding_test.rs
similarity index 100%
rename from crates/neovm-core/src/emacs_core/text/coding/tests/mod.rs
rename to crates/neovm-core/src/emacs_core/text/coding/tests/coding_test.rs
diff --git a/crates/neovm-core/src/emacs_core/text/composite/mod.rs b/crates/neovm-core/src/emacs_core/text/composite/mod.rs
index af1b8f1993..b3643da5ef 100644
--- a/crates/neovm-core/src/emacs_core/text/composite/mod.rs
+++ b/crates/neovm-core/src/emacs_core/text/composite/mod.rs
@@ -1674,5 +1674,5 @@ pub fn register_bootstrap_vars(obarray: &mut crate::emacs_core::symbol::Obarray)
 // Tests
 // ---------------------------------------------------------------------------
 #[cfg(test)]
-#[path = "tests/mod.rs"]
+#[path = "tests/composite_test.rs"]
 mod tests;
diff --git a/crates/neovm-core/src/emacs_core/text/composite/tests/mod.rs b/crates/neovm-core/src/emacs_core/text/composite/tests/composite_test.rs
similarity index 100%
rename from crates/neovm-core/src/emacs_core/text/composite/tests/mod.rs
rename to crates/neovm-core/src/emacs_core/text/composite/tests/composite_test.rs
diff --git a/crates/neovm-core/src/emacs_core/text/emacs_char/mod.rs b/crates/neovm-core/src/emacs_core/text/emacs_char/mod.rs
index 5edaa747fd..1b3118d6dc 100644
--- a/crates/neovm-core/src/emacs_core/text/emacs_char/mod.rs
+++ b/crates/neovm-core/src/emacs_core/text/emacs_char/mod.rs
@@ -1573,5 +1573,5 @@ pub fn utf8_to_emacs(s: &str) -> Vec<u8> {
 // ---------------------------------------------------------------------------
 
 #[cfg(test)]
-#[path = "tests/mod.rs"]
+#[path = "tests/emacs_char_test.rs"]
 mod tests;
diff --git a/crates/neovm-core/src/emacs_core/text/emacs_char/tests/mod.rs b/crates/neovm-core/src/emacs_core/text/emacs_char/tests/emacs_char_test.rs
similarity index 99%
rename from crates/neovm-core/src/emacs_core/text/emacs_char/tests/mod.rs
rename to crates/neovm-core/src/emacs_core/text/emacs_char/tests/emacs_char_test.rs
index 22ef11fd10..4f7078133c 100644
--- a/crates/neovm-core/src/emacs_core/text/emacs_char/tests/mod.rs
+++ b/crates/neovm-core/src/emacs_core/text/emacs_char/tests/emacs_char_test.rs
@@ -1,6 +1,7 @@
 use super::*;
 
 #[cfg(test)]
+#[path = "str_as_multibyte_gnu_test.rs"]
 mod str_as_multibyte_gnu;
 
 // -----------------------------------------------------------------------
diff --git a/crates/neovm-core/src/emacs_core/text/emacs_char/tests/str_as_multibyte_gnu.rs b/crates/neovm-core/src/emacs_core/text/emacs_char/tests/str_as_multibyte_gnu_test.rs
similarity index 100%
rename from crates/neovm-core/src/emacs_core/text/emacs_char/tests/str_as_multibyte_gnu.rs
rename to crates/neovm-core/src/emacs_core/text/emacs_char/tests/str_as_multibyte_gnu_test.rs
diff --git a/crates/neovm-core/src/emacs_core/text/format/mod.rs b/crates/neovm-core/src/emacs_core/text/format/mod.rs
index ebf485ba5e..8e61f50fb8 100644
--- a/crates/neovm-core/src/emacs_core/text/format/mod.rs
+++ b/crates/neovm-core/src/emacs_core/text/format/mod.rs
@@ -873,5 +873,5 @@ fn emit_tz_offset(result: &mut String, flags: &DirectiveFlags, offset_secs: i64,
 // Tests
 // ---------------------------------------------------------------------------
 #[cfg(test)]
-#[path = "tests/mod.rs"]
+#[path = "tests/format_test.rs"]
 mod tests;
diff --git a/crates/neovm-core/src/emacs_core/text/format/tests/mod.rs b/crates/neovm-core/src/emacs_core/text/format/tests/format_test.rs
similarity index 100%
rename from crates/neovm-core/src/emacs_core/text/format/tests/mod.rs
rename to crates/neovm-core/src/emacs_core/text/format/tests/format_test.rs
diff --git a/crates/neovm-core/src/emacs_core/text/json/mod.rs b/crates/neovm-core/src/emacs_core/text/json/mod.rs
index ddd494f6bb..260033c8dd 100644
--- a/crates/neovm-core/src/emacs_core/text/json/mod.rs
+++ b/crates/neovm-core/src/emacs_core/text/json/mod.rs
@@ -1451,5 +1451,5 @@ pub(crate) fn builtin_json_insert(eval: &mut super::eval::Context, args: Vec<Val
 // Tests
 // ===========================================================================
 #[cfg(test)]
-#[path = "tests/mod.rs"]
+#[path = "tests/json_test.rs"]
 mod tests;
diff --git a/crates/neovm-core/src/emacs_core/text/json/tests/mod.rs b/crates/neovm-core/src/emacs_core/text/json/tests/json_test.rs
similarity index 100%
rename from crates/neovm-core/src/emacs_core/text/json/tests/mod.rs
rename to crates/neovm-core/src/emacs_core/text/json/tests/json_test.rs
diff --git a/crates/neovm-core/src/emacs_core/text/regex/dfa.rs b/crates/neovm-core/src/emacs_core/text/regex/dfa.rs
index 41cbfbada9..98a0ff5622 100644
--- a/crates/neovm-core/src/emacs_core/text/regex/dfa.rs
+++ b/crates/neovm-core/src/emacs_core/text/regex/dfa.rs
@@ -2840,5 +2840,5 @@ impl LiveDfa {
 }
 
 #[cfg(test)]
-#[path = "tests/dfa.rs"]
+#[path = "tests/dfa_test.rs"]
 mod tests;
diff --git a/crates/neovm-core/src/emacs_core/text/regex/emacs.rs b/crates/neovm-core/src/emacs_core/text/regex/emacs.rs
index 12cfba0088..1556192fbf 100644
--- a/crates/neovm-core/src/emacs_core/text/regex/emacs.rs
+++ b/crates/neovm-core/src/emacs_core/text/regex/emacs.rs
@@ -9912,29 +9912,29 @@ mod suffix_literal;
 mod short_literal;
 
 #[cfg(test)]
-#[path = "tests/short_literal.rs"]
+#[path = "tests/short_literal_test.rs"]
 mod short_literal_tests;
 
 #[cfg(test)]
-#[path = "tests/emacs.rs"]
+#[path = "tests/emacs_test.rs"]
 mod tests;
 
 #[cfg(test)]
-#[path = "tests/opcode_decode.rs"]
+#[path = "tests/opcode_decode_test.rs"]
 mod opcode_decode_tests;
 
 #[cfg(test)]
-#[path = "tests/casefold_scan.rs"]
+#[path = "tests/casefold_scan_test.rs"]
 mod casefold_scan_tests;
 
 #[cfg(test)]
-#[path = "tests/fail_stack_parity.rs"]
+#[path = "tests/fail_stack_parity_test.rs"]
 mod fail_stack_parity_tests;
 
 #[cfg(test)]
-#[path = "tests/start_anchor.rs"]
+#[path = "tests/start_anchor_test.rs"]
 mod start_anchor_tests;
 
 #[cfg(test)]
-#[path = "tests/suffix_literal.rs"]
+#[path = "tests/suffix_literal_test.rs"]
 mod suffix_literal_tests;
diff --git a/crates/neovm-core/src/emacs_core/text/regex/mod.rs b/crates/neovm-core/src/emacs_core/text/regex/mod.rs
index 820667a043..cbf216bc24 100644
--- a/crates/neovm-core/src/emacs_core/text/regex/mod.rs
+++ b/crates/neovm-core/src/emacs_core/text/regex/mod.rs
@@ -4935,21 +4935,21 @@ pub(crate) mod match_stats {
 // Tests
 // ---------------------------------------------------------------------------
 #[cfg(test)]
-#[path = "tests/mod.rs"]
+#[path = "tests/regex_test.rs"]
 mod tests;
 
 #[cfg(test)]
-#[path = "tests/gc_tls_ownership.rs"]
+#[path = "tests/gc_tls_ownership_test.rs"]
 mod gc_tls_ownership_tests;
 
 #[cfg(test)]
-#[path = "tests/gc_collection_epoch.rs"]
+#[path = "tests/gc_collection_epoch_test.rs"]
 mod gc_collection_epoch_tests;
 
 #[cfg(test)]
-#[path = "tests/gc_collection_epoch_minor.rs"]
+#[path = "tests/gc_collection_epoch_minor_test.rs"]
 mod gc_collection_epoch_minor_tests;
 
 #[cfg(test)]
-#[path = "tests/gc_literal_epoch.rs"]
+#[path = "tests/gc_literal_epoch_test.rs"]
 mod gc_literal_epoch_tests;
diff --git a/crates/neovm-core/src/emacs_core/text/regex/tests/casefold_scan.rs b/crates/neovm-core/src/emacs_core/text/regex/tests/casefold_scan_test.rs
similarity index 100%
rename from crates/neovm-core/src/emacs_core/text/regex/tests/casefold_scan.rs
rename to crates/neovm-core/src/emacs_core/text/regex/tests/casefold_scan_test.rs
diff --git a/crates/neovm-core/src/emacs_core/text/regex/tests/dfa.rs b/crates/neovm-core/src/emacs_core/text/regex/tests/dfa_test.rs
similarity index 100%
rename from crates/neovm-core/src/emacs_core/text/regex/tests/dfa.rs
rename to crates/neovm-core/src/emacs_core/text/regex/tests/dfa_test.rs
diff --git a/crates/neovm-core/src/emacs_core/text/regex/tests/emacs.rs b/crates/neovm-core/src/emacs_core/text/regex/tests/emacs_test.rs
similarity index 100%
rename from crates/neovm-core/src/emacs_core/text/regex/tests/emacs.rs
rename to crates/neovm-core/src/emacs_core/text/regex/tests/emacs_test.rs
diff --git a/crates/neovm-core/src/emacs_core/text/regex/tests/fail_stack_parity.rs b/crates/neovm-core/src/emacs_core/text/regex/tests/fail_stack_parity_test.rs
similarity index 100%
rename from crates/neovm-core/src/emacs_core/text/regex/tests/fail_stack_parity.rs
rename to crates/neovm-core/src/emacs_core/text/regex/tests/fail_stack_parity_test.rs
diff --git a/crates/neovm-core/src/emacs_core/text/regex/tests/gc_collection_epoch_minor.rs b/crates/neovm-core/src/emacs_core/text/regex/tests/gc_collection_epoch_minor_test.rs
similarity index 100%
rename from crates/neovm-core/src/emacs_core/text/regex/tests/gc_collection_epoch_minor.rs
rename to crates/neovm-core/src/emacs_core/text/regex/tests/gc_collection_epoch_minor_test.rs
diff --git a/crates/neovm-core/src/emacs_core/text/regex/tests/gc_collection_epoch.rs b/crates/neovm-core/src/emacs_core/text/regex/tests/gc_collection_epoch_test.rs
similarity index 100%
rename from crates/neovm-core/src/emacs_core/text/regex/tests/gc_collection_epoch.rs
rename to crates/neovm-core/src/emacs_core/text/regex/tests/gc_collection_epoch_test.rs
diff --git a/crates/neovm-core/src/emacs_core/text/regex/tests/gc_literal_epoch.rs b/crates/neovm-core/src/emacs_core/text/regex/tests/gc_literal_epoch_test.rs
similarity index 100%
rename from crates/neovm-core/src/emacs_core/text/regex/tests/gc_literal_epoch.rs
rename to crates/neovm-core/src/emacs_core/text/regex/tests/gc_literal_epoch_test.rs
diff --git a/crates/neovm-core/src/emacs_core/text/regex/tests/gc_tls_ownership.rs b/crates/neovm-core/src/emacs_core/text/regex/tests/gc_tls_ownership_test.rs
similarity index 100%
rename from crates/neovm-core/src/emacs_core/text/regex/tests/gc_tls_ownership.rs
rename to crates/neovm-core/src/emacs_core/text/regex/tests/gc_tls_ownership_test.rs
diff --git a/crates/neovm-core/src/emacs_core/text/regex/tests/opcode_decode.rs b/crates/neovm-core/src/emacs_core/text/regex/tests/opcode_decode_test.rs
similarity index 100%
rename from crates/neovm-core/src/emacs_core/text/regex/tests/opcode_decode.rs
rename to crates/neovm-core/src/emacs_core/text/regex/tests/opcode_decode_test.rs
diff --git a/crates/neovm-core/src/emacs_core/text/regex/tests/mod.rs b/crates/neovm-core/src/emacs_core/text/regex/tests/regex_test.rs
similarity index 100%
rename from crates/neovm-core/src/emacs_core/text/regex/tests/mod.rs
rename to crates/neovm-core/src/emacs_core/text/regex/tests/regex_test.rs
diff --git a/crates/neovm-core/src/emacs_core/text/regex/tests/short_literal.rs b/crates/neovm-core/src/emacs_core/text/regex/tests/short_literal_test.rs
similarity index 100%
rename from crates/neovm-core/src/emacs_core/text/regex/tests/short_literal.rs
rename to crates/neovm-core/src/emacs_core/text/regex/tests/short_literal_test.rs
diff --git a/crates/neovm-core/src/emacs_core/text/regex/tests/start_anchor.rs b/crates/neovm-core/src/emacs_core/text/regex/tests/start_anchor_test.rs
similarity index 100%
rename from crates/neovm-core/src/emacs_core/text/regex/tests/start_anchor.rs
rename to crates/neovm-core/src/emacs_core/text/regex/tests/start_anchor_test.rs
diff --git a/crates/neovm-core/src/emacs_core/text/regex/tests/suffix_literal.rs b/crates/neovm-core/src/emacs_core/text/regex/tests/suffix_literal_test.rs
similarity index 100%
rename from crates/neovm-core/src/emacs_core/text/regex/tests/suffix_literal.rs
rename to crates/neovm-core/src/emacs_core/text/regex/tests/suffix_literal_test.rs
diff --git a/crates/neovm-core/src/emacs_core/text/search/mod.rs b/crates/neovm-core/src/emacs_core/text/search/mod.rs
index 1961d1cdc4..ecd079c9b4 100644
--- a/crates/neovm-core/src/emacs_core/text/search/mod.rs
+++ b/crates/neovm-core/src/emacs_core/text/search/mod.rs
@@ -901,5 +901,5 @@ pub(crate) fn builtin_replace_regexp_in_string(
 // Tests
 // ---------------------------------------------------------------------------
 #[cfg(test)]
-#[path = "tests/mod.rs"]
+#[path = "tests/search_test.rs"]
 mod tests;
diff --git a/crates/neovm-core/src/emacs_core/text/search/tests/mod.rs b/crates/neovm-core/src/emacs_core/text/search/tests/search_test.rs
similarity index 100%
rename from crates/neovm-core/src/emacs_core/text/search/tests/mod.rs
rename to crates/neovm-core/src/emacs_core/text/search/tests/search_test.rs
diff --git a/crates/neovm-core/src/emacs_core/text/string_escape/mod.rs b/crates/neovm-core/src/emacs_core/text/string_escape/mod.rs
index 4409e87a64..42eb88f2a5 100644
--- a/crates/neovm-core/src/emacs_core/text/string_escape/mod.rs
+++ b/crates/neovm-core/src/emacs_core/text/string_escape/mod.rs
@@ -878,5 +878,5 @@ pub(crate) fn decode_units_emacs(data: &[u8], is_multibyte: bool) -> Vec<(u32, u
     }
 }
 #[cfg(test)]
-#[path = "tests/mod.rs"]
+#[path = "tests/string_escape_test.rs"]
 mod tests;
diff --git a/crates/neovm-core/src/emacs_core/text/string_escape/tests/mod.rs b/crates/neovm-core/src/emacs_core/text/string_escape/tests/string_escape_test.rs
similarity index 100%
rename from crates/neovm-core/src/emacs_core/text/string_escape/tests/mod.rs
rename to crates/neovm-core/src/emacs_core/text/string_escape/tests/string_escape_test.rs
diff --git a/crates/neovm-core/src/emacs_core/text/string_pos_cache/mod.rs b/crates/neovm-core/src/emacs_core/text/string_pos_cache/mod.rs
index fcad189c9e..e1faa8611f 100644
--- a/crates/neovm-core/src/emacs_core/text/string_pos_cache/mod.rs
+++ b/crates/neovm-core/src/emacs_core/text/string_pos_cache/mod.rs
@@ -199,17 +199,17 @@ pub(crate) fn string_byte_to_char(string: Value, s: &LispString, byte_index: usi
 }
 
 #[cfg(test)]
-#[path = "tests/mod.rs"]
+#[path = "tests/string_pos_cache_test.rs"]
 mod tests;
 
 #[cfg(test)]
-#[path = "tests/gc_tls_ownership.rs"]
+#[path = "tests/gc_tls_ownership_test.rs"]
 mod gc_tls_ownership_tests;
 
 #[cfg(test)]
-#[path = "tests/gc_collection_epoch.rs"]
+#[path = "tests/gc_collection_epoch_test.rs"]
 mod gc_collection_epoch_tests;
 
 #[cfg(test)]
-#[path = "tests/gc_collection_epoch_minor.rs"]
+#[path = "tests/gc_collection_epoch_minor_test.rs"]
 mod gc_collection_epoch_minor_tests;
diff --git a/crates/neovm-core/src/emacs_core/text/string_pos_cache/tests/gc_collection_epoch_minor.rs b/crates/neovm-core/src/emacs_core/text/string_pos_cache/tests/gc_collection_epoch_minor_test.rs
similarity index 100%
rename from crates/neovm-core/src/emacs_core/text/string_pos_cache/tests/gc_collection_epoch_minor.rs
rename to crates/neovm-core/src/emacs_core/text/string_pos_cache/tests/gc_collection_epoch_minor_test.rs
diff --git a/crates/neovm-core/src/emacs_core/text/string_pos_cache/tests/gc_collection_epoch.rs b/crates/neovm-core/src/emacs_core/text/string_pos_cache/tests/gc_collection_epoch_test.rs
similarity index 100%
rename from crates/neovm-core/src/emacs_core/text/string_pos_cache/tests/gc_collection_epoch.rs
rename to crates/neovm-core/src/emacs_core/text/string_pos_cache/tests/gc_collection_epoch_test.rs
diff --git a/crates/neovm-core/src/emacs_core/text/string_pos_cache/tests/gc_tls_ownership.rs b/crates/neovm-core/src/emacs_core/text/string_pos_cache/tests/gc_tls_ownership_test.rs
similarity index 100%
rename from crates/neovm-core/src/emacs_core/text/string_pos_cache/tests/gc_tls_ownership.rs
rename to crates/neovm-core/src/emacs_core/text/string_pos_cache/tests/gc_tls_ownership_test.rs
diff --git a/crates/neovm-core/src/emacs_core/text/string_pos_cache/tests/mod.rs b/crates/neovm-core/src/emacs_core/text/string_pos_cache/tests/string_pos_cache_test.rs
similarity index 100%
rename from crates/neovm-core/src/emacs_core/text/string_pos_cache/tests/mod.rs
rename to crates/neovm-core/src/emacs_core/text/string_pos_cache/tests/string_pos_cache_test.rs
diff --git a/crates/neovm-core/src/emacs_core/text/syntax/mod.rs b/crates/neovm-core/src/emacs_core/text/syntax/mod.rs
index e93079c321..23d697021e 100644
--- a/crates/neovm-core/src/emacs_core/text/syntax/mod.rs
+++ b/crates/neovm-core/src/emacs_core/text/syntax/mod.rs
@@ -7744,15 +7744,15 @@ thread_local! {
 }
 
 #[cfg(test)]
-#[path = "tests/back_comment_safe_positions.rs"]
+#[path = "tests/back_comment_safe_positions_test.rs"]
 mod back_comment_safe_positions_test;
 
 #[cfg(test)]
-#[path = "tests/syntax_prop_byte_run.rs"]
+#[path = "tests/syntax_prop_byte_run_test.rs"]
 mod syntax_prop_byte_run_test;
 
 #[cfg(test)]
-#[path = "tests/mod.rs"]
+#[path = "tests/syntax_test.rs"]
 mod tests;
 
 #[cfg(test)]
@@ -7760,21 +7760,21 @@ mod tests;
 mod flat_ascii_syntax_entry_cache_tests;
 
 #[cfg(test)]
-#[path = "tests/scan_error_data_gnu.rs"]
+#[path = "tests/scan_error_data_gnu_test.rs"]
 mod scan_error_data_gnu_tests;
 
 #[cfg(test)]
-#[path = "tests/pps_propertize_gnu.rs"]
+#[path = "tests/pps_propertize_gnu_test.rs"]
 mod pps_propertize_gnu_tests;
 
 #[cfg(test)]
-#[path = "tests/parse_state_divergence_gnu.rs"]
+#[path = "tests/parse_state_divergence_gnu_test.rs"]
 mod parse_state_divergence_gnu_tests;
 
 #[cfg(test)]
-#[path = "tests/skip_syntax_classes.rs"]
+#[path = "tests/skip_syntax_classes_test.rs"]
 mod skip_syntax_classes_tests;
 
 #[cfg(test)]
-#[path = "tests/gc_tls_ownership.rs"]
+#[path = "tests/gc_tls_ownership_test.rs"]
 mod gc_tls_ownership_tests;
diff --git a/crates/neovm-core/src/emacs_core/text/syntax/parse_cache.rs b/crates/neovm-core/src/emacs_core/text/syntax/parse_cache.rs
index bab4b40ffb..994a2b8937 100644
--- a/crates/neovm-core/src/emacs_core/text/syntax/parse_cache.rs
+++ b/crates/neovm-core/src/emacs_core/text/syntax/parse_cache.rs
@@ -1446,13 +1446,13 @@ where
 }
 
 #[cfg(test)]
-#[path = "tests/parse_cache_invalidation.rs"]
+#[path = "tests/parse_cache_invalidation_test.rs"]
 mod invalidation_tests;
 
 #[cfg(test)]
-#[path = "tests/parse_cache.rs"]
+#[path = "tests/parse_cache_test.rs"]
 mod memo_tests;
 
 #[cfg(test)]
-#[path = "tests/back_comment_canonical.rs"]
+#[path = "tests/back_comment_canonical_test.rs"]
 mod back_comment_canonical_tests;
diff --git a/crates/neovm-core/src/emacs_core/text/syntax/parse_loop.rs b/crates/neovm-core/src/emacs_core/text/syntax/parse_loop.rs
index ff9f67b4aa..ead08ac85e 100644
--- a/crates/neovm-core/src/emacs_core/text/syntax/parse_loop.rs
+++ b/crates/neovm-core/src/emacs_core/text/syntax/parse_loop.rs
@@ -827,5 +827,5 @@ pub(super) fn run_parse_loop<M: ScanMode>(
 }
 
 #[cfg(test)]
-#[path = "tests/parse_loop_resume.rs"]
+#[path = "tests/parse_loop_resume_test.rs"]
 mod resume_tests;
diff --git a/crates/neovm-core/src/emacs_core/text/syntax/pps_propertize.rs b/crates/neovm-core/src/emacs_core/text/syntax/pps_propertize.rs
index df98a147f8..abe4d65c45 100644
--- a/crates/neovm-core/src/emacs_core/text/syntax/pps_propertize.rs
+++ b/crates/neovm-core/src/emacs_core/text/syntax/pps_propertize.rs
@@ -360,5 +360,5 @@ pub(super) fn parse_partial_sexp_propertizing(
 }
 
 #[cfg(test)]
-#[path = "tests/pps_propertize_knob.rs"]
+#[path = "tests/pps_propertize_knob_test.rs"]
 mod knob_tests;
diff --git a/crates/neovm-core/src/emacs_core/text/syntax/tests/back_comment_canonical.rs b/crates/neovm-core/src/emacs_core/text/syntax/tests/back_comment_canonical_test.rs
similarity index 100%
rename from crates/neovm-core/src/emacs_core/text/syntax/tests/back_comment_canonical.rs
rename to crates/neovm-core/src/emacs_core/text/syntax/tests/back_comment_canonical_test.rs
diff --git a/crates/neovm-core/src/emacs_core/text/syntax/tests/back_comment_safe_positions.rs b/crates/neovm-core/src/emacs_core/text/syntax/tests/back_comment_safe_positions_test.rs
similarity index 100%
rename from crates/neovm-core/src/emacs_core/text/syntax/tests/back_comment_safe_positions.rs
rename to crates/neovm-core/src/emacs_core/text/syntax/tests/back_comment_safe_positions_test.rs
diff --git a/crates/neovm-core/src/emacs_core/text/syntax/tests/category_property.rs b/crates/neovm-core/src/emacs_core/text/syntax/tests/category_property_test.rs
similarity index 100%
rename from crates/neovm-core/src/emacs_core/text/syntax/tests/category_property.rs
rename to crates/neovm-core/src/emacs_core/text/syntax/tests/category_property_test.rs
diff --git a/crates/neovm-core/src/emacs_core/text/syntax/tests/gc_tls_ownership.rs b/crates/neovm-core/src/emacs_core/text/syntax/tests/gc_tls_ownership_test.rs
similarity index 100%
rename from crates/neovm-core/src/emacs_core/text/syntax/tests/gc_tls_ownership.rs
rename to crates/neovm-core/src/emacs_core/text/syntax/tests/gc_tls_ownership_test.rs
diff --git a/crates/neovm-core/src/emacs_core/text/syntax/tests/gdn_word_motion.rs b/crates/neovm-core/src/emacs_core/text/syntax/tests/gdn_word_motion_test.rs
similarity index 100%
rename from crates/neovm-core/src/emacs_core/text/syntax/tests/gdn_word_motion.rs
rename to crates/neovm-core/src/emacs_core/text/syntax/tests/gdn_word_motion_test.rs
diff --git a/crates/neovm-core/src/emacs_core/text/syntax/tests/gnu_parity_regression.rs b/crates/neovm-core/src/emacs_core/text/syntax/tests/gnu_parity_regression_test.rs
similarity index 100%
rename from crates/neovm-core/src/emacs_core/text/syntax/tests/gnu_parity_regression.rs
rename to crates/neovm-core/src/emacs_core/text/syntax/tests/gnu_parity_regression_test.rs
diff --git a/crates/neovm-core/src/emacs_core/text/syntax/tests/parse_cache_invalidation.rs b/crates/neovm-core/src/emacs_core/text/syntax/tests/parse_cache_invalidation_test.rs
similarity index 100%
rename from crates/neovm-core/src/emacs_core/text/syntax/tests/parse_cache_invalidation.rs
rename to crates/neovm-core/src/emacs_core/text/syntax/tests/parse_cache_invalidation_test.rs
diff --git a/crates/neovm-core/src/emacs_core/text/syntax/tests/parse_cache.rs b/crates/neovm-core/src/emacs_core/text/syntax/tests/parse_cache_test.rs
similarity index 100%
rename from crates/neovm-core/src/emacs_core/text/syntax/tests/parse_cache.rs
rename to crates/neovm-core/src/emacs_core/text/syntax/tests/parse_cache_test.rs
diff --git a/crates/neovm-core/src/emacs_core/text/syntax/tests/parse_loop_resume.rs b/crates/neovm-core/src/emacs_core/text/syntax/tests/parse_loop_resume_test.rs
similarity index 100%
rename from crates/neovm-core/src/emacs_core/text/syntax/tests/parse_loop_resume.rs
rename to crates/neovm-core/src/emacs_core/text/syntax/tests/parse_loop_resume_test.rs
diff --git a/crates/neovm-core/src/emacs_core/text/syntax/tests/parse_state_divergence_gnu.rs b/crates/neovm-core/src/emacs_core/text/syntax/tests/parse_state_divergence_gnu_test.rs
similarity index 100%
rename from crates/neovm-core/src/emacs_core/text/syntax/tests/parse_state_divergence_gnu.rs
rename to crates/neovm-core/src/emacs_core/text/syntax/tests/parse_state_divergence_gnu_test.rs
diff --git a/crates/neovm-core/src/emacs_core/text/syntax/tests/pps_propertize_gnu.rs b/crates/neovm-core/src/emacs_core/text/syntax/tests/pps_propertize_gnu_test.rs
similarity index 100%
rename from crates/neovm-core/src/emacs_core/text/syntax/tests/pps_propertize_gnu.rs
rename to crates/neovm-core/src/emacs_core/text/syntax/tests/pps_propertize_gnu_test.rs
diff --git a/crates/neovm-core/src/emacs_core/text/syntax/tests/pps_propertize_knob.rs b/crates/neovm-core/src/emacs_core/text/syntax/tests/pps_propertize_knob_test.rs
similarity index 100%
rename from crates/neovm-core/src/emacs_core/text/syntax/tests/pps_propertize_knob.rs
rename to crates/neovm-core/src/emacs_core/text/syntax/tests/pps_propertize_knob_test.rs
diff --git a/crates/neovm-core/src/emacs_core/text/syntax/tests/scan_error_data_gnu.rs b/crates/neovm-core/src/emacs_core/text/syntax/tests/scan_error_data_gnu_test.rs
similarity index 100%
rename from crates/neovm-core/src/emacs_core/text/syntax/tests/scan_error_data_gnu.rs
rename to crates/neovm-core/src/emacs_core/text/syntax/tests/scan_error_data_gnu_test.rs
diff --git a/crates/neovm-core/src/emacs_core/text/syntax/tests/skip_syntax_classes.rs b/crates/neovm-core/src/emacs_core/text/syntax/tests/skip_syntax_classes_test.rs
similarity index 100%
rename from crates/neovm-core/src/emacs_core/text/syntax/tests/skip_syntax_classes.rs
rename to crates/neovm-core/src/emacs_core/text/syntax/tests/skip_syntax_classes_test.rs
diff --git a/crates/neovm-core/src/emacs_core/text/syntax/tests/syntax_prop_byte_run.rs b/crates/neovm-core/src/emacs_core/text/syntax/tests/syntax_prop_byte_run_test.rs
similarity index 100%
rename from crates/neovm-core/src/emacs_core/text/syntax/tests/syntax_prop_byte_run.rs
rename to crates/neovm-core/src/emacs_core/text/syntax/tests/syntax_prop_byte_run_test.rs
diff --git a/crates/neovm-core/src/emacs_core/text/syntax/tests/mod.rs b/crates/neovm-core/src/emacs_core/text/syntax/tests/syntax_test.rs
similarity index 99%
rename from crates/neovm-core/src/emacs_core/text/syntax/tests/mod.rs
rename to crates/neovm-core/src/emacs_core/text/syntax/tests/syntax_test.rs
index d839d0942a..e47bfcf552 100644
--- a/crates/neovm-core/src/emacs_core/text/syntax/tests/mod.rs
+++ b/crates/neovm-core/src/emacs_core/text/syntax/tests/syntax_test.rs
@@ -4488,4 +4488,5 @@ fn scanning_backward_steps_over_a_comment_start_like_gnu() {
 }
 
 #[cfg(test)]
+#[path = "gdn_word_motion_test.rs"]
 mod gdn_word_motion;
diff --git a/crates/neovm-core/src/emacs_core/text/textprop/mod.rs b/crates/neovm-core/src/emacs_core/text/textprop/mod.rs
index 6874a824b2..308a533f0a 100644
--- a/crates/neovm-core/src/emacs_core/text/textprop/mod.rs
+++ b/crates/neovm-core/src/emacs_core/text/textprop/mod.rs
@@ -3903,5 +3903,5 @@ pub(crate) fn builtin_remove_overlays(
 // Tests
 // ===========================================================================
 #[cfg(test)]
-#[path = "tests/mod.rs"]
+#[path = "tests/textprop_test.rs"]
 mod tests;
diff --git a/crates/neovm-core/src/emacs_core/text/textprop/tests/mod.rs b/crates/neovm-core/src/emacs_core/text/textprop/tests/textprop_test.rs
similarity index 100%
rename from crates/neovm-core/src/emacs_core/text/textprop/tests/mod.rs
rename to crates/neovm-core/src/emacs_core/text/textprop/tests/textprop_test.rs
diff --git a/crates/neovm-core/src/emacs_core/text/treesit/mod.rs b/crates/neovm-core/src/emacs_core/text/treesit/mod.rs
index fe39f0264a..6444afc2ec 100644
--- a/crates/neovm-core/src/emacs_core/text/treesit/mod.rs
+++ b/crates/neovm-core/src/emacs_core/text/treesit/mod.rs
@@ -1010,7 +1010,7 @@ impl TreeSitterManager {
 }
 
 #[cfg(test)]
-#[path = "tests/mod.rs"]
+#[path = "tests/treesit_test.rs"]
 mod tests;
 
 fn parser_point_at(
diff --git a/crates/neovm-core/src/emacs_core/text/treesit/tests/mod.rs b/crates/neovm-core/src/emacs_core/text/treesit/tests/treesit_test.rs
similarity index 100%
rename from crates/neovm-core/src/emacs_core/text/treesit/tests/mod.rs
rename to crates/neovm-core/src/emacs_core/text/treesit/tests/treesit_test.rs
diff --git a/crates/neovm-core/src/emacs_core/text/xml/mod.rs b/crates/neovm-core/src/emacs_core/text/xml/mod.rs
index a4033980ae..ab474d2b77 100644
--- a/crates/neovm-core/src/emacs_core/text/xml/mod.rs
+++ b/crates/neovm-core/src/emacs_core/text/xml/mod.rs
@@ -655,5 +655,5 @@ pub(crate) fn builtin_libxml_parse_xml_region(
 }
 
 #[cfg(test)]
-#[path = "tests/mod.rs"]
+#[path = "tests/xml_test.rs"]
 mod tests;
diff --git a/crates/neovm-core/src/emacs_core/text/xml/tests/mod.rs b/crates/neovm-core/src/emacs_core/text/xml/tests/xml_test.rs
similarity index 100%
rename from crates/neovm-core/src/emacs_core/text/xml/tests/mod.rs
rename to crates/neovm-core/src/emacs_core/text/xml/tests/xml_test.rs
diff --git a/crates/neovm-core/src/encoding.rs b/crates/neovm-core/src/encoding.rs
index 74114f0852..85c8a6ab4e 100644
--- a/crates/neovm-core/src/encoding.rs
+++ b/crates/neovm-core/src/encoding.rs
@@ -6153,4 +6153,5 @@ pub(crate) fn builtin_max_char(args: Vec<Value>) -> EvalResult {
 // ===========================================================================
 
 #[cfg(test)]
+#[path = "encoding/tests/encoding_test.rs"]
 mod tests;
diff --git a/crates/neovm-core/src/encoding/tests/mod.rs b/crates/neovm-core/src/encoding/tests/encoding_test.rs
similarity index 99%
rename from crates/neovm-core/src/encoding/tests/mod.rs
rename to crates/neovm-core/src/encoding/tests/encoding_test.rs
index 9ee9c0f8aa..1df91c4249 100644
--- a/crates/neovm-core/src/encoding/tests/mod.rs
+++ b/crates/neovm-core/src/encoding/tests/encoding_test.rs
@@ -2774,4 +2774,5 @@ fn iso_2022_honours_a_shift_only_when_its_flag_is_set_like_gnu() {
 }
 
 #[cfg(test)]
+#[path = "prepared_mule_test.rs"]
 mod prepared_mule;
diff --git a/crates/neovm-core/src/encoding/tests/prepared_mule.rs b/crates/neovm-core/src/encoding/tests/prepared_mule_test.rs
similarity index 100%
rename from crates/neovm-core/src/encoding/tests/prepared_mule.rs
rename to crates/neovm-core/src/encoding/tests/prepared_mule_test.rs
diff --git a/crates/neovm-core/src/face.rs b/crates/neovm-core/src/face.rs
index 015cb2f845..6069c7daeb 100644
--- a/crates/neovm-core/src/face.rs
+++ b/crates/neovm-core/src/face.rs
@@ -2155,4 +2155,5 @@ impl GcTrace for FaceTable {
 // ===========================================================================
 
 #[cfg(test)]
+#[path = "face/tests/face_test.rs"]
 mod tests;
diff --git a/crates/neovm-core/src/face/tests/mod.rs b/crates/neovm-core/src/face/tests/face_test.rs
similarity index 100%
rename from crates/neovm-core/src/face/tests/mod.rs
rename to crates/neovm-core/src/face/tests/face_test.rs
diff --git a/crates/neovm-core/src/image_identity.rs b/crates/neovm-core/src/image_identity.rs
index 5c964d347e..b031b772fc 100644
--- a/crates/neovm-core/src/image_identity.rs
+++ b/crates/neovm-core/src/image_identity.rs
@@ -28,6 +28,7 @@ enum Work {
 }
 
 #[cfg(test)]
+#[path = "image_identity/tests/image_identity_test.rs"]
 mod tests;
 
 impl ImageSpecIdentity {
diff --git a/crates/neovm-core/src/image_identity/tests/mod.rs b/crates/neovm-core/src/image_identity/tests/image_identity_test.rs
similarity index 100%
rename from crates/neovm-core/src/image_identity/tests/mod.rs
rename to crates/neovm-core/src/image_identity/tests/image_identity_test.rs
diff --git a/crates/neovm-core/src/keyboard.rs b/crates/neovm-core/src/keyboard.rs
index 59824ed7e7..f8ca08b3df 100644
--- a/crates/neovm-core/src/keyboard.rs
+++ b/crates/neovm-core/src/keyboard.rs
@@ -7742,4 +7742,5 @@ fn key_sequence_translation_events(translation: Value) -> Option<Vec<Value>> {
 // ===========================================================================
 
 #[cfg(test)]
+#[path = "keyboard/tests/keyboard_test.rs"]
 mod tests;
diff --git a/crates/neovm-core/src/keyboard/display_service.rs b/crates/neovm-core/src/keyboard/display_service.rs
index 99de359849..b65ac89d15 100644
--- a/crates/neovm-core/src/keyboard/display_service.rs
+++ b/crates/neovm-core/src/keyboard/display_service.rs
@@ -54,49 +54,5 @@ impl crate::emacs_core::Context {
 }
 
 #[cfg(test)]
-mod tests {
-    use super::*;
-    use std::{cell::Cell, rc::Rc};
-
-    #[test]
-    fn gui_service_keeps_deadline_and_pending_input_order() {
-        let mut eval = crate::emacs_core::Context::new();
-        eval.eval_str("(setq inhibit-redisplay nil)").unwrap();
-        let captures = Rc::new(Cell::new(0));
-        let observed = captures.clone();
-        eval.display_idle_maintenance_fn = Some(Box::new(move |_| {
-            observed.set(observed.get() + 1);
-            (None, true)
-        }));
-        let paints = Rc::new(Cell::new(0));
-        let observed = paints.clone();
-        eval.redisplay_fn = Some(Box::new(move |_| observed.set(observed.get() + 1)));
-        for ch in ['a', 'b'] {
-            eval.command_loop.unread_key(KeyEvent::char(ch));
-        }
-        let now = Instant::now();
-        eval.service_gui_command_boundary_at(now).unwrap();
-        eval.service_gui_command_boundary_at(now + Duration::from_millis(8))
-            .unwrap();
-        assert_eq!(captures.get(), 0);
-        eval.service_gui_command_boundary_at(now + Duration::from_millis(20))
-            .unwrap();
-        assert_eq!(captures.get(), 1);
-        assert_eq!(paints.get(), 1);
-        eval.service_gui_command_boundary_at(now + Duration::from_millis(21))
-            .unwrap();
-        assert_eq!(captures.get(), 1);
-        assert_eq!(
-            eval.command_loop.read_key_event(),
-            Some(Value::fixnum('a' as i64))
-        );
-        assert_eq!(
-            eval.command_loop.read_key_event(),
-            Some(Value::fixnum('b' as i64))
-        );
-        eval.service_gui_command_boundary_at(now + Duration::from_millis(50))
-            .unwrap();
-        assert_eq!(captures.get(), 1, "idle wait owns idle maintenance");
-        assert!(eval.command_loop.gui_display_deadline.is_none());
-    }
-}
+#[path = "tests/display_service_test.rs"]
+mod tests;
diff --git a/crates/neovm-core/src/keyboard/tests/display_service_test.rs b/crates/neovm-core/src/keyboard/tests/display_service_test.rs
new file mode 100644
index 0000000000..046a921ad8
--- /dev/null
+++ b/crates/neovm-core/src/keyboard/tests/display_service_test.rs
@@ -0,0 +1,44 @@
+use super::*;
+use std::{cell::Cell, rc::Rc};
+
+#[test]
+fn gui_service_keeps_deadline_and_pending_input_order() {
+    let mut eval = crate::emacs_core::Context::new();
+    eval.eval_str("(setq inhibit-redisplay nil)").unwrap();
+    let captures = Rc::new(Cell::new(0));
+    let observed = captures.clone();
+    eval.display_idle_maintenance_fn = Some(Box::new(move |_| {
+        observed.set(observed.get() + 1);
+        (None, true)
+    }));
+    let paints = Rc::new(Cell::new(0));
+    let observed = paints.clone();
+    eval.redisplay_fn = Some(Box::new(move |_| observed.set(observed.get() + 1)));
+    for ch in ['a', 'b'] {
+        eval.command_loop.unread_key(KeyEvent::char(ch));
+    }
+    let now = Instant::now();
+    eval.service_gui_command_boundary_at(now).unwrap();
+    eval.service_gui_command_boundary_at(now + Duration::from_millis(8))
+        .unwrap();
+    assert_eq!(captures.get(), 0);
+    eval.service_gui_command_boundary_at(now + Duration::from_millis(20))
+        .unwrap();
+    assert_eq!(captures.get(), 1);
+    assert_eq!(paints.get(), 1);
+    eval.service_gui_command_boundary_at(now + Duration::from_millis(21))
+        .unwrap();
+    assert_eq!(captures.get(), 1);
+    assert_eq!(
+        eval.command_loop.read_key_event(),
+        Some(Value::fixnum('a' as i64))
+    );
+    assert_eq!(
+        eval.command_loop.read_key_event(),
+        Some(Value::fixnum('b' as i64))
+    );
+    eval.service_gui_command_boundary_at(now + Duration::from_millis(50))
+        .unwrap();
+    assert_eq!(captures.get(), 1, "idle wait owns idle maintenance");
+    assert!(eval.command_loop.gui_display_deadline.is_none());
+}
diff --git a/crates/neovm-core/src/keyboard/tests/mod.rs b/crates/neovm-core/src/keyboard/tests/keyboard_test.rs
similarity index 100%
rename from crates/neovm-core/src/keyboard/tests/mod.rs
rename to crates/neovm-core/src/keyboard/tests/keyboard_test.rs
diff --git a/crates/neovm-core/src/lib.rs b/crates/neovm-core/src/lib.rs
index a76d23853a..609aa1ca37 100644
--- a/crates/neovm-core/src/lib.rs
+++ b/crates/neovm-core/src/lib.rs
@@ -16,7 +16,7 @@ mod keyboard_input;
 pub mod logging;
 pub mod tagged;
 #[cfg(test)]
-#[path = "tests/test_utils.rs"]
+#[path = "tests/test_utils_test.rs"]
 pub mod test_utils;
 pub mod window;
 
diff --git a/crates/neovm-core/src/tagged/collection_reads.rs b/crates/neovm-core/src/tagged/collection_reads.rs
index 7d7d1a07d7..8e3e3c04fb 100644
--- a/crates/neovm-core/src/tagged/collection_reads.rs
+++ b/crates/neovm-core/src/tagged/collection_reads.rs
@@ -751,24 +751,25 @@ pub fn capture_normalized<S, T>(
 }
 
 #[cfg(test)]
+#[path = "collection_reads/tests/collection_reads_test.rs"]
 mod tests;
 
 #[cfg(test)]
-#[path = "tests/write_fusion.rs"]
+#[path = "tests/write_fusion_test.rs"]
 mod write_fusion_tests;
 
 #[cfg(all(test, feature = "jit"))]
-#[path = "collection_reads/tests/lazy_window.rs"]
+#[path = "collection_reads/tests/lazy_window_test.rs"]
 mod lazy_window_tests;
 
 #[cfg(all(test, feature = "jit"))]
-#[path = "collection_reads/tests/observed_epoch.rs"]
+#[path = "collection_reads/tests/observed_epoch_test.rs"]
 mod observed_epoch_tests;
 
 #[cfg(all(test, feature = "jit"))]
-#[path = "collection_reads/tests/observed_gap.rs"]
+#[path = "collection_reads/tests/observed_gap_test.rs"]
 mod observed_gap_tests;
 
 #[cfg(all(test, feature = "jit"))]
-#[path = "collection_reads/tests/observed_collisions.rs"]
+#[path = "collection_reads/tests/observed_collisions_test.rs"]
 mod observed_collisions_tests;
diff --git a/crates/neovm-core/src/tagged/collection_reads/tests.rs b/crates/neovm-core/src/tagged/collection_reads/tests/collection_reads_test.rs
similarity index 99%
rename from crates/neovm-core/src/tagged/collection_reads/tests.rs
rename to crates/neovm-core/src/tagged/collection_reads/tests/collection_reads_test.rs
index de8a7a0b30..51e673bedd 100644
--- a/crates/neovm-core/src/tagged/collection_reads/tests.rs
+++ b/crates/neovm-core/src/tagged/collection_reads/tests/collection_reads_test.rs
@@ -162,4 +162,5 @@ fn observation_budget_and_unwind_restore_the_outer_scope() {
 }
 
 #[cfg(test)]
+#[path = "fast_paths_test.rs"]
 mod fast_paths;
diff --git a/crates/neovm-core/src/tagged/collection_reads/tests/fast_paths.rs b/crates/neovm-core/src/tagged/collection_reads/tests/fast_paths_test.rs
similarity index 100%
rename from crates/neovm-core/src/tagged/collection_reads/tests/fast_paths.rs
rename to crates/neovm-core/src/tagged/collection_reads/tests/fast_paths_test.rs
diff --git a/crates/neovm-core/src/tagged/collection_reads/tests/lazy_window.rs b/crates/neovm-core/src/tagged/collection_reads/tests/lazy_window_test.rs
similarity index 100%
rename from crates/neovm-core/src/tagged/collection_reads/tests/lazy_window.rs
rename to crates/neovm-core/src/tagged/collection_reads/tests/lazy_window_test.rs
diff --git a/crates/neovm-core/src/tagged/collection_reads/tests/observed_collisions.rs b/crates/neovm-core/src/tagged/collection_reads/tests/observed_collisions_test.rs
similarity index 100%
rename from crates/neovm-core/src/tagged/collection_reads/tests/observed_collisions.rs
rename to crates/neovm-core/src/tagged/collection_reads/tests/observed_collisions_test.rs
diff --git a/crates/neovm-core/src/tagged/collection_reads/tests/observed_epoch.rs b/crates/neovm-core/src/tagged/collection_reads/tests/observed_epoch_test.rs
similarity index 100%
rename from crates/neovm-core/src/tagged/collection_reads/tests/observed_epoch.rs
rename to crates/neovm-core/src/tagged/collection_reads/tests/observed_epoch_test.rs
diff --git a/crates/neovm-core/src/tagged/collection_reads/tests/observed_gap.rs b/crates/neovm-core/src/tagged/collection_reads/tests/observed_gap_test.rs
similarity index 100%
rename from crates/neovm-core/src/tagged/collection_reads/tests/observed_gap.rs
rename to crates/neovm-core/src/tagged/collection_reads/tests/observed_gap_test.rs
diff --git a/crates/neovm-core/src/tagged/gc.rs b/crates/neovm-core/src/tagged/gc.rs
index 17fe34235d..7d839268d0 100644
--- a/crates/neovm-core/src/tagged/gc.rs
+++ b/crates/neovm-core/src/tagged/gc.rs
@@ -2553,19 +2553,19 @@ impl Drop for TaggedHeap {
 pub(crate) mod alloc_probe;
 
 #[cfg(test)]
-#[path = "gc/tests/layout_stats_tests.rs"]
+#[path = "gc/tests/layout_stats_test.rs"]
 mod layout_stats_tests;
 
 #[cfg(test)]
-#[path = "gc/tests/pacer_tests.rs"]
+#[path = "gc/tests/pacer_test.rs"]
 mod pacer_tests;
 
 #[cfg(test)]
-#[path = "gc/tests/ownership_tests.rs"]
+#[path = "gc/tests/ownership_test.rs"]
 mod ownership_tests;
 
 #[cfg(test)]
-#[path = "gc/tests/thread_local_ownership.rs"]
+#[path = "gc/tests/thread_local_ownership_test.rs"]
 mod thread_local_ownership_tests;
 
 /// FLOAT ARENA PAGES test suite. Every scenario runs twice: plain and with
@@ -2575,7 +2575,7 @@ mod thread_local_ownership_tests;
 /// relies on nextest's process-per-test model for the env var and the global
 /// `LIVE_FLOAT_PAGES` counter.
 #[cfg(test)]
-#[path = "gc/tests/float_arena_tests.rs"]
+#[path = "gc/tests/float_arena_test.rs"]
 mod float_arena_tests;
 
 /// ARENA PROMOTION + RETIREMENT test suite (stage 3, commit 4): the
@@ -2585,7 +2585,7 @@ mod float_arena_tests;
 /// remembered-set scan. Scenarios run plain and (where the partition
 /// verifiers add coverage) with `NEOVM_GC_VERIFY_PARTITION=1`.
 #[cfg(test)]
-#[path = "gc/tests/arena_promotion_tests.rs"]
+#[path = "gc/tests/arena_promotion_test.rs"]
 mod arena_promotion_tests;
 
 /// BYTECODE ARENA test suite (task 03/3a): page-span oracle exactness for the
@@ -2600,7 +2600,7 @@ mod arena_promotion_tests;
 /// teardown counters, and the test-only constants-mutation seam. Scenarios
 /// run plain and (where the partition matters) VERIFY_PARTITION-armed.
 #[cfg(test)]
-#[path = "gc/tests/bytecode_arena_tests.rs"]
+#[path = "gc/tests/bytecode_arena_test.rs"]
 mod bytecode_arena_tests;
 
 /// LAMBDA + MACRO ARENA test suite (task 03/3b): the 128B power-of-two class
@@ -2617,7 +2617,7 @@ mod bytecode_arena_tests;
 /// exactness/sweep/tenure/teardown battery proving its own arena. Scenarios
 /// run plain and (where the partition matters) VERIFY_PARTITION-armed.
 #[cfg(test)]
-#[path = "gc/tests/lambda_macro_arena_tests.rs"]
+#[path = "gc/tests/lambda_macro_arena_test.rs"]
 mod lambda_macro_arena_tests;
 
 /// RECORD ARENA test suite (task 03/3b): the 64B class (1024 slots/page,
@@ -2631,7 +2631,7 @@ mod lambda_macro_arena_tests;
 /// parity survival, and the WindowConfiguration dual-tag sharing the arena.
 /// Scenarios run plain and (where the partition matters) VERIFY_PARTITION.
 #[cfg(test)]
-#[path = "gc/tests/record_arena_tests.rs"]
+#[path = "gc/tests/record_arena_test.rs"]
 mod record_arena_tests;
 
 /// SYMBOL-WITH-POS ARENA test suite (task 03/3b): the 64B class (1024
@@ -2729,15 +2729,15 @@ pub(crate) use jit_state::{
 /// Allocation regions: sources, give-back, exact counters, black across
 /// the phase flags, and the close at every collector entry.
 #[cfg(test)]
-#[path = "gc/tests/alloc_region_tests.rs"]
+#[path = "gc/tests/alloc_region_test.rs"]
 mod alloc_region_tests;
 #[cfg(test)]
-#[path = "gc/tests/barrier_window_generational_tests.rs"]
+#[path = "gc/tests/barrier_window_generational_test.rs"]
 mod barrier_window_generational_tests;
 /// The write barrier's owner window against the gate it replaced, state by
 /// state and owner by owner, and its republication at every input writer.
 #[cfg(test)]
-#[path = "gc/tests/barrier_window_tests.rs"]
+#[path = "gc/tests/barrier_window_test.rs"]
 mod barrier_window_tests;
 /// BIGNUM ARENA test suite (lever P0.11): the 64B payload-bearing class
 /// (1024 slots/page, own arena). Covers the slot fit, page-span oracle
@@ -2748,22 +2748,22 @@ mod barrier_window_tests;
 /// counters and exact values after slot reuse. Scenarios run plain and
 /// (where the partition matters) VERIFY_PARTITION-armed.
 #[cfg(test)]
-#[path = "gc/tests/bignum_arena_tests.rs"]
+#[path = "gc/tests/bignum_arena_test.rs"]
 mod bignum_arena_tests;
 /// The generation census: survivor classes across cycles on both
 /// termination paths, the remembered-set probe, and that it measures without
 /// changing anything.
 #[cfg(test)]
-#[path = "gc/tests/census_tests.rs"]
+#[path = "gc/tests/census_test.rs"]
 mod census_tests;
 /// The chunk map: the radix, its entries through page and block creation,
 /// release and re-indexing, the oracles against the registries, the GC
 /// thread's snapshot semantics, and concurrent cycles classified through it.
 #[cfg(test)]
-#[path = "gc/tests/chunk_map_tests.rs"]
+#[path = "gc/tests/chunk_map_test.rs"]
 mod chunk_map_tests;
 #[cfg(test)]
-#[path = "gc/tests/cons_alloc_tests.rs"]
+#[path = "gc/tests/cons_alloc_test.rs"]
 mod cons_alloc_tests;
 /// A fake pdump image in one allocation (see the module doc for why one).
 #[cfg(test)]
@@ -2772,26 +2772,26 @@ pub(crate) mod fake_image;
 /// The header's generation byte, THE generation predicate per collection
 /// scope, the byte map, and the first cycle's promotion to permanent.
 #[cfg(test)]
-#[path = "gc/tests/generation_tests.rs"]
+#[path = "gc/tests/generation_test.rs"]
 mod generation_tests;
 #[cfg(test)]
-#[path = "gc/tests/generational_verifier_tests.rs"]
+#[path = "gc/tests/generational_verifier_test.rs"]
 mod generational_verifier_tests;
 #[cfg(test)]
-#[path = "gc/tests/marker_arena_tests.rs"]
+#[path = "gc/tests/marker_arena_test.rs"]
 mod marker_arena_tests;
 /// Record and closure slot stores are atomic: race-free against an atomic
 /// reader, same semantics, same barrier through a concurrent mark.
 #[cfg(test)]
-#[path = "gc/tests/slot_store_tests.rs"]
+#[path = "gc/tests/slot_store_test.rs"]
 mod slot_store_tests;
 #[cfg(test)]
-#[path = "gc/tests/symbol_with_pos_arena_tests.rs"]
+#[path = "gc/tests/symbol_with_pos_arena_test.rs"]
 mod symbol_with_pos_arena_tests;
 /// `NEOVM_GC_VEC_SCAN=defer` (F-G): no Tier-B snapshot, page vectors traced
 /// by reachability at the termination, with and without the chunk map.
 #[cfg(test)]
-#[path = "gc/tests/vec_scan_tests.rs"]
+#[path = "gc/tests/vec_scan_test.rs"]
 mod vec_scan_tests;
 
 /// Test-only growth helper mirroring the production insert resize policy closely
@@ -2806,24 +2806,24 @@ fn maybe_resize_for_test(ht: &mut crate::emacs_core::value::LispHashTable) {
 }
 
 #[cfg(test)]
-#[path = "gc/tests/generational_tests.rs"]
+#[path = "gc/tests/generational_test.rs"]
 mod generational_tests;
 
 #[cfg(test)]
-#[path = "gc/tests/birth_logs_tests.rs"]
+#[path = "gc/tests/birth_logs_test.rs"]
 mod birth_logs_tests;
 
 #[cfg(test)]
-#[path = "gc/tests/generational_major_tests.rs"]
+#[path = "gc/tests/generational_major_test.rs"]
 mod generational_major_tests;
 
 #[cfg(test)]
-#[path = "gc/tests/generational_pacing_tests.rs"]
+#[path = "gc/tests/generational_pacing_test.rs"]
 mod generational_pacing_tests;
 
 #[cfg(test)]
-#[path = "gc/tests/major_symbol_preimage_tests.rs"]
+#[path = "gc/tests/major_symbol_preimage_test.rs"]
 mod major_symbol_preimage_tests;
 #[cfg(test)]
-#[path = "gc/tests/symbol_barrier_tests.rs"]
+#[path = "gc/tests/symbol_barrier_test.rs"]
 mod symbol_barrier_tests;
diff --git a/crates/neovm-core/src/tagged/gc/arena_pages.rs b/crates/neovm-core/src/tagged/gc/arena_pages.rs
index 8066064790..2812a94dda 100644
--- a/crates/neovm-core/src/tagged/gc/arena_pages.rs
+++ b/crates/neovm-core/src/tagged/gc/arena_pages.rs
@@ -1979,5 +1979,5 @@ impl HandshakeStats {
 }
 
 #[cfg(test)]
-#[path = "tests/arena_minor_tests.rs"]
+#[path = "tests/arena_minor_test.rs"]
 mod arena_minor_tests;
diff --git a/crates/neovm-core/src/tagged/gc/chunk_map.rs b/crates/neovm-core/src/tagged/gc/chunk_map.rs
index 521a204cce..29d131e35f 100644
--- a/crates/neovm-core/src/tagged/gc/chunk_map.rs
+++ b/crates/neovm-core/src/tagged/gc/chunk_map.rs
@@ -340,5 +340,5 @@ impl PageSnapshot {
 }
 
 #[cfg(test)]
-#[path = "tests/chunk_entry_decode_tests.rs"]
+#[path = "tests/chunk_entry_decode_test.rs"]
 mod decode_tests;
diff --git a/crates/neovm-core/src/tagged/gc/collection_observed.rs b/crates/neovm-core/src/tagged/gc/collection_observed.rs
index 77f223c1f1..9f451248f5 100644
--- a/crates/neovm-core/src/tagged/gc/collection_observed.rs
+++ b/crates/neovm-core/src/tagged/gc/collection_observed.rs
@@ -344,9 +344,9 @@ fn with_collection_observed_registry_locked<R>(f: impl FnOnce() -> R) -> R {
 }
 
 #[cfg(test)]
-#[path = "tests/collection_observed_tests.rs"]
+#[path = "tests/collection_observed_test.rs"]
 mod tests;
 
 #[cfg(test)]
-#[path = "tests/collection_observed_registry_tests.rs"]
+#[path = "tests/collection_observed_registry_test.rs"]
 mod registry_tests;
diff --git a/crates/neovm-core/src/tagged/gc/cons_block_trailer.rs b/crates/neovm-core/src/tagged/gc/cons_block_trailer.rs
index b14099afa4..de48a45c07 100644
--- a/crates/neovm-core/src/tagged/gc/cons_block_trailer.rs
+++ b/crates/neovm-core/src/tagged/gc/cons_block_trailer.rs
@@ -313,5 +313,5 @@ const _: () = {
 };
 
 #[cfg(test)]
-#[path = "tests/cons_trailer_tests.rs"]
+#[path = "tests/cons_trailer_test.rs"]
 mod cons_trailer_tests;
diff --git a/crates/neovm-core/src/tagged/gc/cons_blocks.rs b/crates/neovm-core/src/tagged/gc/cons_blocks.rs
index 57b1b31141..a85c6f9936 100644
--- a/crates/neovm-core/src/tagged/gc/cons_blocks.rs
+++ b/crates/neovm-core/src/tagged/gc/cons_blocks.rs
@@ -262,5 +262,5 @@ impl Drop for ConsBlock {
 }
 
 #[cfg(test)]
-#[path = "tests/cons_minor_tests.rs"]
+#[path = "tests/cons_minor_test.rs"]
 mod cons_minor_tests;
diff --git a/crates/neovm-core/src/tagged/gc/gc_thread.rs b/crates/neovm-core/src/tagged/gc/gc_thread.rs
index 875f2c11fa..f664821ef2 100644
--- a/crates/neovm-core/src/tagged/gc/gc_thread.rs
+++ b/crates/neovm-core/src/tagged/gc/gc_thread.rs
@@ -1569,5 +1569,5 @@ pub(crate) fn note_string_interval_preimage(
 }
 
 #[cfg(test)]
-#[path = "tests/concurrent_major_worker_tests.rs"]
+#[path = "tests/concurrent_major_worker_test.rs"]
 mod concurrent_major_worker_tests;
diff --git a/crates/neovm-core/src/tagged/gc/memory_inventory.rs b/crates/neovm-core/src/tagged/gc/memory_inventory.rs
index 84fde9951d..052d3b5679 100644
--- a/crates/neovm-core/src/tagged/gc/memory_inventory.rs
+++ b/crates/neovm-core/src/tagged/gc/memory_inventory.rs
@@ -901,5 +901,5 @@ fn bytecode_payload_with_text_properties(object: &ByteCodeObj) -> PayloadLayout
 }
 
 #[cfg(test)]
-#[path = "tests/memory_inventory_tests.rs"]
+#[path = "tests/memory_inventory_test.rs"]
 mod tests;
diff --git a/crates/neovm-core/src/tagged/gc/memory_telemetry.rs b/crates/neovm-core/src/tagged/gc/memory_telemetry.rs
index 2b552d613b..da1047b024 100644
--- a/crates/neovm-core/src/tagged/gc/memory_telemetry.rs
+++ b/crates/neovm-core/src/tagged/gc/memory_telemetry.rs
@@ -318,5 +318,5 @@ pub(super) fn observe(heap: &TaggedHeap, phase: Phase) {
 }
 
 #[cfg(test)]
-#[path = "tests/memory_telemetry_tests.rs"]
+#[path = "tests/memory_telemetry_test.rs"]
 mod tests;
diff --git a/crates/neovm-core/src/tagged/gc/tests/alloc_region_tests.rs b/crates/neovm-core/src/tagged/gc/tests/alloc_region_test.rs
similarity index 100%
rename from crates/neovm-core/src/tagged/gc/tests/alloc_region_tests.rs
rename to crates/neovm-core/src/tagged/gc/tests/alloc_region_test.rs
diff --git a/crates/neovm-core/src/tagged/gc/tests/arena_minor_tests.rs b/crates/neovm-core/src/tagged/gc/tests/arena_minor_test.rs
similarity index 100%
rename from crates/neovm-core/src/tagged/gc/tests/arena_minor_tests.rs
rename to crates/neovm-core/src/tagged/gc/tests/arena_minor_test.rs
diff --git a/crates/neovm-core/src/tagged/gc/tests/arena_promotion_tests.rs b/crates/neovm-core/src/tagged/gc/tests/arena_promotion_test.rs
similarity index 100%
rename from crates/neovm-core/src/tagged/gc/tests/arena_promotion_tests.rs
rename to crates/neovm-core/src/tagged/gc/tests/arena_promotion_test.rs
diff --git a/crates/neovm-core/src/tagged/gc/tests/barrier_window_generational_tests.rs b/crates/neovm-core/src/tagged/gc/tests/barrier_window_generational_test.rs
similarity index 100%
rename from crates/neovm-core/src/tagged/gc/tests/barrier_window_generational_tests.rs
rename to crates/neovm-core/src/tagged/gc/tests/barrier_window_generational_test.rs
diff --git a/crates/neovm-core/src/tagged/gc/tests/barrier_window_tests.rs b/crates/neovm-core/src/tagged/gc/tests/barrier_window_test.rs
similarity index 100%
rename from crates/neovm-core/src/tagged/gc/tests/barrier_window_tests.rs
rename to crates/neovm-core/src/tagged/gc/tests/barrier_window_test.rs
diff --git a/crates/neovm-core/src/tagged/gc/tests/bignum_arena_tests.rs b/crates/neovm-core/src/tagged/gc/tests/bignum_arena_test.rs
similarity index 100%
rename from crates/neovm-core/src/tagged/gc/tests/bignum_arena_tests.rs
rename to crates/neovm-core/src/tagged/gc/tests/bignum_arena_test.rs
diff --git a/crates/neovm-core/src/tagged/gc/tests/birth_logs_tests.rs b/crates/neovm-core/src/tagged/gc/tests/birth_logs_test.rs
similarity index 100%
rename from crates/neovm-core/src/tagged/gc/tests/birth_logs_tests.rs
rename to crates/neovm-core/src/tagged/gc/tests/birth_logs_test.rs
diff --git a/crates/neovm-core/src/tagged/gc/tests/bytecode_arena_tests.rs b/crates/neovm-core/src/tagged/gc/tests/bytecode_arena_test.rs
similarity index 100%
rename from crates/neovm-core/src/tagged/gc/tests/bytecode_arena_tests.rs
rename to crates/neovm-core/src/tagged/gc/tests/bytecode_arena_test.rs
diff --git a/crates/neovm-core/src/tagged/gc/tests/census_tests.rs b/crates/neovm-core/src/tagged/gc/tests/census_test.rs
similarity index 100%
rename from crates/neovm-core/src/tagged/gc/tests/census_tests.rs
rename to crates/neovm-core/src/tagged/gc/tests/census_test.rs
diff --git a/crates/neovm-core/src/tagged/gc/tests/chunk_entry_decode_tests.rs b/crates/neovm-core/src/tagged/gc/tests/chunk_entry_decode_test.rs
similarity index 100%
rename from crates/neovm-core/src/tagged/gc/tests/chunk_entry_decode_tests.rs
rename to crates/neovm-core/src/tagged/gc/tests/chunk_entry_decode_test.rs
diff --git a/crates/neovm-core/src/tagged/gc/tests/chunk_map_tests.rs b/crates/neovm-core/src/tagged/gc/tests/chunk_map_test.rs
similarity index 100%
rename from crates/neovm-core/src/tagged/gc/tests/chunk_map_tests.rs
rename to crates/neovm-core/src/tagged/gc/tests/chunk_map_test.rs
diff --git a/crates/neovm-core/src/tagged/gc/tests/collection_observed_registry_tests.rs b/crates/neovm-core/src/tagged/gc/tests/collection_observed_registry_test.rs
similarity index 100%
rename from crates/neovm-core/src/tagged/gc/tests/collection_observed_registry_tests.rs
rename to crates/neovm-core/src/tagged/gc/tests/collection_observed_registry_test.rs
diff --git a/crates/neovm-core/src/tagged/gc/tests/collection_observed_tests.rs b/crates/neovm-core/src/tagged/gc/tests/collection_observed_test.rs
similarity index 100%
rename from crates/neovm-core/src/tagged/gc/tests/collection_observed_tests.rs
rename to crates/neovm-core/src/tagged/gc/tests/collection_observed_test.rs
diff --git a/crates/neovm-core/src/tagged/gc/tests/concurrent_major_worker_tests.rs b/crates/neovm-core/src/tagged/gc/tests/concurrent_major_worker_test.rs
similarity index 100%
rename from crates/neovm-core/src/tagged/gc/tests/concurrent_major_worker_tests.rs
rename to crates/neovm-core/src/tagged/gc/tests/concurrent_major_worker_test.rs
diff --git a/crates/neovm-core/src/tagged/gc/tests/cons_alloc_tests.rs b/crates/neovm-core/src/tagged/gc/tests/cons_alloc_test.rs
similarity index 100%
rename from crates/neovm-core/src/tagged/gc/tests/cons_alloc_tests.rs
rename to crates/neovm-core/src/tagged/gc/tests/cons_alloc_test.rs
diff --git a/crates/neovm-core/src/tagged/gc/tests/cons_minor_tests.rs b/crates/neovm-core/src/tagged/gc/tests/cons_minor_test.rs
similarity index 100%
rename from crates/neovm-core/src/tagged/gc/tests/cons_minor_tests.rs
rename to crates/neovm-core/src/tagged/gc/tests/cons_minor_test.rs
diff --git a/crates/neovm-core/src/tagged/gc/tests/cons_trailer_tests.rs b/crates/neovm-core/src/tagged/gc/tests/cons_trailer_test.rs
similarity index 100%
rename from crates/neovm-core/src/tagged/gc/tests/cons_trailer_tests.rs
rename to crates/neovm-core/src/tagged/gc/tests/cons_trailer_test.rs
diff --git a/crates/neovm-core/src/tagged/gc/tests/float_arena_tests.rs b/crates/neovm-core/src/tagged/gc/tests/float_arena_test.rs
similarity index 100%
rename from crates/neovm-core/src/tagged/gc/tests/float_arena_tests.rs
rename to crates/neovm-core/src/tagged/gc/tests/float_arena_test.rs
diff --git a/crates/neovm-core/src/tagged/gc/tests/generation_tests.rs b/crates/neovm-core/src/tagged/gc/tests/generation_test.rs
similarity index 100%
rename from crates/neovm-core/src/tagged/gc/tests/generation_tests.rs
rename to crates/neovm-core/src/tagged/gc/tests/generation_test.rs
diff --git a/crates/neovm-core/src/tagged/gc/tests/generational_major_tests.rs b/crates/neovm-core/src/tagged/gc/tests/generational_major_test.rs
similarity index 100%
rename from crates/neovm-core/src/tagged/gc/tests/generational_major_tests.rs
rename to crates/neovm-core/src/tagged/gc/tests/generational_major_test.rs
diff --git a/crates/neovm-core/src/tagged/gc/tests/generational_pacing_tests.rs b/crates/neovm-core/src/tagged/gc/tests/generational_pacing_test.rs
similarity index 100%
rename from crates/neovm-core/src/tagged/gc/tests/generational_pacing_tests.rs
rename to crates/neovm-core/src/tagged/gc/tests/generational_pacing_test.rs
diff --git a/crates/neovm-core/src/tagged/gc/tests/generational_tests.rs b/crates/neovm-core/src/tagged/gc/tests/generational_test.rs
similarity index 100%
rename from crates/neovm-core/src/tagged/gc/tests/generational_tests.rs
rename to crates/neovm-core/src/tagged/gc/tests/generational_test.rs
diff --git a/crates/neovm-core/src/tagged/gc/tests/generational_verifier_tests.rs b/crates/neovm-core/src/tagged/gc/tests/generational_verifier_test.rs
similarity index 100%
rename from crates/neovm-core/src/tagged/gc/tests/generational_verifier_tests.rs
rename to crates/neovm-core/src/tagged/gc/tests/generational_verifier_test.rs
diff --git a/crates/neovm-core/src/tagged/gc/tests/heap_mut_closure_tests.rs b/crates/neovm-core/src/tagged/gc/tests/heap_mut_closure_test.rs
similarity index 100%
rename from crates/neovm-core/src/tagged/gc/tests/heap_mut_closure_tests.rs
rename to crates/neovm-core/src/tagged/gc/tests/heap_mut_closure_test.rs
diff --git a/crates/neovm-core/src/tagged/gc/tests/lambda_macro_arena_tests.rs b/crates/neovm-core/src/tagged/gc/tests/lambda_macro_arena_test.rs
similarity index 100%
rename from crates/neovm-core/src/tagged/gc/tests/lambda_macro_arena_tests.rs
rename to crates/neovm-core/src/tagged/gc/tests/lambda_macro_arena_test.rs
diff --git a/crates/neovm-core/src/tagged/gc/tests/layout_stats_tests.rs b/crates/neovm-core/src/tagged/gc/tests/layout_stats_test.rs
similarity index 100%
rename from crates/neovm-core/src/tagged/gc/tests/layout_stats_tests.rs
rename to crates/neovm-core/src/tagged/gc/tests/layout_stats_test.rs
diff --git a/crates/neovm-core/src/tagged/gc/tests/major_symbol_preimage_tests.rs b/crates/neovm-core/src/tagged/gc/tests/major_symbol_preimage_test.rs
similarity index 100%
rename from crates/neovm-core/src/tagged/gc/tests/major_symbol_preimage_tests.rs
rename to crates/neovm-core/src/tagged/gc/tests/major_symbol_preimage_test.rs
diff --git a/crates/neovm-core/src/tagged/gc/tests/marker_arena_tests.rs b/crates/neovm-core/src/tagged/gc/tests/marker_arena_test.rs
similarity index 100%
rename from crates/neovm-core/src/tagged/gc/tests/marker_arena_tests.rs
rename to crates/neovm-core/src/tagged/gc/tests/marker_arena_test.rs
diff --git a/crates/neovm-core/src/tagged/gc/tests/memory_inventory_tests.rs b/crates/neovm-core/src/tagged/gc/tests/memory_inventory_test.rs
similarity index 100%
rename from crates/neovm-core/src/tagged/gc/tests/memory_inventory_tests.rs
rename to crates/neovm-core/src/tagged/gc/tests/memory_inventory_test.rs
diff --git a/crates/neovm-core/src/tagged/gc/tests/memory_telemetry_tests.rs b/crates/neovm-core/src/tagged/gc/tests/memory_telemetry_test.rs
similarity index 100%
rename from crates/neovm-core/src/tagged/gc/tests/memory_telemetry_tests.rs
rename to crates/neovm-core/src/tagged/gc/tests/memory_telemetry_test.rs
diff --git a/crates/neovm-core/src/tagged/gc/tests/ownership_tests.rs b/crates/neovm-core/src/tagged/gc/tests/ownership_test.rs
similarity index 100%
rename from crates/neovm-core/src/tagged/gc/tests/ownership_tests.rs
rename to crates/neovm-core/src/tagged/gc/tests/ownership_test.rs
diff --git a/crates/neovm-core/src/tagged/gc/tests/pacer_tests.rs b/crates/neovm-core/src/tagged/gc/tests/pacer_test.rs
similarity index 100%
rename from crates/neovm-core/src/tagged/gc/tests/pacer_tests.rs
rename to crates/neovm-core/src/tagged/gc/tests/pacer_test.rs
diff --git a/crates/neovm-core/src/tagged/gc/tests/record_arena_tests.rs b/crates/neovm-core/src/tagged/gc/tests/record_arena_test.rs
similarity index 100%
rename from crates/neovm-core/src/tagged/gc/tests/record_arena_tests.rs
rename to crates/neovm-core/src/tagged/gc/tests/record_arena_test.rs
diff --git a/crates/neovm-core/src/tagged/gc/tests/slot_store_tests.rs b/crates/neovm-core/src/tagged/gc/tests/slot_store_test.rs
similarity index 100%
rename from crates/neovm-core/src/tagged/gc/tests/slot_store_tests.rs
rename to crates/neovm-core/src/tagged/gc/tests/slot_store_test.rs
diff --git a/crates/neovm-core/src/tagged/gc/tests/symbol_barrier_tests.rs b/crates/neovm-core/src/tagged/gc/tests/symbol_barrier_test.rs
similarity index 100%
rename from crates/neovm-core/src/tagged/gc/tests/symbol_barrier_tests.rs
rename to crates/neovm-core/src/tagged/gc/tests/symbol_barrier_test.rs
diff --git a/crates/neovm-core/src/tagged/gc/tests/symbol_with_pos_arena_tests.rs b/crates/neovm-core/src/tagged/gc/tests/symbol_with_pos_arena_test.rs
similarity index 100%
rename from crates/neovm-core/src/tagged/gc/tests/symbol_with_pos_arena_tests.rs
rename to crates/neovm-core/src/tagged/gc/tests/symbol_with_pos_arena_test.rs
diff --git a/crates/neovm-core/src/tagged/gc/tests/thread_local_ownership.rs b/crates/neovm-core/src/tagged/gc/tests/thread_local_ownership_test.rs
similarity index 100%
rename from crates/neovm-core/src/tagged/gc/tests/thread_local_ownership.rs
rename to crates/neovm-core/src/tagged/gc/tests/thread_local_ownership_test.rs
diff --git a/crates/neovm-core/src/tagged/gc/tests/vec_scan_tests.rs b/crates/neovm-core/src/tagged/gc/tests/vec_scan_test.rs
similarity index 100%
rename from crates/neovm-core/src/tagged/gc/tests/vec_scan_tests.rs
rename to crates/neovm-core/src/tagged/gc/tests/vec_scan_test.rs
diff --git a/crates/neovm-core/src/tagged/mod.rs b/crates/neovm-core/src/tagged/mod.rs
index 8106d29402..82aa747eb0 100644
--- a/crates/neovm-core/src/tagged/mod.rs
+++ b/crates/neovm-core/src/tagged/mod.rs
@@ -14,4 +14,5 @@ pub mod symbol_marks;
 pub mod value;
 
 #[cfg(test)]
+#[path = "tests/tagged_test.rs"]
 mod tests;
diff --git a/crates/neovm-core/src/tagged/mutate.rs b/crates/neovm-core/src/tagged/mutate.rs
index 5c56d30f19..10c8042d8a 100644
--- a/crates/neovm-core/src/tagged/mutate.rs
+++ b/crates/neovm-core/src/tagged/mutate.rs
@@ -555,5 +555,5 @@ pub fn with_xwidget_view_mut<R>(
 
 #[cfg(test)]
 #[cfg(debug_assertions)]
-#[path = "gc/tests/heap_mut_closure_tests.rs"]
+#[path = "gc/tests/heap_mut_closure_test.rs"]
 mod gc_heap_mut_closure_tests;
diff --git a/crates/neovm-core/src/tagged/symbol_marks.rs b/crates/neovm-core/src/tagged/symbol_marks.rs
index 9c89c9eaea..7d469017ab 100644
--- a/crates/neovm-core/src/tagged/symbol_marks.rs
+++ b/crates/neovm-core/src/tagged/symbol_marks.rs
@@ -54,4 +54,5 @@ impl SymbolMarkBits {
 }
 
 #[cfg(test)]
+#[path = "symbol_marks/tests/symbol_marks_test.rs"]
 mod tests;
diff --git a/crates/neovm-core/src/tagged/symbol_marks/tests/mod.rs b/crates/neovm-core/src/tagged/symbol_marks/tests/symbol_marks_test.rs
similarity index 100%
rename from crates/neovm-core/src/tagged/symbol_marks/tests/mod.rs
rename to crates/neovm-core/src/tagged/symbol_marks/tests/symbol_marks_test.rs
diff --git a/crates/neovm-core/src/tagged/tests.rs b/crates/neovm-core/src/tagged/tests/tagged_test.rs
similarity index 99%
rename from crates/neovm-core/src/tagged/tests.rs
rename to crates/neovm-core/src/tagged/tests/tagged_test.rs
index f916b0561c..6cdff080dd 100644
--- a/crates/neovm-core/src/tagged/tests.rs
+++ b/crates/neovm-core/src/tagged/tests/tagged_test.rs
@@ -830,4 +830,5 @@ fn gc_root_stays_a_facade_after_the_domain_split() {
     );
 }
 
+#[path = "integration_test.rs"]
 mod integration_test;
diff --git a/crates/neovm-core/src/tagged/tests/write_fusion.rs b/crates/neovm-core/src/tagged/tests/write_fusion_test.rs
similarity index 100%
rename from crates/neovm-core/src/tagged/tests/write_fusion.rs
rename to crates/neovm-core/src/tagged/tests/write_fusion_test.rs
diff --git a/crates/neovm-core/src/tagged/value.rs b/crates/neovm-core/src/tagged/value.rs
index 81c6d8c5ee..85c8ea5a96 100644
--- a/crates/neovm-core/src/tagged/value.rs
+++ b/crates/neovm-core/src/tagged/value.rs
@@ -1232,5 +1232,5 @@ impl fmt::Debug for TaggedValue {
 }
 
 #[cfg(test)]
-#[path = "value/tests/gc_tls_ownership.rs"]
+#[path = "value/tests/gc_tls_ownership_test.rs"]
 mod gc_tls_ownership_tests;
diff --git a/crates/neovm-core/src/tagged/value/tests/gc_tls_ownership.rs b/crates/neovm-core/src/tagged/value/tests/gc_tls_ownership_test.rs
similarity index 100%
rename from crates/neovm-core/src/tagged/value/tests/gc_tls_ownership.rs
rename to crates/neovm-core/src/tagged/value/tests/gc_tls_ownership_test.rs
diff --git a/crates/neovm-core/src/tests/test_utils.rs b/crates/neovm-core/src/tests/test_utils_test.rs
similarity index 100%
rename from crates/neovm-core/src/tests/test_utils.rs
rename to crates/neovm-core/src/tests/test_utils_test.rs
diff --git a/crates/neovm-core/src/window/frame_alpha.rs b/crates/neovm-core/src/window/frame_alpha.rs
index 6164380464..5c2729d181 100644
--- a/crates/neovm-core/src/window/frame_alpha.rs
+++ b/crates/neovm-core/src/window/frame_alpha.rs
@@ -63,5 +63,5 @@ pub fn lower_limit(value: Value) -> f32 {
 }
 
 #[cfg(test)]
-#[path = "frame_alpha/tests/mod.rs"]
+#[path = "frame_alpha/tests/frame_alpha_test.rs"]
 mod tests;
diff --git a/crates/neovm-core/src/window/frame_alpha/tests/mod.rs b/crates/neovm-core/src/window/frame_alpha/tests/frame_alpha_test.rs
similarity index 100%
rename from crates/neovm-core/src/window/frame_alpha/tests/mod.rs
rename to crates/neovm-core/src/window/frame_alpha/tests/frame_alpha_test.rs
diff --git a/crates/neovm-core/src/window/mod.rs b/crates/neovm-core/src/window/mod.rs
index a20f184db0..d63b861853 100644
--- a/crates/neovm-core/src/window/mod.rs
+++ b/crates/neovm-core/src/window/mod.rs
@@ -8806,4 +8806,5 @@ impl GcTrace for WindowTree {
 // ===========================================================================
 
 #[cfg(test)]
+#[path = "tests/window_test.rs"]
 mod tests;
diff --git a/crates/neovm-core/src/window/tests/split_hook_epoch.rs b/crates/neovm-core/src/window/tests/split_hook_epoch_test.rs
similarity index 100%
rename from crates/neovm-core/src/window/tests/split_hook_epoch.rs
rename to crates/neovm-core/src/window/tests/split_hook_epoch_test.rs
diff --git a/crates/neovm-core/src/window/tests/mod.rs b/crates/neovm-core/src/window/tests/window_test.rs
similarity index 99%
rename from crates/neovm-core/src/window/tests/mod.rs
rename to crates/neovm-core/src/window/tests/window_test.rs
index 15a2368c92..6b5847b73c 100644
--- a/crates/neovm-core/src/window/tests/mod.rs
+++ b/crates/neovm-core/src/window/tests/window_test.rs
@@ -3,6 +3,7 @@ use crate::buffer::{CharLen, EmacsByteLen};
 use neomacs_display_protocol::TransitionDirection;
 
 #[cfg(test)]
+#[path = "point_rows_query_test.rs"]
 mod point_rows_query_test;
 
 #[test]
@@ -4172,4 +4173,5 @@ fn fontset_changes_invalidate_window_query_and_attempt_freshness() {
 }
 
 #[cfg(test)]
+#[path = "split_hook_epoch_test.rs"]
 mod split_hook_epoch;
diff --git a/crates/xtask/src/tests/window_icon_test.rs b/crates/xtask/src/tests/window_icon_test.rs
new file mode 100644
index 0000000000..3520e79f11
--- /dev/null
+++ b/crates/xtask/src/tests/window_icon_test.rs
@@ -0,0 +1,58 @@
+use super::*;
+
+/// Which pixel sizes the PNG at PATH declares, from its IHDR chunk.
+fn png_dimensions(path: &Path) -> (u32, u32) {
+    let bytes = fs::read(path).expect("rendered PNG");
+    assert_eq!(
+        &bytes[..8],
+        b"\x89PNG\r\n\x1a\n",
+        "{}: PNG magic",
+        path.display()
+    );
+    assert_eq!(&bytes[12..16], b"IHDR", "{}: IHDR first", path.display());
+    (
+        u32::from_be_bytes(bytes[16..20].try_into().expect("width bytes")),
+        u32::from_be_bytes(bytes[20..24].try_into().expect("height bytes")),
+    )
+}
+
+#[test]
+fn render_window_icon_writes_the_exact_macos_icon_family() {
+    let repo_root = crate::repository_root();
+    let out_dir = tempfile::tempdir().expect("tempdir for iconset");
+    render_iconset(&repo_root.join(CANONICAL_ICON), out_dir.path()).expect("render iconset");
+
+    for &(name, size) in ICONSET {
+        let path = out_dir.path().join(name);
+        assert!(path.is_file(), "{name} must be written");
+        assert_eq!(
+            png_dimensions(&path),
+            (size, size),
+            "{name} must be {size}x{size}"
+        );
+    }
+
+    // `iconutil` rejects an iconset with extra entries, so the family is
+    // exactly the table above.
+    let entries: Vec<String> = fs::read_dir(out_dir.path())
+        .expect("read iconset")
+        .map(|entry| {
+            entry
+                .expect("dir entry")
+                .file_name()
+                .to_string_lossy()
+                .into_owned()
+        })
+        .collect();
+    assert_eq!(entries.len(), ICONSET.len());
+}
+
+#[test]
+fn render_window_icon_refuses_arguments_it_does_not_understand() {
+    let repo_root = crate::repository_root();
+    let error = run(&repo_root, [std::ffi::OsString::from("--nope")])
+        .expect_err("unknown argument must be refused");
+    assert!(error.to_string().contains("--nope"), "{error}");
+    let error = run(&repo_root, std::iter::empty()).expect_err("missing --out-dir must be refused");
+    assert!(error.to_string().contains("--out-dir"), "{error}");
+}
diff --git a/crates/xtask/src/window_icon.rs b/crates/xtask/src/window_icon.rs
index abf8ef2abf..4e2019e8ac 100644
--- a/crates/xtask/src/window_icon.rs
+++ b/crates/xtask/src/window_icon.rs
@@ -96,64 +96,5 @@ fn render_png(tree: &resvg::usvg::Tree, size: u32, out: &Path) -> Result<()> {
 }
 
 #[cfg(test)]
-mod tests {
-    use super::*;
-
-    /// Which pixel sizes the PNG at PATH declares, from its IHDR chunk.
-    fn png_dimensions(path: &Path) -> (u32, u32) {
-        let bytes = fs::read(path).expect("rendered PNG");
-        assert_eq!(
-            &bytes[..8],
-            b"\x89PNG\r\n\x1a\n",
-            "{}: PNG magic",
-            path.display()
-        );
-        assert_eq!(&bytes[12..16], b"IHDR", "{}: IHDR first", path.display());
-        (
-            u32::from_be_bytes(bytes[16..20].try_into().expect("width bytes")),
-            u32::from_be_bytes(bytes[20..24].try_into().expect("height bytes")),
-        )
-    }
-
-    #[test]
-    fn render_window_icon_writes_the_exact_macos_icon_family() {
-        let repo_root = crate::repository_root();
-        let out_dir = tempfile::tempdir().expect("tempdir for iconset");
-        render_iconset(&repo_root.join(CANONICAL_ICON), out_dir.path()).expect("render iconset");
-
-        for &(name, size) in ICONSET {
-            let path = out_dir.path().join(name);
-            assert!(path.is_file(), "{name} must be written");
-            assert_eq!(
-                png_dimensions(&path),
-                (size, size),
-                "{name} must be {size}x{size}"
-            );
-        }
-
-        // `iconutil` rejects an iconset with extra entries, so the family is
-        // exactly the table above.
-        let entries: Vec<String> = fs::read_dir(out_dir.path())
-            .expect("read iconset")
-            .map(|entry| {
-                entry
-                    .expect("dir entry")
-                    .file_name()
-                    .to_string_lossy()
-                    .into_owned()
-            })
-            .collect();
-        assert_eq!(entries.len(), ICONSET.len());
-    }
-
-    #[test]
-    fn render_window_icon_refuses_arguments_it_does_not_understand() {
-        let repo_root = crate::repository_root();
-        let error = run(&repo_root, [std::ffi::OsString::from("--nope")])
-            .expect_err("unknown argument must be refused");
-        assert!(error.to_string().contains("--nope"), "{error}");
-        let error =
-            run(&repo_root, std::iter::empty()).expect_err("missing --out-dir must be refused");
-        assert!(error.to_string().contains("--out-dir"), "{error}");
-    }
-}
+#[path = "tests/window_icon_test.rs"]
+mod tests;