diff --git a/tests/apiserver_tests/test_responsiveness.py b/tests/apiserver_tests/test_responsiveness.py
index 89bb9261dc038c1078e5c27feb7bb45e9fb575a3..f5a2044e978e2726ffea1353e8efce864644195b 100644
--- a/tests/apiserver_tests/test_responsiveness.py
+++ b/tests/apiserver_tests/test_responsiveness.py
@@ -1,6 +1,3 @@
-# These Tests only check if every api path that should work is responding to requests, the functionality is not yet checked
-# Therefore this only detects grievous errors in the request handling.
-
 from fastapi.testclient import TestClient
 
 from context import apiserver
diff --git a/tests/storage_tests/test_jsonbackend.py b/tests/storage_tests/test_jsonbackend.py
index 510f55a80bdd08b50672a57d9b2b2cf4200706c5..9cde62034619b4a2598685e56092c3f821291651 100644
--- a/tests/storage_tests/test_jsonbackend.py
+++ b/tests/storage_tests/test_jsonbackend.py
@@ -36,33 +36,33 @@ class SomeTests(unittest.TestCase):
         d = LocationData(name='bla', url='local')
         (oid, data) = self.store.add_new(
             n_type=LocationDataType.DATASET, data=d, usr='test_user')
-        self.assertEquals(d, data, "Data should be equal")
+        self.assertEqual(d, data, "Data should be equal")
         self.assertIsNotNone(oid)
 
     def test_add_and_read(self):
         l_data = LocationData(name='test1', url='http://n.go', metadata=[])
         (oid, data) = self.store.add_new(
             n_type=LocationDataType.DATASET, data=l_data, usr='test_user')
-        self.assertEquals(l_data, data, "Data should be equal")
+        self.assertEqual(l_data, data, "Data should be equal")
         self.assertIsNotNone(oid)
 
         lst = self.store.get_list(n_type=LocationDataType.DATASET)
         self.assertEqual(len(lst), 1,  'One should be there')
         m_o = lst[0]
-        self.assertEquals(list(m_o.keys())[0], l_data.name)
-        self.assertEquals(list(m_o.values())[0], oid)
+        self.assertEqual(list(m_o.keys())[0], l_data.name)
+        self.assertEqual(list(m_o.values())[0], oid)
 
     def test_get_details(self):
         # get_details(self, n_type: LocationDataType, oid: str):
         l_data = LocationData(name='test1', url='http://n.go', metadata=[])
         (oid, data) = self.store.add_new(
             n_type=LocationDataType.DATASET, data=l_data, usr='test_user')
-        self.assertEquals(l_data, data, "Data should be equal")
+        self.assertEqual(l_data, data, "Data should be equal")
         self.assertIsNotNone(oid)
 
         details = self.store.get_details(
             n_type=LocationDataType.DATASET, oid=oid)
-        self.assertEquals(l_data, details)
+        self.assertEqual(l_data, details)
 
     def test_nonexisting_details(self):
         self.assertRaises(FileNotFoundError, self.store.get_details,
@@ -74,10 +74,10 @@ class SomeTests(unittest.TestCase):
             name='test2', url='http://go.n', metadata={'key': 'value'})
         (oid, data) = self.store.add_new(
             n_type=LocationDataType.DATASET, data=l_data, usr='test_user')
-        self.assertEquals(l_data, data, "Data should be equal")
+        self.assertEqual(l_data, data, "Data should be equal")
         self.assertIsNotNone(oid)
 
         (oid2, r) = self.store.update_details(n_type=LocationDataType.DATASET, oid=oid,
                                               data=new_data, usr='tst2')
-        self.assertEquals(new_data, r)
-        self.assertEquals(oid, oid2)
+        self.assertEqual(new_data, r)
+        self.assertEqual(oid, oid2)
diff --git a/tests/user_tests/test_user.py b/tests/user_tests/test_user.py
index 040f82396949793c8ef9d124d99601b7ac9c2dfe..e401e8d5944388dafa73870048ce730c79d6ac1b 100644
--- a/tests/user_tests/test_user.py
+++ b/tests/user_tests/test_user.py
@@ -24,7 +24,7 @@ class UserTests(unittest.TestCase):
             shutil.rmtree(self.path)
 
     def test_init(self):
-        self.assertEquals(0,0)
+        self.assertEqual(0,0)
 
     def test_list(self):
         lst = self.userdb.list()
@@ -38,7 +38,7 @@ class UserTests(unittest.TestCase):
         self.userdb.add(user=self.a_user)
 
         lst = self.userdb.list()
-        self.assertEquals(len(lst), 1, 'Should not be empty')
+        self.assertEqual(len(lst), 1, 'Should not be empty')
 
         g_user = self.userdb.get(username='test7')
         self.assertEqual(g_user.username, self.a_user.username)
@@ -51,15 +51,15 @@ class UserTests(unittest.TestCase):
     def test_delete(self):
         self.userdb.add(user=self.a_user)
         lst = self.userdb.list()
-        self.assertEquals(len(lst), 1, 'Should not be empty')
+        self.assertEqual(len(lst), 1, 'Should not be empty')
 
         self.userdb.delete(username='test7')
         lst = self.userdb.list()
-        self.assertEquals(len(lst), 0, 'Should be empty')
+        self.assertEqual(len(lst), 0, 'Should be empty')
 
         self.userdb.add(user=self.a_user)
         self.userdb.add(user=self.b_user)
-        self.assertEquals(len(self.userdb.list()), 2, 'Should not be empty')
+        self.assertEqual(len(self.userdb.list()), 2, 'Should not be empty')
         self.assertListEqual(self.userdb.list(), [self.a_user.username, self.b_user.username])
         
         self.userdb.delete(username='test7')