diff --git a/tests/test_beam.py b/tests/test_beam.py
index fa028bf3cde959d3315796a782b960cf94109744..6a4ae3ee454706875152df98a2f3341aa0e45915 100644
--- a/tests/test_beam.py
+++ b/tests/test_beam.py
@@ -5,16 +5,34 @@ from scripts.beam import calc_beam
 
 class TestBeam(unittest.TestCase):
     def test_calc_beam_no_beam_number_at_all(self):
-        actual = calc_beam("abc")
+        # arrange
+        name = "abc"
         expected = 0
+
+        # act
+        actual = calc_beam(name)
+
+        # assert
         self.assertEqual(actual, expected)
 
     def test_calc_beam_no_beam_number_but_partial_match_no_dot(self):
-        actual = calc_beam("_BXXXXX")
+        # arrange
+        name = "_BXXXXX"
         expected = 0
+
+        # act
+        actual = calc_beam(name)
+
+        # assert
         self.assertEqual(actual, expected)
 
     def test_calc_beam_valid_beam_number(self):
-        actual = calc_beam("_B099.")
+        # arrange
+        name = "_B099."
         expected = 99
-        self.assertEqual(actual, expected)
\ No newline at end of file
+
+        # act
+        actual = calc_beam(name)
+
+        # assert
+        self.assertEqual(actual, expected)
diff --git a/tests/test_connectors_postgres.py b/tests/test_connectors_postgres.py
index 39504d569cea7a66601ff0f2d9ee8d4951143249..5e85288fd4792a20bdddfd58b834e8dcd66deb58 100644
--- a/tests/test_connectors_postgres.py
+++ b/tests/test_connectors_postgres.py
@@ -5,8 +5,8 @@ from scraper.postgres.connectors.apertif import Inspectionplots
 
 class TestConnectorPostgresApertif(unittest.TestCase):
     def test_translate(self):
+        # arrange
         connector = Inspectionplots()
-
         name = 'my_name'
         pid = 5
         url = 'some_access_url'
@@ -17,8 +17,6 @@ class TestConnectorPostgresApertif(unittest.TestCase):
         args_collection = [1, 2, 3]
         args = types.SimpleNamespace(collection=args_collection)
 
-        actual = connector.translate(row=row, args=args)
-
         expected = {
             'pid': pid,
             'name': name,
@@ -31,5 +29,8 @@ class TestConnectorPostgresApertif(unittest.TestCase):
             'collection': args_collection,
         }
 
-        self.assertDictEqual(actual, expected)
+        # act
+        actual = connector.translate(row=row, args=args)
 
+        # assert
+        self.assertDictEqual(actual, expected)