diff --git a/crates/adapters/image-converter/src/backfill.rs b/crates/adapters/image-converter/src/backfill.rs
index 1a814942..49ec08c5 100644
--- a/crates/adapters/image-converter/src/backfill.rs
+++ b/crates/adapters/image-converter/src/backfill.rs
@@ -49,7 +49,3 @@ impl PeriodicJob for ConversionBackfillJob {
         Ok(())
     }
 }
-
-#[cfg(test)]
-#[path = "tests/backfill.rs"]
-mod tests;
diff --git a/crates/adapters/image-converter/src/config.rs b/crates/adapters/image-converter/src/config.rs
index 2bf3934a..8241ff9a 100644
--- a/crates/adapters/image-converter/src/config.rs
+++ b/crates/adapters/image-converter/src/config.rs
@@ -37,7 +37,3 @@ impl ConversionConfig {
         Ok(Some(Self { format }))
     }
 }
-
-#[cfg(test)]
-#[path = "tests/config.rs"]
-mod tests;
diff --git a/crates/adapters/image-converter/src/handler.rs b/crates/adapters/image-converter/src/handler.rs
index cba99581..e0ae7b14 100644
--- a/crates/adapters/image-converter/src/handler.rs
+++ b/crates/adapters/image-converter/src/handler.rs
@@ -99,7 +99,3 @@ fn convert(bytes: Vec<u8>, format: Format) -> Result<Vec<u8>, String> {
         }
     }
 }
-
-#[cfg(test)]
-#[path = "tests/handler.rs"]
-mod tests;
diff --git a/crates/adapters/image-converter/src/tests/backfill.rs b/crates/adapters/image-converter/tests/backfill_job_test.rs
similarity index 91%
rename from crates/adapters/image-converter/src/tests/backfill.rs
rename to crates/adapters/image-converter/tests/backfill_job_test.rs
index 7b0a35ae..f4f152ff 100644
--- a/crates/adapters/image-converter/src/tests/backfill.rs
+++ b/crates/adapters/image-converter/tests/backfill_job_test.rs
@@ -1,5 +1,11 @@
-use super::*;
-use std::sync::Mutex;
+use std::sync::{Arc, Mutex};
+
+use domain::{
+    errors::DomainError,
+    events::DomainEvent,
+    ports::{EventPublisher, ImageRefQuery, PeriodicJob},
+};
+use image_converter::ConversionBackfillJob;
 
 struct MockImageRef {
     keys: Vec<String>,
diff --git a/crates/adapters/image-converter/src/tests/config.rs b/crates/adapters/image-converter/tests/conversion_config_test.rs
similarity index 62%
rename from crates/adapters/image-converter/src/tests/config.rs
rename to crates/adapters/image-converter/tests/conversion_config_test.rs
index 63a302c3..bf4022ad 100644
--- a/crates/adapters/image-converter/src/tests/config.rs
+++ b/crates/adapters/image-converter/tests/conversion_config_test.rs
@@ -1,7 +1,7 @@
-use super::*;
+use image_converter::{ConversionConfig, Format};
 
-fn section(enabled: bool, format: Option<&str>) -> ::config::ImageConversionConfig {
-    ::config::ImageConversionConfig {
+fn section(enabled: bool, format: Option<&str>) -> config::ImageConversionConfig {
+    config::ImageConversionConfig {
         enabled,
         format: format.map(str::to_owned),
     }
@@ -12,9 +12,9 @@ fn convert(enabled: bool, format: Option<&str>) -> anyhow::Result<Option<Convers
 }
 
 #[test]
-fn disabled_by_default() {
+fn is_disabled_by_default() {
     assert!(
-        ConversionConfig::from_config(&::config::ImageConversionConfig::default())
+        ConversionConfig::from_config(&config::ImageConversionConfig::default())
             .unwrap()
             .is_none()
     );
@@ -22,33 +22,33 @@ fn disabled_by_default() {
 }
 
 #[test]
-fn enabled_avif() {
+fn enabled_with_avif_format() {
     let cfg = convert(true, Some("avif")).unwrap().unwrap();
     assert_eq!(cfg.format, Format::Avif);
 }
 
 #[test]
-fn enabled_webp() {
+fn enabled_with_webp_format() {
     let cfg = convert(true, Some("webp")).unwrap().unwrap();
     assert_eq!(cfg.format, Format::Webp);
 }
 
 #[test]
-fn unknown_format_is_error() {
+fn unknown_format_is_rejected() {
     assert!(convert(true, Some("gif")).is_err());
 }
 
 #[test]
-fn missing_format_when_enabled_is_error() {
+fn missing_format_when_enabled_is_rejected() {
     assert!(convert(true, None).is_err());
 }
 
 #[test]
-fn avif_extension() {
+fn avif_extension_is_dot_avif() {
     assert_eq!(Format::Avif.extension(), ".avif");
 }
 
 #[test]
-fn webp_extension() {
+fn webp_extension_is_dot_webp() {
     assert_eq!(Format::Webp.extension(), ".webp");
 }
diff --git a/crates/adapters/image-converter/src/tests/handler.rs b/crates/adapters/image-converter/tests/conversion_handler_test.rs
similarity index 95%
rename from crates/adapters/image-converter/src/tests/handler.rs
rename to crates/adapters/image-converter/tests/conversion_handler_test.rs
index 033a929b..b47648a3 100644
--- a/crates/adapters/image-converter/src/tests/handler.rs
+++ b/crates/adapters/image-converter/tests/conversion_handler_test.rs
@@ -1,7 +1,13 @@
-use super::*;
+use std::sync::{Arc, Mutex};
+
+use domain::{
+    errors::DomainError,
+    events::DomainEvent,
+    ports::{EventHandler, ImageRefCommand, ObjectStorage},
+};
+use image_converter::{Format, ImageConversionHandler};
 use object_storage::ObjectStorageAdapter;
 use object_store::memory::InMemory;
-use std::sync::Mutex;
 
 struct MockImageRef {
     swaps: Mutex<Vec<(String, String)>>,
diff --git a/crates/adapters/importer/src/tests/mapper.rs b/crates/adapters/importer/tests/mapping_test.rs
similarity index 100%
rename from crates/adapters/importer/src/tests/mapper.rs
rename to crates/adapters/importer/tests/mapping_test.rs
diff --git a/crates/adapters/importer/src/parsers/tests.rs b/crates/adapters/importer/tests/parsing_test.rs
similarity index 100%
rename from crates/adapters/importer/src/parsers/tests.rs
rename to crates/adapters/importer/tests/parsing_test.rs