diff --git a/test/libs/kicad/fileformats.py b/test/libs/kicad/test_fileformats.py
similarity index 100%
rename from test/libs/kicad/fileformats.py
rename to test/libs/kicad/test_fileformats.py
diff --git a/test/libs/picker/test_jlcpcb.py b/test/libs/picker/test_jlcpcb.py
index 4e179074..c87d5320 100644
--- a/test/libs/picker/test_jlcpcb.py
+++ b/test/libs/picker/test_jlcpcb.py
@@ -361,7 +361,11 @@ def tearDown(self):
         JLCPCB_DB.get().close()
 
 
-@unittest.skipIf(not JLCPCB_DB.config.db_path.exists(), reason="Requires large db")
+def is_db_available():
+    return JLCPCB_DB.config.db_path.exists()
+
+
+@unittest.skipIf(not is_db_available(), reason="Requires large db")
 class TestPickerPerformanceJLCPCB(unittest.TestCase):
     def test_simple_full(self):
         # conclusions
diff --git a/test/libs/lcsc.py b/test/libs/test_lcsc.py
similarity index 89%
rename from test/libs/lcsc.py
rename to test/libs/test_lcsc.py
index 7edf34ce..8c4f99c7 100644
--- a/test/libs/lcsc.py
+++ b/test/libs/test_lcsc.py
@@ -49,9 +49,11 @@ def test_model_translations(self):
         lcsc.EXPORT_NON_EXISTING_MODELS = True
 
         for part, expected in test_parts.items():
-            ki_footprint, ki_model, ee_footprint, ee_model = lcsc.download_easyeda_info(
-                part,
-                get_model=INTERACTIVE_TESTING,
+            ki_footprint, ki_model, ee_footprint, ee_model, ee_symbol = (
+                lcsc.download_easyeda_info(
+                    part,
+                    get_model=INTERACTIVE_TESTING,
+                )
             )
 
             translation = ki_footprint.output.model_3d.translation
diff --git a/test/libs/util.py b/test/libs/test_util.py
similarity index 100%
rename from test/libs/util.py
rename to test/libs/test_util.py
diff --git a/test/libs/util_atexit.py b/test/libs/test_util_atexit.py
similarity index 100%
rename from test/libs/util_atexit.py
rename to test/libs/test_util_atexit.py