diff --git a/tests/agents/test_agent_runner.py b/tests/agents/test_agent_runner.py
index b09fdc68..0ec851b5 100644
--- a/tests/agents/test_agent_runner.py
+++ b/tests/agents/test_agent_runner.py
@@ -26,8 +26,8 @@ from cai.sdk.agents import (
 from cai.sdk.agents.agent import ToolsToFinalOutputResult
 from cai.sdk.agents.tool import FunctionToolResult, function_tool
 
-from .fake_model import FakeModel
-from .test_responses import (
+from tests.fake_model import FakeModel
+from tests.test_responses import (
     get_final_output_message,
     get_function_tool,
     get_function_tool_call,
diff --git a/tests/agents/test_agent_runner_streamed.py b/tests/agents/test_agent_runner_streamed.py
index 8d84126b..9bca3957 100644
--- a/tests/agents/test_agent_runner_streamed.py
+++ b/tests/agents/test_agent_runner_streamed.py
@@ -24,8 +24,8 @@ from cai.sdk.agents.items import RunItem
 from cai.sdk.agents.run import RunConfig
 from cai.sdk.agents.stream_events import AgentUpdatedStreamEvent
 
-from .fake_model import FakeModel
-from .test_responses import (
+from tests.fake_model import FakeModel
+from tests.test_responses import (
     get_final_output_message,
     get_function_tool,
     get_function_tool_call,
diff --git a/tests/test_output_tool.py b/tests/tools/test_output_tool.py
similarity index 100%
rename from tests/test_output_tool.py
rename to tests/tools/test_output_tool.py
diff --git a/tests/tools/test_tool_generic_linux_command.py b/tests/tools/test_tool_generic_linux_command.py
new file mode 100644
index 00000000..8b6b3209
--- /dev/null
+++ b/tests/tools/test_tool_generic_linux_command.py
@@ -0,0 +1,18 @@
+import pytest
+import json
+import asyncio
+from unittest.mock import MagicMock
+from unittest.mock import patch
+from cai.tools.reconnaissance.generic_linux_command import generic_linux_command  
+
+
+async def test_generic_linux_command_regular_commands():
+    mock_ctx = MagicMock()  
+    params = {
+        "command": "echo",
+        "args": "'hello'"
+    }
+
+    result = await generic_linux_command.on_invoke_tool(mock_ctx, json.dumps(params))
+
+    assert result.replace("\n", "") == 'hello'  
diff --git a/tests/agents/test_agent_tracing.py b/tests/tracing/test_agent_tracing.py
similarity index 100%
rename from tests/agents/test_agent_tracing.py
rename to tests/tracing/test_agent_tracing.py