diff --git a/aidatlu/main/config_parser.py b/aidatlu/main/config_parser.py
index 1abf15b..e2210ed 100644
--- a/aidatlu/main/config_parser.py
+++ b/aidatlu/main/config_parser.py
@@ -190,9 +190,18 @@ def conf_dut(self) -> None:
     def conf_trigger_logic(self) -> None:
         """Configures the trigger logic. So the trigger polarity and the trigger pulse length and stretch."""
 
-        self.tlu.trigger_logic.set_trigger_polarity(
-            self.conf["trigger_inputs"]["trigger_polarity"]["polarity"]
-        )
+        if self.conf["trigger_inputs"]["trigger_polarity"]["polarity"] in [
+            0,
+            "0",
+            "rising",
+        ]:
+            self.tlu.trigger_logic.set_trigger_polarity(0)
+        elif self.conf["trigger_inputs"]["trigger_polarity"]["polarity"] in [
+            1,
+            "1",
+            "falling",
+        ]:
+            self.tlu.trigger_logic.set_trigger_polarity(1)
 
         self.tlu.trigger_logic.set_pulse_stretch_pack(
             self.conf["trigger_inputs"]["trigger_signal_shape"]["stretch"]
diff --git a/aidatlu/test/test_configuration.py b/aidatlu/test/test_configuration.py
index aea3b1f..271b701 100644
--- a/aidatlu/test/test_configuration.py
+++ b/aidatlu/test/test_configuration.py
@@ -10,7 +10,9 @@
 
 FILEPATH = Path(__file__).parent
 
-MOCK = True
+with open(FILEPATH / "tlu_test_configuration.yaml") as yaml_file:
+    test_config = yaml.safe_load(yaml_file)
+MOCK = test_config["MOCK"]
 
 if MOCK:
     I2CMETHOD = MockI2C
diff --git a/aidatlu/test/test_tlu.py b/aidatlu/test/test_tlu.py
index 457ebea..aa4fe97 100644
--- a/aidatlu/test/test_tlu.py
+++ b/aidatlu/test/test_tlu.py
@@ -1,5 +1,6 @@
 from pathlib import Path
 import time
+import yaml
 import pytest
 from aidatlu.main.tlu import AidaTLU
 from aidatlu.hardware.i2c import I2CCore
@@ -7,7 +8,9 @@
 
 FILEPATH = Path(__file__).parent
 
-MOCK = True
+with open(FILEPATH / "tlu_test_configuration.yaml") as yaml_file:
+    test_config = yaml.safe_load(yaml_file)
+MOCK = test_config["MOCK"]
 
 if MOCK:
     I2CMETHOD = MockI2C
diff --git a/aidatlu/test/tlu_test_configuration.yaml b/aidatlu/test/tlu_test_configuration.yaml
index 71c9cae..46c571f 100644
--- a/aidatlu/test/tlu_test_configuration.yaml
+++ b/aidatlu/test/tlu_test_configuration.yaml
@@ -1,9 +1,11 @@
 ################################################
-#
-# This configuration is only used during tests
-#
-###############################################
+#                                              #
+# This configuration is only used during tests #
+#                                              #
+################################################
 
+# Use mock I2C
+MOCK: True # This setting is ignored outside of tests
 
 internal_trigger: #Generate TLU internal trigger with given rate in Hz
   internal_trigger_rate: 100000
@@ -33,7 +35,7 @@ trigger_inputs: #threshold voltages for the trigger inputs in V.
   trigger_inputs_logic: CH1
 
   trigger_polarity: #TLU triggers on rising (0) or falling (1) edge
-    polarity: 1
+    polarity: falling
 
   trigger_signal_shape: #Stretches and delays each trigger input signal for an number of clock cycles,
     stretch: [2, 2, 2, 2, 2, 2]
diff --git a/aidatlu/tlu_configuration.yaml b/aidatlu/tlu_configuration.yaml
index 4d10696..15ece08 100644
--- a/aidatlu/tlu_configuration.yaml
+++ b/aidatlu/tlu_configuration.yaml
@@ -26,7 +26,7 @@ trigger_inputs: #threshold voltages for the trigger inputs in V.
   trigger_inputs_logic: CH2 & CH4
 
   trigger_polarity: #TLU triggers on rising (0) or falling (1) edge
-    polarity: 1
+    polarity: falling
 
   trigger_signal_shape: #Stretches and delays each trigger input signal for an number of clock cycles,
     stretch: [2, 2, 2, 2, 2, 2]