diff --git a/binarycpython/tests/main.py b/binarycpython/tests/main.py
index 9725fd0f2a7681ba9b031a6eab582e20b6b2d453..94e785c88adadfe62e2f5624218c17ae0f7cb088 100755
--- a/binarycpython/tests/main.py
+++ b/binarycpython/tests/main.py
@@ -1,22 +1,28 @@
 # /usr/bin/env python
 """
 Main file for the tests. This file imports all the combined_test functions from all files.
+
+TODO: fix the imports without the wildcard
 """
 
 import unittest
 
-from binarycpython.tests.test_c_bindings import *
-from binarycpython.tests.test_custom_logging import *
-from binarycpython.tests.test_distributions import *
-from binarycpython.tests.test_functions import *
-from binarycpython.tests.test_grid import *
-from binarycpython.tests.test_hpc_functions import *
-from binarycpython.tests.test_plot_functions import *
-from binarycpython.tests.test_run_system_wrapper import *
-from binarycpython.tests.test_spacing_functions import *
-from binarycpython.tests.test_useful_funcs import *
-from binarycpython.tests.test_grid_options_defaults import *
-from binarycpython.tests.test_stellar_types import *
+from binarycpython.tests.test_c_bindings import (
+    test_run_system,
+    test_return_store_memaddr,
+    TestEnsemble,
+)
+# from binarycpython.tests.test_custom_logging import *
+# from binarycpython.tests.test_distributions import *
+# from binarycpython.tests.test_functions import *
+# from binarycpython.tests.test_grid import *
+# from binarycpython.tests.test_hpc_functions import *
+# from binarycpython.tests.test_plot_functions import *
+# from binarycpython.tests.test_run_system_wrapper import *
+# from binarycpython.tests.test_spacing_functions import *
+# from binarycpython.tests.test_useful_funcs import *
+# from binarycpython.tests.test_grid_options_defaults import *
+# from binarycpython.tests.test_stellar_types import *
 
 if __name__ == "__main__":
     unittest.main()
diff --git a/binarycpython/tests/test_c_bindings.py b/binarycpython/tests/test_c_bindings.py
index 2fc163d8700d259e405cbe735ed3f1320ceb4759..b8ee8e1e5db86c313c80b2997aa25300bea1a34d 100644
--- a/binarycpython/tests/test_c_bindings.py
+++ b/binarycpython/tests/test_c_bindings.py
@@ -119,8 +119,6 @@ class test_run_system(unittest.TestCase):
 ### memaddr test
 #######################################################################################################################################################
 
-# TODO: Make some assertion tests in c
-
 
 class test_return_store_memaddr(unittest.TestCase):
     """
@@ -180,9 +178,6 @@ class TestEnsemble(unittest.TestCase):
         output = _binary_c_bindings.return_persistent_data_memaddr()
 
         self.assertTrue(is_capsule(output), msg="Object must be a capsule")
-        # self.assertNotEqual(
-        #     output, 0, "memory adress seems not to have a correct value"
-        # )
 
     def test_minimal_ensemble_output(self):
         with Capturing() as output:
diff --git a/binarycpython/tests/test_useful_funcs.py b/binarycpython/tests/test_useful_funcs.py
index bbab35f7a292118dcf06e6f081cc04777265e111..77b4a9e8b814c4da1d2c563a231859ae751b97e7 100644
--- a/binarycpython/tests/test_useful_funcs.py
+++ b/binarycpython/tests/test_useful_funcs.py
@@ -18,15 +18,6 @@ from binarycpython.utils.useful_funcs import (
     calc_period_from_sep,
 )
 
-# class test_(unittest.TestCase):
-#     """
-#     Unittests for function
-#     """
-
-#     def test_1(self):
-#         pass
-
-
 class test_calc_period_from_sep(unittest.TestCase):
     """
     Unittests for function calc_period_from_sep