diff --git a/obsw_tmtc_client.py b/obsw_tmtc_client.py
index eb88c13e5af5464114aec43dc843ea018a4b6e4b..61fe3e3c5c6fa60212a25d06b70272811a8a646c 100755
--- a/obsw_tmtc_client.py
+++ b/obsw_tmtc_client.py
@@ -215,8 +215,14 @@ class TmTcHandler:
             g.G_TMTC_PRINTER = self.tmtc_printer
             LOGGER.info("Performing module tests")
             # noinspection PyTypeChecker
-            suite = unittest.TestLoader().loadTestsFromModule(obsw_pus_service_test)
+            suite = unittest.TestLoader().loadTestsFromName("TestService17", obsw_pus_service_test)
             unittest.TextTestRunner(verbosity=2).run(suite)
+            # noinspection PyTypeChecker
+            suite = unittest.TestLoader().loadTestsFromName("TestService5", obsw_pus_service_test)
+            unittest.TextTestRunner(verbosity=2).run(suite)
+            # noinspection PyTypeChecker
+            # suite = unittest.TestLoader().loadTestsFromName("TestService2", obsw_pus_service_test)
+            # unittest.TextTestRunner(verbosity=2).run(suite)
 
         else:
             logging.error("Unknown Mode, Configuration error !")
diff --git a/test/obsw_module_test.py b/test/obsw_module_test.py
index 38c8797555511d5f695cebd135f99415c3cf7e36..dc7b1c45c22d859f07fa79156a562f05def5f9f0 100644
--- a/test/obsw_module_test.py
+++ b/test/obsw_module_test.py
@@ -241,7 +241,8 @@ class TestService(unittest.TestCase):
                 self.scan_for_respective_tc(current_tm_info)
             # Here, the desired event Id or RID can be specified
             elif current_tm_info[TmDictionaryKeys.SERVICE] == 5:
-                if (current_tm_info[TmDictionaryKeys.EVENT_ID] == 8200 and
+                # TODO: hardcoded values.. should be in config file
+                if (current_tm_info[TmDictionaryKeys.EVENT_ID] == 8300 and
                         current_tm_info[TmDictionaryKeys.REPORTER_ID] == 0x51001700):
                     self.event_counter = self.event_counter + 1
             elif current_tm_info[TmDictionaryKeys.SERVICE] == 17:
diff --git a/tmtc_core b/tmtc_core
index 32c95a68ead007956630c8190166af5075bb6538..7ebc8d7467226515056dc5b4345bba0350de8062 160000
--- a/tmtc_core
+++ b/tmtc_core
@@ -1 +1 @@
-Subproject commit 32c95a68ead007956630c8190166af5075bb6538
+Subproject commit 7ebc8d7467226515056dc5b4345bba0350de8062