diff --git a/inc/Helpers/CRCHelper.hpp b/inc/Helpers/CRCHelper.hpp
index d70ca5782b7a33add0110990bd23c0c2253dd1e7..2f1b65d3514a002f57a82fbb5437e6bdd4eaa33b 100644
--- a/inc/Helpers/CRCHelper.hpp
+++ b/inc/Helpers/CRCHelper.hpp
@@ -6,7 +6,7 @@
 class CRCHelper {
 
 	/**
-	 * CRC32 calculation helper class
+	 * CRC16 calculation helper class
 	 * This class declares a function which calculates the CRC16 checksum of the given data.
 	 *
 	 * For now the actual implementation is the CRC16/CCITT variant (ECSS-E-ST-70-41C, pg.615)
@@ -26,7 +26,7 @@ public:
 	 * Actual CRC calculation function.
 	 * @param  message (pointer to the data to be checksummed)
 	 * @param  length (size in bytes)
-	 * @return the CRC32 checksum of the input data
+	 * @return the CRC16 checksum of the input data
 	 */
 	static uint16_t calculateCRC(const uint8_t* message, uint32_t length);
 
diff --git a/inc/etl/String.hpp b/inc/etl/String.hpp
index 8fbd401cc4eb033cce095feb13d4fa577aa7d013..f9198df199888453fa690067020528ce9c2d1a36 100644
--- a/inc/etl/String.hpp
+++ b/inc/etl/String.hpp
@@ -1,7 +1,6 @@
 #ifndef ECSS_SERVICES_ETL_STRING_HPP
 #define ECSS_SERVICES_ETL_STRING_HPP
 
-
 #include <cstddef>
 #include <etl/cstring.h>
 
diff --git a/test/Services/FunctionManagementService.cpp b/test/Services/FunctionManagementService.cpp
index 365952e5f65b9f443e7721b169df4f86715f3115..68f30b810484dd7eb91b28655bf15164e816474c 100644
--- a/test/Services/FunctionManagementService.cpp
+++ b/test/Services/FunctionManagementService.cpp
@@ -7,7 +7,7 @@ void test(String<MAXARGLENGTH> a) {
 	std::cout << a.c_str() << std::endl;
 }
 
-TEST_CASE("FMS - Call Tests") {
+TEST_CASE("ST[08] - Call Tests") {
 	FunctionManagementService fms;
 
 	SECTION("Malformed name") {
@@ -27,7 +27,7 @@ TEST_CASE("FMS - Call Tests") {
 	}
 }
 
-TEST_CASE("FMS - Insert Tests") {
+TEST_CASE("ST[08] - Insert Tests") {
 
 	SECTION("Insertion to full pointer map") {
 		FunctionManagementService fms;