diff --git a/crates/adapters/event-publisher/src/lib.rs b/crates/adapters/event-publisher/src/lib.rs
index aec30ee4..64ba21d2 100644
--- a/crates/adapters/event-publisher/src/lib.rs
+++ b/crates/adapters/event-publisher/src/lib.rs
@@ -84,7 +84,3 @@ pub fn create_event_channel(
         },
     )
 }
-
-#[cfg(test)]
-#[path = "tests/lib.rs"]
-mod tests;
diff --git a/crates/adapters/event-publisher/src/tests/lib.rs b/crates/adapters/event-publisher/tests/event_channel_test.rs
similarity index 93%
rename from crates/adapters/event-publisher/src/tests/lib.rs
rename to crates/adapters/event-publisher/tests/event_channel_test.rs
index 922a95a1..4824d1dc 100644
--- a/crates/adapters/event-publisher/src/tests/lib.rs
+++ b/crates/adapters/event-publisher/tests/event_channel_test.rs
@@ -1,8 +1,9 @@
-use super::*;
+use domain::ports::{EventConsumer, EventPublisher};
 use domain::{
     events::DomainEvent,
     value_objects::{ExternalMetadataId, MovieId},
 };
+use event_publisher::{EventPublisherConfig, create_event_channel};
 use futures::StreamExt;
 
 fn movie_discovered() -> DomainEvent {
diff --git a/crates/adapters/export/src/lib.rs b/crates/adapters/export/src/lib.rs
index 44f4e62e..fb3b1bcd 100644
--- a/crates/adapters/export/src/lib.rs
+++ b/crates/adapters/export/src/lib.rs
@@ -107,7 +107,3 @@ fn entry_to_json(e: &DiaryEntry) -> serde_json::Value {
         "spoilers": e.review().spoilers(),
     })
 }
-
-#[cfg(test)]
-#[path = "tests/lib.rs"]
-mod tests;
diff --git a/crates/adapters/export/src/tests/lib.rs b/crates/adapters/export/tests/export_adapter_test.rs
similarity index 99%
rename from crates/adapters/export/src/tests/lib.rs
rename to crates/adapters/export/tests/export_adapter_test.rs
index 674dd7e8..46655597 100644
--- a/crates/adapters/export/src/tests/lib.rs
+++ b/crates/adapters/export/tests/export_adapter_test.rs
@@ -1,4 +1,3 @@
-use super::ExportAdapter;
 use domain::{
     models::{DiaryEntry, ExportFormat, Movie, ReviewEdit},
     ports::DiaryExporter,
@@ -7,6 +6,7 @@ use domain::{
     },
     value_objects::{Comment, ExternalMetadataId, UserId},
 };
