diff --git a/CMakeLists.txt b/CMakeLists.txt
index 37cdc1f4354b5c0253f91ad8887d46dc9b871910..391b583de03bfac21f4c2b44e6da378d7be3a068 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -43,6 +43,7 @@ add_library(common OBJECT
         src/Services/HousekeepingService.cpp
         src/Services/ParameterStatisticsService.cpp
         src/Helpers/Statistic.cpp
+        src/Services/RealTimeForwardingControlService.cpp
         )
 
 # Specify the .cpp files for the executables
diff --git a/src/Services/RealTimeForwardingControlService.cpp b/src/Services/RealTimeForwardingControlService.cpp
index 329f1f7356e4dc41fafa0f6c4ce12f9b511cf7c1..ed38a6c8f99d5cf3574c8178fc78605b735d0dfd 100644
--- a/src/Services/RealTimeForwardingControlService.cpp
+++ b/src/Services/RealTimeForwardingControlService.cpp
@@ -90,8 +90,8 @@ void RealTimeForwardingControlService::addReportTypesToAppProcessConfiguration(M
 		//		}
 
 		for (uint8_t j = 0; j < numOfServices; j++) {
-			uint8_t serviceType = request.readUint8();
 			// todo: check if service type is valid.
+			uint8_t serviceType = request.readUint8();
 			uint8_t numOfMessages = request.readUint8();
 
 			if (not checkService1(request, applicationID, serviceType, numOfMessages)) {
@@ -116,29 +116,29 @@ void RealTimeForwardingControlService::execute(Message& message) {
 		case AddReportTypesToAppProcessConfiguration:
 			addReportTypesToAppProcessConfiguration(message);
 			break;
-		case DeleteReportTypesFromAppProcessConfiguration:
-			deleteReportTypesFromAppProcessConfiguration(message);
-			break;
-		case ReportAppProcessConfigurationContent:
-			reportAppProcessConfigurationContent(message);
-			break;
-		case AddStructuresToHousekeepingConfiguration:
-			addStructuresToHousekeepingConfiguration(message);
-			break;
-		case DeleteStructuresFromHousekeepingConfiguration:
-			deleteStructuresFromHousekeepingConfiguration(message);
-			break;
-		case ReportHousekeepingConfigurationContent:
-			reportHousekeepingConfigurationContent(message);
-			break;
-		case AddEventDefinitionsToEventReportConfiguration:
-			addEventDefinitionsToEventReportConfiguration(message);
-			break;
-		case DeleteEventDefinitionsFromEventReportConfiguration:
-			deleteEventDefinitionsFromEventReportConfiguration(message);
-			break;
-		case ReportEventReportConfigurationContent:
-			reportEventReportConfigurationContent(message);
-			break;
+//		case DeleteReportTypesFromAppProcessConfiguration:
+//			deleteReportTypesFromAppProcessConfiguration(message);
+//			break;
+//		case ReportAppProcessConfigurationContent:
+//			reportAppProcessConfigurationContent(message);
+//			break;
+//		case AddStructuresToHousekeepingConfiguration:
+//			addStructuresToHousekeepingConfiguration(message);
+//			break;
+//		case DeleteStructuresFromHousekeepingConfiguration:
+//			deleteStructuresFromHousekeepingConfiguration(message);
+//			break;
+//		case ReportHousekeepingConfigurationContent:
+//			reportHousekeepingConfigurationContent(message);
+//			break;
+//		case AddEventDefinitionsToEventReportConfiguration:
+//			addEventDefinitionsToEventReportConfiguration(message);
+//			break;
+//		case DeleteEventDefinitionsFromEventReportConfiguration:
+//			deleteEventDefinitionsFromEventReportConfiguration(message);
+//			break;
+//		case ReportEventReportConfigurationContent:
+//			reportEventReportConfigurationContent(message);
+//			break;
 	}
 }
diff --git a/test/Services/RealTimeForwardingControl.cpp b/test/Services/RealTimeForwardingControl.cpp
new file mode 100644
index 0000000000000000000000000000000000000000..14039ab4c18d95e6f0885ea7c758fd8eba934feb
--- /dev/null
+++ b/test/Services/RealTimeForwardingControl.cpp
@@ -0,0 +1,6 @@
+#include <iostream>
+#include "catch2/catch.hpp"
+#include "Message.hpp"
+#include "ServiceTests.hpp"
+#include "ECSS_Definitions.hpp"
+#include "Services/RealTimeForwardingControlService.hpp"