diff --git a/src/irc/command.rs b/src/irc/command.rs
index 086d41d..629debf 100644
--- a/src/irc/command.rs
+++ b/src/irc/command.rs
@@ -271,32 +271,3 @@ impl CommandHandler {
         Some(server.get_user_nick(source_ip))
     }
 }
-
-#[cfg(test)]
-mod command_tests {
-    use super::*;
-    use std::net::{IpAddr, Ipv4Addr};
-
-    struct MockServer {
-
-    }
-
-    pub fn setup(raw_message: &str) -> CommandHandler {
-        CommandHandler::new(raw_message)
-    }
-
-    #[test]
-    fn test_execute_command_new_nickname() {
-        let raw_message = "NICK Wiz";
-        let client_ip = SocketAddr::new(IpAddr::V4(Ipv4Addr::new(127, 0, 0, 1)), 1234);
-        let mut server = IrcServer::new();
-        let mut stream: TcpStream;
-
-        let command_handler = setup(raw_message);
-        // command_handler.execute(&mut stream, &mut server, client_ip);
-    }
-    fn test_execute_command_change_nickname() {
-        let raw_message = ":WiZ NICK Kilroy";
-        let command_handler = setup(raw_message);
-    }
-}
diff --git a/tests/command.rs b/tests/command.rs
deleted file mode 100644
index 8c474cc..0000000
--- a/tests/command.rs
+++ /dev/null
@@ -1,2 +0,0 @@
-#[cfg(test)]
-mod command_tests {}
diff --git a/tests/server.rs b/tests/server.rs
deleted file mode 100644
index 759a821..0000000
--- a/tests/server.rs
+++ /dev/null
@@ -1,2 +0,0 @@
-#[cfg(test)]
-mod server_tests {}
diff --git a/tests/test_command.rs b/tests/test_command.rs
new file mode 100644
index 0000000..e0f3007
--- /dev/null
+++ b/tests/test_command.rs
@@ -0,0 +1,35 @@
+#[cfg(test)]
+mod command_tests {
+    use std::net::{SocketAddr, IpAddr, Ipv4Addr, TcpStream};
+    use irc_server::irc::command::CommandHandler;
+    use irc_server::irc::server::{Server, IrcServer};
+
+    struct MockServer {
+
+    }
+
+    pub fn setup(raw_message: &str) -> CommandHandler {
+        CommandHandler::new(raw_message)
+    }
+
+    #[test]
+    fn test_execute_command_new_nickname() {
+        let raw_message = "NICK Wiz";
+        let client_ip = SocketAddr::new(IpAddr::V4(Ipv4Addr::new(127, 0, 0, 1)), 1234);
+        let mut server = IrcServer::new();
+        let mut stream: TcpStream;
+
+        let command_handler = setup(raw_message);
+        // command_handler.execute(&mut stream, &mut server, client_ip);
+    }
+
+    #[test]
+    fn test_execute_command_change_nickname() {
+        let raw_message = ":WiZ NICK Kilroy";
+        let client_ip = SocketAddr::new(IpAddr::V4(Ipv4Addr::new(127, 0, 0, 1)), 1234);
+        let mut server = IrcServer::new();
+        let mut stream: TcpStream;
+
+        let command_handler = setup(raw_message);
+    }
+}
diff --git a/tests/test_server.rs b/tests/test_server.rs
new file mode 100644
index 0000000..e69de29