+use export::ExportAdapter;
 
 async fn collect_stream(
     stream: futures::stream::BoxStream<'static, Result<bytes::Bytes, domain::errors::DomainError>>,
diff --git a/crates/adapters/media-server/src/jellyfin.rs b/crates/adapters/media-server/src/jellyfin.rs
index aaa565d8..a139ae4a 100644
--- a/crates/adapters/media-server/src/jellyfin.rs
+++ b/crates/adapters/media-server/src/jellyfin.rs
@@ -58,7 +58,3 @@ struct JellyfinPayload {
     #[serde(rename = "Provider_imdb")]
     provider_imdb: Option<String>,
 }
-
-#[cfg(test)]
-#[path = "tests/jellyfin.rs"]
-mod tests;
diff --git a/crates/adapters/media-server/src/plex.rs b/crates/adapters/media-server/src/plex.rs
index 16187867..4b59b76b 100644
--- a/crates/adapters/media-server/src/plex.rs
+++ b/crates/adapters/media-server/src/plex.rs
@@ -68,7 +68,3 @@ struct PlexMetadata {
 struct PlexGuid {
     id: String,
 }
-
-#[cfg(test)]
-#[path = "tests/plex.rs"]
-mod tests;
diff --git a/crates/adapters/media-server/src/tests/jellyfin.rs b/crates/adapters/media-server/tests/jellyfin_parser_test.rs
similarity index 96%
rename from crates/adapters/media-server/src/tests/jellyfin.rs
rename to crates/adapters/media-server/tests/jellyfin_parser_test.rs
index 9511eb78..b02c1213 100644
--- a/crates/adapters/media-server/src/tests/jellyfin.rs
+++ b/crates/adapters/media-server/tests/jellyfin_parser_test.rs
@@ -1,4 +1,5 @@
-use super::*;
+use domain::ports::MediaServerParser;
+use media_server::JellyfinParser;
 
 #[test]
 fn parses_valid_playback_stop() {
diff --git a/crates/adapters/media-server/src/tests/plex.rs b/crates/adapters/media-server/tests/plex_parser_test.rs
similarity index 97%
rename from crates/adapters/media-server/src/tests/plex.rs
rename to crates/adapters/media-server/tests/plex_parser_test.rs
index 2459f256..ae90056f 100644
--- a/crates/adapters/media-server/src/tests/plex.rs
+++ b/crates/adapters/media-server/tests/plex_parser_test.rs
@@ -1,4 +1,5 @@
-use super::*;
+use domain::ports::MediaServerParser;
+use media_server::PlexParser;
 
 #[test]
 fn parses_movie_scrobble() {
diff --git a/crates/adapters/nats/src/config.rs b/crates/adapters/nats/src/config.rs
index d7ed4381..34003cac 100644
--- a/crates/adapters/nats/src/config.rs
+++ b/crates/adapters/nats/src/config.rs
@@ -35,7 +35,3 @@ impl NatsConfig {
         })
     }
 }
-
-#[cfg(test)]
-#[path = "tests/config.rs"]
-mod tests;
diff --git a/crates/adapters/nats/src/tests/config.rs b/crates/adapters/nats/tests/nats_config_test.rs
similarity index 77%
rename from crates/adapters/nats/src/tests/config.rs
rename to crates/adapters/nats/tests/nats_config_test.rs
index 8d749d06..505672af 100644
--- a/crates/adapters/nats/src/tests/config.rs
+++ b/crates/adapters/nats/tests/nats_config_test.rs
@@ -1,7 +1,7 @@
-use super::*;
+use nats::{NatsConfig, NatsMode};
 
-fn section(url: Option<&str>, mode: &str) -> ::config::NatsConfig {
-    ::config::NatsConfig {
+fn section(url: Option<&str>, mode: &str) -> config::NatsConfig {
+    config::NatsConfig {
         url: url.map(str::to_owned),
         mode: mode.into(),
         ..Default::default()
@@ -10,12 +10,12 @@ fn section(url: Option<&str>, mode: &str) -> ::config::NatsConfig {
 
 #[test]
 fn errors_without_nats_url() {
-    assert!(NatsConfig::from_config(&::config::NatsConfig::default()).is_err());
+    assert!(NatsConfig::from_config(&config::NatsConfig::default()).is_err());
 }
 
 #[test]
 fn defaults_with_only_url() {
-    let cfg = NatsConfig::from_config(&::config::NatsConfig {
+    let cfg = NatsConfig::from_config(&config::NatsConfig {
         url: Some("nats://localhost:4222".into()),
         ..Default::default()
     })
diff --git a/crates/adapters/object-storage/src/config.rs b/crates/adapters/object-storage/src/config.rs
index a6f66855..053d57a2 100644
--- a/crates/adapters/object-storage/src/config.rs
+++ b/crates/adapters/object-storage/src/config.rs
@@ -62,7 +62,3 @@ fn build_local_store(path: &str) -> anyhow::Result<Arc<dyn ObjectStore>> {
         .context("Failed to initialise local file system store")?;
     Ok(Arc::new(store))
 }
-
-#[cfg(test)]
-#[path = "tests/config.rs"]
-mod tests;
diff --git a/crates/adapters/object-storage/src/lib.rs b/crates/adapters/object-storage/src/lib.rs
index f66c339a..a1144e57 100644
--- a/crates/adapters/object-storage/src/lib.rs
+++ b/crates/adapters/object-storage/src/lib.rs
@@ -132,7 +132,3 @@ pub fn create(config: &::config::StorageConfig) -> anyhow::Result<Arc<dyn Object
         StorageConfig::from_config(config)?,
     )))
 }
-
-#[cfg(test)]
-#[path = "tests/lib.rs"]
-mod tests;
diff --git a/crates/adapters/object-storage/src/tests/lib.rs b/crates/adapters/object-storage/tests/object_storage_adapter_test.rs
similarity index 91%
rename from crates/adapters/object-storage/src/tests/lib.rs
rename to crates/adapters/object-storage/tests/object_storage_adapter_test.rs
index 6c34fe11..44e79273 100644
--- a/crates/adapters/object-storage/src/tests/lib.rs
+++ b/crates/adapters/object-storage/tests/object_storage_adapter_test.rs
@@ -1,4 +1,10 @@
-use super::*;
+use std::sync::Arc;
+
+use domain::{
+    errors::DomainError,
+    ports::{EventHandler, ObjectStorage},
+};
+use object_storage::{ImageCleanupHandler, ObjectStorageAdapter};
 use object_store::memory::InMemory;
 
 fn adapter() -> ObjectStorageAdapter {
diff --git a/crates/adapters/object-storage/src/tests/config.rs b/crates/adapters/object-storage/tests/storage_config_test.rs
similarity index 66%
rename from crates/adapters/object-storage/src/tests/config.rs
rename to crates/adapters/object-storage/tests/storage_config_test.rs
index 26fcd862..34450003 100644
--- a/crates/adapters/object-storage/src/tests/config.rs
+++ b/crates/adapters/object-storage/tests/storage_config_test.rs
@@ -1,9 +1,17 @@
-use super::*;
+use object_storage::StorageConfig;
+
+fn local_section(dir: &std::path::Path) -> config::StorageConfig {
+    config::StorageConfig {
+        backend: "local".into(),
+        path: dir.to_str().unwrap().into(),
+        ..Default::default()
+    }
+}
 
 #[test]
 fn local_store_creates_dir_and_succeeds() {
     let dir = std::env::temp_dir().join(format!("image_test_{}", uuid::Uuid::new_v4()));
-    let result = build_local_store(dir.to_str().unwrap());
+    let result = StorageConfig::from_config(&local_section(&dir));
     assert!(result.is_ok(), "expected Ok, got: {:?}", result.err());
     assert!(dir.exists(), "directory should have been created");
 }
@@ -12,13 +20,13 @@ fn local_store_creates_dir_and_succeeds() {
 fn local_store_succeeds_if_dir_already_exists() {
     let dir = std::env::temp_dir().join(format!("image_test_{}", uuid::Uuid::new_v4()));
     std::fs::create_dir_all(&dir).unwrap();
-    let result = build_local_store(dir.to_str().unwrap());
+    let result = StorageConfig::from_config(&local_section(&dir));
     assert!(result.is_ok());
 }
 
 #[test]
 fn s3_backend_requires_endpoint() {
-    let section = ::config::StorageConfig {
+    let section = config::StorageConfig {
         backend: "s3".into(),
         ..Default::default()
     };
@@ -28,7 +36,7 @@ fn s3_backend_requires_endpoint() {
 
 #[test]
 fn unknown_backend_is_error() {
-    let section = ::config::StorageConfig {
+    let section = config::StorageConfig {
         backend: "ftp".into(),
         ..Default::default()
     };
diff --git a/crates/adapters/rss/src/lib.rs b/crates/adapters/rss/src/lib.rs
index 87057c4e..f873f22d 100644
--- a/crates/adapters/rss/src/lib.rs
+++ b/crates/adapters/rss/src/lib.rs
@@ -88,7 +88,3 @@ impl RssFeedRenderer for RssAdapter {
         Ok(channel.to_string())
     }
 }
-
-#[cfg(test)]
-#[path = "tests/lib.rs"]
-mod tests;
diff --git a/crates/adapters/rss/src/tests/lib.rs b/crates/adapters/rss/tests/rss_adapter_test.rs
similarity index 95%
rename from crates/adapters/rss/src/tests/lib.rs
rename to crates/adapters/rss/tests/rss_adapter_test.rs
index 7f567f55..511b19c9 100644
--- a/crates/adapters/rss/src/tests/lib.rs
+++ b/crates/adapters/rss/tests/rss_adapter_test.rs
@@ -1,7 +1,9 @@
-use super::*;
+use domain::models::DiaryEntry;
 use domain::models::ReviewEdit;
+use domain::ports::{FeedChannel, RssFeedRenderer};
 use domain::testing::{test_movie_with_year, test_review};
 use domain::value_objects::{Comment, UserId};
+use rss::RssAdapter;
 
 fn channel<'a>(title: &'a str) -> FeedChannel<'a> {
     FeedChannel {