diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5b2e3cacbfec106d4ace5229fbb164da31b5ea2a..3411d8ae9fe898b3e804995e41da09bd10e49baa 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -22,15 +22,13 @@ add_library(common OBJECT
         src/Services/MemoryManagementService.cpp
         src/Services/ParameterService.cpp
         src/Services/RequestVerificationService.cpp
-        src/Services/TestService.cpp
-        )
+        src/Services/TestService.cpp)
 
 # Specify the .cpp files for the executables
 add_executable(ecss_services
         src/main.cpp
         $<TARGET_OBJECTS:common>
-        src/Platform/x86/Service.cpp
-        )
+        src/Platform/x86/Service.cpp)
 
 IF (EXISTS "${PROJECT_SOURCE_DIR}/lib/Catch2/CMakeLists.txt")
     # Gather all the .cpp files corresponding to tests
diff --git a/inc/Platform/ARM/MemoryAddressLimits_STM32F7.hpp b/inc/Platform/ARM/MemoryAddressLimits_STM32F7.hpp
new file mode 100644
index 0000000000000000000000000000000000000000..e30651f9373d45912404ca7f33ceceed060b2002
--- /dev/null
+++ b/inc/Platform/ARM/MemoryAddressLimits_STM32F7.hpp
@@ -0,0 +1,18 @@
+#ifndef ECSS_SERVICES_MEMORYADDRESSLIMITS_STM32F7_HPP
+#define ECSS_SERVICES_MEMORYADDRESSLIMITS_STM32F7_HPP
+
+// Memory limits definitions
+#define DTCMRAM_LOWER_LIM 0x20000000UL
+#define DTCMRAM_UPPER_LIM 0x20020000UL
+#define ITCMRAM_LOWER_LIM 0x00000000UL
+#define ITCMRAM_UPPER_LIM 0x00010000UL
+#define RAM_D1_LOWER_LIM 0x24000000UL
+#define RAM_D1_UPPER_LIM 0x24080000UL
+#define RAM_D2_LOWER_LIM 0x30000000UL
+#define RAM_D2_UPPER_LIM 0x30048000UL
+#define RAM_D3_LOWER_LIM 0x38000000UL
+#define RAM_D3_UPPER_LIM 0x38010000UL
+#define FLASH_LOWER_LIM 0x08000000UL
+#define FLASH_UPPER_LIM 0x08200000UL
+
+#endif //ECSS_SERVICES_MEMORYADDRESSLIMITS_STM32F7_HPP
diff --git a/inc/Services/MemoryManagementService.hpp b/inc/Services/MemoryManagementService.hpp
index 98f8dfcbfcbb3ce8eaa83091e18658fa477debcd..04b8201906647b92e06401d529258ceb398b823a 100644
--- a/inc/Services/MemoryManagementService.hpp
+++ b/inc/Services/MemoryManagementService.hpp
@@ -1,26 +1,12 @@
 #ifndef ECSS_SERVICES_MEMMANGSERVICE_HPP
 #define ECSS_SERVICES_MEMMANGSERVICE_HPP
 
-// Memory limits definitions
-#define DTCMRAM_LOWER_LIM 0x20000000UL
-#define DTCMRAM_UPPER_LIM 0x20020000UL
-#define ITCMRAM_LOWER_LIM 0x00000000UL
-#define ITCMRAM_UPPER_LIM 0x00010000UL
-#define RAM_D1_LOWER_LIM 0x24000000UL
-#define RAM_D1_UPPER_LIM 0x24080000UL
-#define RAM_D2_LOWER_LIM 0x30000000UL
-#define RAM_D2_UPPER_LIM 0x30048000UL
-#define RAM_D3_LOWER_LIM 0x38000000UL
-#define RAM_D3_UPPER_LIM 0x38010000UL
-#define FLASH_LOWER_LIM 0x08000000UL
-#define FLASH_UPPER_LIM 0x08200000UL
-
-
 #include <memory>
 #include <iostream>
 #include "Service.hpp"
 #include "Services/RequestVerificationService.hpp"
 #include "Helpers/CRCHelper.hpp"
+#include "Platform/ARM/MemoryAddressLimits_STM32F7.hpp"
 
 
 class MemoryManagementService : public Service {
diff --git a/test/Message.cpp b/test/Message.cpp
index dce148d340fff2b12dc09fabebc86608d3200493..d31c2be299db33b3f079344c54b913fc8c537beb 100644
--- a/test/Message.cpp
+++ b/test/Message.cpp
@@ -134,7 +134,7 @@ TEST_CASE("Requirement 7.3.5 (Signed integer)", "[message][ecss]") {
 
 	SECTION("7.4.3") {
 		// Make sure the endianness of the message data is correct
-		// As per the ECSS standard, stored data should be big-endian. However, ARM and x86
+		// As per the ECSS standard, stored data should be big-endian. However, ARM and ARM
 		// processors store data in little endian format. As a result, special care needs to be
 		// taken for compliance.
 		CHECK(message.data[1] == 0xe4);