diff --git a/binarycpython/tests/main.py b/binarycpython/tests/main.py
index 2c8111696dfd428c2505c9ef3644ee40e177b92d..4e6a1c292cd7ce11dabc1805b6ebb0c70b9a09d0 100644
--- a/binarycpython/tests/main.py
+++ b/binarycpython/tests/main.py
@@ -4,6 +4,7 @@ Main file for the tests. This file imports all the combined_test functions from
 
 import unittest
 
+
 from binarycpython.tests.test_c_bindings import *
 from binarycpython.tests.test_custom_logging import *
 from binarycpython.tests.test_distributions import *
diff --git a/binarycpython/tests/test_grid_options_defaults.py b/binarycpython/tests/test_grid_options_defaults.py
index bc941176181ac4526d7bb59f10a0c02600ef1e0e..a381f8036c5e11a9dfa42645fe488776e7d459d3 100644
--- a/binarycpython/tests/test_grid_options_defaults.py
+++ b/binarycpython/tests/test_grid_options_defaults.py
@@ -1,11 +1,18 @@
 """
 Unittests for grid_options_defaults module
 """
-
+import os
 import unittest
 
-from binarycpython.utils.grid_options_defaults import *
-from binarycpython.utils.functions import *
+from binarycpython.utils.functions import (
+    temp_dir,
+    Capturing,
+)
+from binarycpython.utils.grid_options_defaults import (
+    write_grid_options_to_rst_file,
+    grid_options_help,
+    grid_options_description_checker
+)
 
 binary_c_temp_dir = temp_dir()
 
diff --git a/binarycpython/tests/test_run_system_wrapper.py b/binarycpython/tests/test_run_system_wrapper.py
index f237693c99f8926ee2acc4c358713958defeeba5..ef4cc754d43de33d02c0cf748caa16f2e9147a30 100644
--- a/binarycpython/tests/test_run_system_wrapper.py
+++ b/binarycpython/tests/test_run_system_wrapper.py
@@ -2,7 +2,4 @@
 Unittests for run_system_wrapper
 """
 
-from binarycpython.utils.run_system_wrapper import *
-from binarycpython.utils.functions import *
-
 # TODO: write tests for run_system_wrapper
diff --git a/binarycpython/tests/test_spacing_functions.py b/binarycpython/tests/test_spacing_functions.py
index bdfbe253eec2813dfccf98abde50d171bc6565bf..b29290d0acca48eb7be804cc8dbd6f32d7ee9fbd 100644
--- a/binarycpython/tests/test_spacing_functions.py
+++ b/binarycpython/tests/test_spacing_functions.py
@@ -2,12 +2,11 @@
 Unittests for spacing_functions module
 """
 
-
 import unittest
 import numpy as np
-from binarycpython.utils.spacing_functions import *
-from binarycpython.utils.functions import *
 
+from binarycpython.utils.spacing_functions import const
+from binarycpython.utils.functions import Capturing
 
 class test_spacing_functions(unittest.TestCase):
     """
@@ -28,3 +27,6 @@ class test_spacing_functions(unittest.TestCase):
             (const_return == np.linspace(1, 10, 10)).all(),
             msg="Output didn't contain SINGLE_STAR_LIFETIME",
         )
+
+if __name__ == "__main__":
+    unittest.main()
diff --git a/binarycpython/tests/test_stellar_types.py b/binarycpython/tests/test_stellar_types.py
index 9ed515f7a726aecceda6c51621606d95994f90c0..84d3e5ee35edc912fdccadaf4c5c03956a54a1de 100644
--- a/binarycpython/tests/test_stellar_types.py
+++ b/binarycpython/tests/test_stellar_types.py
@@ -1,8 +1,3 @@
 """
 Unittests for stellar_types module
 """
-
-import unittest
-
-from binarycpython.utils.stellar_types import *
-from binarycpython.utils.functions import *
diff --git a/binarycpython/tests/test_useful_funcs.py b/binarycpython/tests/test_useful_funcs.py
index 64531c4b3bdefb2a2ebc208dd6d3833e3d90a3ca..9339d54590b536262c837d345daa5d209a2c92f3 100644
--- a/binarycpython/tests/test_useful_funcs.py
+++ b/binarycpython/tests/test_useful_funcs.py
@@ -5,8 +5,18 @@ Unittests for useful_funcs module
 import unittest
 import numpy as np
 
-from binarycpython.utils.useful_funcs import *
-from binarycpython.utils.functions import *
+from binarycpython.utils.functions import (
+    Capturing,
+)
+
+from binarycpython.utils.useful_funcs import (
+    zams_collision,
+    rzams,
+    roche_lobe,
+    ragb,
+    calc_sep_from_period,
+    calc_period_from_sep
+)
 
 # class test_(unittest.TestCase):
 #     """