diff --git a/src/maps.rs b/src/maps.rs
index 494f842..b7c24ef 100644
--- a/src/maps.rs
+++ b/src/maps.rs
@@ -120,37 +120,3 @@ impl<E: Copy, T: Clone> IndexMut<E> for EntityMap<E, T> {
         &mut self.data[i]
     }
 }
-
-#[cfg(test)]
-mod append_graph_vertex_map_tests {
-    use crate::models::append_graph::AppendGraph;
-    use crate::traits::GraphTopology;
-
-    crate::vertex_map_tests!(AppendGraph);
-}
-
-#[cfg(test)]
-mod append_graph_edge_map_tests {
-    use crate::models::append_graph::AppendGraph;
-    use crate::traits::GraphTopology;
-
-    crate::edge_map_tests!(AppendGraph);
-}
-
-#[cfg(test)]
-mod graph_vertex_map_tests {
-    use crate::models::graph::Graph;
-    use crate::traits::{GraphTopology, GraphTopologyDeletion};
-
-    crate::vertex_map_tests!(Graph);
-    crate::vertex_map_deletion_tests!(Graph);
-}
-
-#[cfg(test)]
-mod graph_edge_map_tests {
-    use crate::models::graph::Graph;
-    use crate::traits::{GraphTopology, GraphTopologyDeletion};
-
-    crate::edge_map_tests!(Graph);
-    crate::edge_map_deletion_tests!(Graph);
-}
diff --git a/src/testing/maps_testing.rs b/src/testing/maps_testing.rs
index 5c91259..5aad6f9 100644
--- a/src/testing/maps_testing.rs
+++ b/src/testing/maps_testing.rs
@@ -1,4 +1,3 @@
-#[cfg(test)]
 #[macro_export]
 macro_rules! vertex_map_tests {
     ($T:ty) => {
@@ -73,7 +72,6 @@ macro_rules! vertex_map_tests {
     };
 }
 
-#[cfg(test)]
 #[macro_export]
 macro_rules! vertex_map_deletion_tests {
     ($T:ty) => {
@@ -120,7 +118,6 @@ macro_rules! vertex_map_deletion_tests {
     };
 }
 
-#[cfg(test)]
 #[macro_export]
 macro_rules! edge_map_tests {
     ($T:ty) => {
@@ -207,7 +204,6 @@ macro_rules! edge_map_tests {
     };
 }
 
-#[cfg(test)]
 #[macro_export]
 macro_rules! edge_map_deletion_tests {
     ($T:ty) => {
diff --git a/tests/maps.rs b/tests/maps.rs
new file mode 100644
index 0000000..c242a77
--- /dev/null
+++ b/tests/maps.rs
@@ -0,0 +1,29 @@
+mod append_graph_vertex_map_tests {
+    use grapherity::models::append_graph::AppendGraph;
+    use grapherity::traits::GraphTopology;
+
+    grapherity::vertex_map_tests!(AppendGraph);
+}
+
+mod append_graph_edge_map_tests {
+    use grapherity::models::append_graph::AppendGraph;
+    use grapherity::traits::GraphTopology;
+
+    grapherity::edge_map_tests!(AppendGraph);
+}
+
+mod graph_vertex_map_tests {
+    use grapherity::models::graph::Graph;
+    use grapherity::traits::{GraphTopology, GraphTopologyDeletion};
+
+    grapherity::vertex_map_tests!(Graph);
+    grapherity::vertex_map_deletion_tests!(Graph);
+}
+
+mod graph_edge_map_tests {
+    use grapherity::models::graph::Graph;
+    use grapherity::traits::{GraphTopology, GraphTopologyDeletion};
+
+    grapherity::edge_map_tests!(Graph);
+    grapherity::edge_map_deletion_tests!(Graph);
+}