diff --git a/obsw_tmtc_client.py b/obsw_tmtc_client.py
index 61fe3e3c5c6fa60212a25d06b70272811a8a646c..31aa2055f78cb171a667610af9e79065e9a3fdcc 100755
--- a/obsw_tmtc_client.py
+++ b/obsw_tmtc_client.py
@@ -221,8 +221,11 @@ class TmTcHandler:
             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)
+            suite = unittest.TestLoader().loadTestsFromName("TestService2", obsw_pus_service_test)
+            unittest.TextTestRunner(verbosity=2).run(suite)
+            # noinspection PyTypeChecker
+            suite = unittest.TestLoader().loadTestsFromName("TestService8", 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 dc7b1c45c22d859f07fa79156a562f05def5f9f0..07b97cec3523a0a73e1c6d78fc63e88a33f2a511 100644
--- a/test/obsw_module_test.py
+++ b/test/obsw_module_test.py
@@ -265,7 +265,6 @@ class TestService(unittest.TestCase):
             # mode change confirmation
             self.misc_counter += 1
 
-
     @classmethod
     # we could print out everything here.
     def tearDownClass(cls):
diff --git a/tm/obsw_tm_service_1.py b/tm/obsw_tm_service_1.py
index b299db9fd3d261aff8218b16d12e75a2fa0e0821..806070419fc9988f09f26439a8a9c8462409722a 100644
--- a/tm/obsw_tm_service_1.py
+++ b/tm/obsw_tm_service_1.py
@@ -77,7 +77,6 @@ class Service1TM(PusTelemetry):
             self.error_param1 = struct.unpack('>I', self._tm_data[7:11])[0]
             self.error_param2 = struct.unpack('>I', self._tm_data[11:15])[0]
         elif self.get_subservice() == 8:
-            self.print_source_data()
             self.err_code = struct.unpack('>H', self._tm_data[4:6])[0]
             self.error_param1 = struct.unpack('>I', self._tm_data[6:10])[0]
             self.error_param2 = struct.unpack('>I', self._tm_data[10:14])[0]
diff --git a/tmtc_core b/tmtc_core
index 7ebc8d7467226515056dc5b4345bba0350de8062..118372a893ba13581c3f13168af128537489b008 160000
--- a/tmtc_core
+++ b/tmtc_core
@@ -1 +1 @@
-Subproject commit 7ebc8d7467226515056dc5b4345bba0350de8062
+Subproject commit 118372a893ba13581c3f13168af128537489b008