diff --git a/inc/Helpers/AllMessageTypes.hpp b/inc/Helpers/AllMessageTypes.hpp
index 136a6447fd9146b510b9d139cf3ffca1cbe5387a..6db8bf21219600265081c998c907fd554bfc938a 100644
--- a/inc/Helpers/AllMessageTypes.hpp
+++ b/inc/Helpers/AllMessageTypes.hpp
@@ -17,17 +17,6 @@
  * Namespace containing all the message types for every service type.
  */
 namespace AllMessageTypes {
-	extern etl::vector<uint8_t, ECSSMaxReportTypeDefinitions> st01Messages;
-	extern etl::vector<uint8_t, ECSSMaxReportTypeDefinitions> st03Messages;
-	extern etl::vector<uint8_t, ECSSMaxReportTypeDefinitions> st04Messages;
-	extern etl::vector<uint8_t, ECSSMaxReportTypeDefinitions> st05Messages;
-	extern etl::vector<uint8_t, ECSSMaxReportTypeDefinitions> st06Messages;
-	extern etl::vector<uint8_t, ECSSMaxReportTypeDefinitions> st11Messages;
-	extern etl::vector<uint8_t, ECSSMaxReportTypeDefinitions> st13Messages;
-	extern etl::vector<uint8_t, ECSSMaxReportTypeDefinitions> st17Messages;
-	extern etl::vector<uint8_t, ECSSMaxReportTypeDefinitions> st19Messages;
-	extern etl::vector<uint8_t, ECSSMaxReportTypeDefinitions> st20Messages;
-
 	/**
 	 * Map containing all the message types, per service. The key is the ServiceType and the value,
 	 * an etl vector containing the message types.
diff --git a/test/Services/RealTimeForwardingControl.cpp b/test/Services/RealTimeForwardingControl.cpp
index 58a943afea5cfafcf18ca315cce9b8fa46edc10c..cfcab1155865db72b6e9070489d9b1314b756271 100644
--- a/test/Services/RealTimeForwardingControl.cpp
+++ b/test/Services/RealTimeForwardingControl.cpp
@@ -307,7 +307,7 @@ TEST_CASE("Add report types to the Application Process Configuration") {
 		realTimeForwarding.controlledApplications.push_back(applicationID);
 		validReportTypes(request);
 
-		for (auto message: AllMessageTypes::st03Messages) {
+		for (auto message: AllMessageTypes::messagesOfService[serviceType]) {
 			realTimeForwarding.applicationProcessConfiguration.definitions[std::make_pair(applicationID, serviceType)]
 			    .push_back(message);
 		}