diff --git a/module-system/module-implementations/module-template/src/lib.rs b/module-system/module-implementations/module-template/src/lib.rs
index ede00b279..ee7a65b62 100644
--- a/module-system/module-implementations/module-template/src/lib.rs
+++ b/module-system/module-implementations/module-template/src/lib.rs
@@ -1,9 +1,5 @@
 mod call;
 mod genesis;
-
-#[cfg(test)]
-mod tests;
-
 #[cfg(feature = "native")]
 mod query;
 
diff --git a/module-system/module-implementations/module-template/src/tests.rs b/module-system/module-implementations/module-template/tests/value_setter.rs
similarity index 91%
rename from module-system/module-implementations/module-template/src/tests.rs
rename to module-system/module-implementations/module-template/tests/value_setter.rs
index ac5a16d22..2fa857b78 100644
--- a/module-system/module-implementations/module-template/src/tests.rs
+++ b/module-system/module-implementations/module-template/tests/value_setter.rs
@@ -1,11 +1,9 @@
+use module_template::{CallMessage, ExampleModule, ExampleModuleConfig, Response};
 use sov_modules_api::default_context::{DefaultContext, ZkDefaultContext};
 use sov_modules_api::{Address, Context, Module};
 use sov_rollup_interface::stf::Event;
 use sov_state::{ProverStorage, WorkingSet, ZkStorage};
 
-use super::ExampleModule;
-use crate::{call, query, ExampleModuleConfig};
-
 #[test]
 fn test_value_setter() {
     let tmpdir = tempfile::tempdir().unwrap();
@@ -39,7 +37,7 @@ fn test_value_setter_helper<C: Context>(
     module.genesis(config, working_set).unwrap();
 
     let new_value = 99;
-    let call_msg = call::CallMessage::SetValue(new_value);
+    let call_msg = CallMessage::SetValue(new_value);
 
     // Test events
     {
@@ -52,7 +50,7 @@ fn test_value_setter_helper<C: Context>(
     {
         let query_response = module.query_value(working_set);
         assert_eq!(
-            query::Response {
+            Response {
                 value: Some(new_value)
             },
             query_response