diff --git a/inc/Services/TimeBasedSchedulingService.hpp b/inc/Services/TimeBasedSchedulingService.hpp
index 8323e732d92e6c6e94016839c1d2aad64c78bec5..6f6ab971a1d32cfdfe194968e2c3b4a3b2a28308 100644
--- a/inc/Services/TimeBasedSchedulingService.hpp
+++ b/inc/Services/TimeBasedSchedulingService.hpp
@@ -109,9 +109,9 @@ private:
 	inline void sortActivitiesReleaseTime(etl::list<ScheduledActivity,
 		ECSS_MAX_NUMBER_OF_TIME_SCHED_ACTIVITIES> &schedActivities) {
 		schedActivities.sort([](ScheduledActivity const &leftSide, ScheduledActivity const
-		&rightSide) { 
+		&rightSide) {
 			// cppcheck-suppress
-			return leftSide.requestReleaseTime < rightSide.requestReleaseTime; 
+			return leftSide.requestReleaseTime < rightSide.requestReleaseTime;
 		});
 	}
 
diff --git a/src/Helpers/TimeAndDate.cpp b/src/Helpers/TimeAndDate.cpp
index 798fd2215a5c9b73371b77b348c5824a2c2460ad..5fd9f0faa347aa54597837a36c92bb086d136374 100644
--- a/src/Helpers/TimeAndDate.cpp
+++ b/src/Helpers/TimeAndDate.cpp
@@ -17,9 +17,9 @@ TimeAndDate::TimeAndDate(uint16_t year, uint8_t month, uint8_t day, uint8_t hour
 	ASSERT_INTERNAL(2019 <= year, ErrorHandler::InternalErrorType::InvalidDate);
 	ASSERT_INTERNAL((1 <= month) && (month <= 12), ErrorHandler::InternalErrorType::InvalidDate);
 	ASSERT_INTERNAL((1 <= day) && (day <= 31), ErrorHandler::InternalErrorType::InvalidDate);
-	ASSERT_INTERNAL((0 <= hour) && (hour <= 24), ErrorHandler::InternalErrorType::InvalidDate);
-	ASSERT_INTERNAL((0 <= minute) && (minute <= 60), ErrorHandler::InternalErrorType::InvalidDate);
-	ASSERT_INTERNAL((0 <= second) && (second <= 60), ErrorHandler::InternalErrorType::InvalidDate);
+	ASSERT_INTERNAL(hour <= 24, ErrorHandler::InternalErrorType::InvalidDate);
+	ASSERT_INTERNAL(minute <= 60, ErrorHandler::InternalErrorType::InvalidDate);
+	ASSERT_INTERNAL(second <= 60, ErrorHandler::InternalErrorType::InvalidDate);
 
 	this->year = year;
 	this->month = month;
diff --git a/src/Helpers/TimeHelper.cpp b/src/Helpers/TimeHelper.cpp
index 5a72e2f95fbc617b5bbaa526d84a97608442b86e..84beb4ac6fb2280f9e5489852112c65f5616ba03 100644
--- a/src/Helpers/TimeHelper.cpp
+++ b/src/Helpers/TimeHelper.cpp
@@ -18,11 +18,11 @@ uint32_t TimeHelper::utcToSeconds(TimeAndDate &TimeInfo) {
 	        ErrorHandler::InternalErrorType::InvalidDate);
 	ASSERT_INTERNAL((1 <= TimeInfo.day) && (TimeInfo.day <= 31),
 	        ErrorHandler::InternalErrorType::InvalidDate);
-	ASSERT_INTERNAL((0 <= TimeInfo.hour) && (TimeInfo.hour <= 24),
+	ASSERT_INTERNAL(TimeInfo.hour <= 24,
 	        ErrorHandler::InternalErrorType::InvalidDate);
-	ASSERT_INTERNAL((0 <= TimeInfo.minute) && (TimeInfo.minute <= 60),
+	ASSERT_INTERNAL(TimeInfo.minute <= 60,
 	        ErrorHandler::InternalErrorType::InvalidDate);
-	ASSERT_INTERNAL((0 <= TimeInfo.second) && (TimeInfo.second <= 60),
+	ASSERT_INTERNAL(TimeInfo.second <= 60,
 	        ErrorHandler::InternalErrorType::InvalidDate);
 
 	uint32_t secs = 1546300800; // elapsed seconds from Unix epoch until 1/1/2019 00:00:00 (UTC)
@@ -30,7 +30,7 @@ uint32_t TimeHelper::utcToSeconds(TimeAndDate &TimeInfo) {
 		secs += (IsLeapYear(y) ? 366 : 365) * SECONDS_PER_DAY;
 	}
 	for (uint16_t m = 1; m < TimeInfo.month; ++m) {
-		secs += DaysOfMonth[m - 1] * SECONDS_PER_DAY;
+		secs += DaysOfMonth[m - 1u] * SECONDS_PER_DAY;
 		if ((m == 2u) && IsLeapYear(TimeInfo.year)) {
 			secs += SECONDS_PER_DAY;
 		}
diff --git a/src/Service.cpp b/src/Service.cpp
index 061053b138757977ac68c4ec9ed1ea390bd4d602..559315bd7ed54f3840139c3303b3b65eccb71e25 100644
--- a/src/Service.cpp
+++ b/src/Service.cpp
@@ -1,3 +1,3 @@
 #include "Service.hpp"
 
-// Nothing exists here yet
\ No newline at end of file
+// Nothing exists here yet
diff --git a/test/Services/MemoryManagementService.cpp b/test/Services/MemoryManagementService.cpp
index ec1ef2d5c0e4094d1905ad3ebfcc342d5adef396..781aa17f08cadff2971f32e55d3858ceb111ccc1 100644
--- a/test/Services/MemoryManagementService.cpp
+++ b/test/Services/MemoryManagementService.cpp
@@ -38,7 +38,6 @@ TEST_CASE("TM[6,5]", "[service][st06]") {
 	uint8_t checkString[ECSS_MAX_STRING_SIZE];
 	uint16_t readSize = 0, checksum = 0;
 
-	MemoryManagementService memMangService;
 	Message receivedPacket = Message(6, 5, Message::TC, 1);
 	receivedPacket.appendEnum8(MemoryManagementService::MemoryID::EXTERNAL); // Memory ID
 	receivedPacket.appendUint16(3); // Iteration count (Equal to 3 test strings)
@@ -100,7 +99,6 @@ TEST_CASE("TM[6,9]", "[service][st06]") {
 	uint8_t testString_2[8] = "SecStrT";
 	uint16_t readSize = 0, checksum = 0;
 
-	MemoryManagementService memMangService;
 	Message receivedPacket = Message(6, 9, Message::TC, 1);
 	receivedPacket.appendEnum8(MemoryManagementService::MemoryID::EXTERNAL); // Memory ID
 	receivedPacket.appendUint16(2); // Iteration count
diff --git a/test/Services/TimeBasedSchedulingService.cpp b/test/Services/TimeBasedSchedulingService.cpp
index bfa878325c513b2a28dd5f1c840cd5d414a7c7ba..daee588c5404096ee09166cc8b4fa3049357c150 100644
--- a/test/Services/TimeBasedSchedulingService.cpp
+++ b/test/Services/TimeBasedSchedulingService.cpp
@@ -23,9 +23,12 @@ namespace unit_test {
 		static auto scheduledActivities(TimeBasedSchedulingService &tmService) {
 			std::vector<TimeBasedSchedulingService::ScheduledActivity*>listElements;
 
-			for (auto &element : tmService.scheduledActivities) {
-				listElements.push_back(&element);
-			}
+			std::transform(tmService.scheduledActivities.begin(),
+				tmService.scheduledActivities.end(),
+				std::back_inserter(listElements),
+				[](auto & activity) -> auto { return &activity; }
+			);
+
 			return listElements; // Return the list elements
 		}
 	};
@@ -427,12 +430,12 @@ TEST_CASE("TC[11,5] Activity deletion by ID", "[service][st11]") {
 
 TEST_CASE("TC[11,3] Reset schedule", "[service][st11]") {
 	TimeBasedSchedulingService timeService;
-	auto scheduledActivities = activityInsertion(timeService);
+	activityInsertion(timeService);
 
 	Message receivedMessage(11, 3, Message::TC, 1);
 
 	timeService.resetSchedule(receivedMessage);
-	scheduledActivities = unit_test::Tester::scheduledActivities(timeService); // Get the new list
+	auto scheduledActivities = unit_test::Tester::scheduledActivities(timeService); // Get the new list
 
 	REQUIRE(scheduledActivities.empty());
 	REQUIRE(not unit_test::Tester::executionFunctionStatus(timeService));