diff --git a/comfy/app/frontend_management.py b/comfy/app/frontend_management.py
index 34c4e95f1..f43a26ec1 100644
--- a/comfy/app/frontend_management.py
+++ b/comfy/app/frontend_management.py
@@ -1,21 +1,20 @@
 from __future__ import annotations
 
 import argparse
+import importlib.metadata
 import importlib.resources
 import logging
 import os
 import re
 import tempfile
 import zipfile
-import importlib.metadata
 from dataclasses import dataclass
 from functools import cached_property
 from pathlib import Path
 from typing import Dict, TypedDict, Optional
-from aiohttp import web
-from importlib.metadata import version
 
 import requests
+from aiohttp import web
 from typing_extensions import NotRequired
 
 from ..cli_args import DEFAULT_VERSION_STRING
diff --git a/tests/inference/test_workflows.py b/tests/inference/test_workflows.py
index 5bd1e352c..bf9430aaa 100644
--- a/tests/inference/test_workflows.py
+++ b/tests/inference/test_workflows.py
@@ -2,6 +2,7 @@ import importlib.resources
 import json
 import logging
 from importlib.abc import Traversable
+from typing import Any, AsyncGenerator
 
 import pytest
 
@@ -16,7 +17,7 @@ logger = logging.getLogger(__name__)
 
 
 @pytest.fixture(scope="function", autouse=False)
-async def client(tmp_path_factory) -> Comfy:
+async def client(tmp_path_factory) -> AsyncGenerator[Any, Any]:
     async with Comfy() as client:
         yield client
 
diff --git a/tests/models/__init__.py b/tests/models/__init__.py
new file mode 100644
index 000000000..e69de29bb
diff --git a/tests/inference/test_mixed_media_generic.py b/tests/models/test_mixed_media_generic.py
similarity index 100%
rename from tests/inference/test_mixed_media_generic.py
rename to tests/models/test_mixed_media_generic.py
diff --git a/tests/inference/test_qwen3vl_mixed_media.py b/tests/models/test_qwen3vl_mixed_media.py
similarity index 100%
rename from tests/inference/test_qwen3vl_mixed_media.py
rename to tests/models/test_qwen3vl_mixed_media.py
diff --git a/tests/inference/test_qwenvl_mixed_media.py b/tests/models/test_qwenvl_mixed_media.py
similarity index 100%
rename from tests/inference/test_qwenvl_mixed_media.py
rename to tests/models/test_qwenvl_mixed_media.py
diff --git a/tests/inference/test_qwenvl_video.py b/tests/models/test_qwenvl_video.py
similarity index 100%
rename from tests/inference/test_qwenvl_video.py
rename to tests/models/test_qwenvl_video.py
diff --git a/tests/unit/test_mixed_precision.py b/tests/unit/test_mixed_precision.py
index 3a54941e6..2c0bd83f4 100644
--- a/tests/unit/test_mixed_precision.py
+++ b/tests/unit/test_mixed_precision.py
@@ -1,11 +1,8 @@
-import unittest
-import torch
-import sys
-import os
 import json
+import unittest
+
+import torch
 
-# Add comfy to path
-sys.path.insert(0, os.path.join(os.path.dirname(__file__), "..", ".."))
 
 def has_gpu():
     return torch.cuda.is_available()
diff --git a/tests/unit/test_quant_registry.py b/tests/unit/test_quant_registry.py
index 9cb54ede8..b69e6f816 100644
--- a/tests/unit/test_quant_registry.py
+++ b/tests/unit/test_quant_registry.py
@@ -1,10 +1,7 @@
 import unittest
-import torch
-import sys
-import os
 
-# Add comfy to path
-sys.path.insert(0, os.path.join(os.path.dirname(__file__), "..", ".."))
+import torch
+
 
 def has_gpu():
     return torch.cuda.is_available()