diff --git a/Cargo.lock b/Cargo.lock
index d9f2f76..2b6f9c7 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -507,6 +507,12 @@ dependencies = [
  "syn",
 ]
 
+[[package]]
+name = "dotenv"
+version = "0.15.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "77c90badedccf4105eca100756a0b1289e191f6fcbdadd3cee1d2f614f97da8f"
+
 [[package]]
 name = "dotenvy"
 version = "0.15.7"
@@ -1884,6 +1890,7 @@ version = "0.1.0"
 dependencies = [
  "chrono",
  "common",
+ "dotenv",
  "dotenvy",
  "prost",
  "serde",
diff --git a/server/src/adresar/mod.rs b/server/src/adresar/mod.rs
index def9506..22ac60a 100644
--- a/server/src/adresar/mod.rs
+++ b/server/src/adresar/mod.rs
@@ -3,5 +3,5 @@
 pub mod models;
 pub mod handlers;
 
-#[cfg(test)]
-pub mod tests;
+// #[cfg(test)]
+// pub mod tests;
diff --git a/server/tests/adresar/mod.rs b/server/tests/adresar/mod.rs
new file mode 100644
index 0000000..a9f2c08
--- /dev/null
+++ b/server/tests/adresar/mod.rs
@@ -0,0 +1,4 @@
+// server/tests/adresar/mod.rs
+
+pub mod post_adresar_test;
+pub mod put_adresar_test;
diff --git a/server/tests/adresar/post_adresar_test.rs b/server/tests/adresar/post_adresar_test.rs
index 75df06c..c4995b3 100644
--- a/server/tests/adresar/post_adresar_test.rs
+++ b/server/tests/adresar/post_adresar_test.rs
@@ -1,5 +1,5 @@
 // src/adresar/tests/post_adresar_test.rs
-use super::super::handlers::post_adresar;
+use server::adresar::handlers::post_adresar;
 use common::proto::multieko2::adresar::PostAdresarRequest;
 use sqlx::{postgres::PgPoolOptions, PgPool};
 use std::env;
diff --git a/server/tests/adresar/put_adresar_test.rs b/server/tests/adresar/put_adresar_test.rs
index 4bf9ea4..fa0042d 100644
--- a/server/tests/adresar/put_adresar_test.rs
+++ b/server/tests/adresar/put_adresar_test.rs
@@ -1,5 +1,5 @@
 // src/adresar/tests/put_adresar_test.rs
-use super::super::handlers::put_adresar;
+use server::adresar::handlers::put_adresar;
 use common::proto::multieko2::adresar::{AdresarResponse, PutAdresarRequest};
 use sqlx::{postgres::PgPoolOptions, PgPool};
 use std::env;
diff --git a/server/tests/mod.rs b/server/tests/mod.rs
new file mode 100644
index 0000000..47c87d3
--- /dev/null
+++ b/server/tests/mod.rs
@@ -0,0 +1,2 @@
+pub mod adresar;
+pub mod common;