diff --git a/src/g2_2025_grade_calculator_pkg/test/FinalGradeDeterminator.test.cpp b/src/g2_2025_grade_calculator_pkg/test/FinalGradeDeterminator.test.cpp
index 311a332..4be2461 100644
--- a/src/g2_2025_grade_calculator_pkg/test/FinalGradeDeterminator.test.cpp
+++ b/src/g2_2025_grade_calculator_pkg/test/FinalGradeDeterminator.test.cpp
@@ -14,30 +14,31 @@ using namespace assignments::one::final_grade_determinator;
 
 namespace assignments::one {
 
-class FakeDatabaseManager : public DatabaseManager {
+struct MockStoredResult {
+    StudentCourse sc;
+    int exam_count;
+    int final_grade;
+};
+
+class MockDatabaseManager : public DatabaseManager {
 public:
-    explicit FakeDatabaseManager(rclcpp::Logger logger = rclcpp::get_logger("fake_db"))
-        : DatabaseManager(logger) {}
+    explicit MockDatabaseManager(rclcpp::Logger logger = rclcpp::get_logger("fake_db"))
+        : DatabaseManager(logger) {
+    }
 
     bool is_connected() const override {
         return true; // Always pretend we are connected
     }
 
     bool store_final_course_result(const StudentCourse& sc, int exam_count, int final_grade) override {
-        stored_results_.push_back({sc, exam_count, final_grade});
+        stored_results_.push_back({ sc, exam_count, final_grade });
         return true; // Always succeed
     }
 
     void init_database() override {
-        // No-op for fake
-    }
+    } // no-op
 
-    struct StoredResult {
-        StudentCourse sc;
-        int exam_count;
-        int final_grade;
-    };
-    std::vector<StoredResult> stored_results_;
+    std::vector<MockStoredResult> stored_results_;
 };
 
 } // namespace assignments::one
@@ -66,14 +67,14 @@ protected:
         grade_calculator_service_ = test_node_->create_service<g2_2025_interfaces::srv::Exams>(
             "grade_calculator_service",
             [this](const g2_2025_interfaces::srv::Exams::Request::SharedPtr request,
-                   g2_2025_interfaces::srv::Exams::Response::SharedPtr response) {
-                service_requests_.push_back(*request);
-                // Mock calculation - average of grades
-                int sum = 0;
-                for (const auto& grade : request->exam_grades) {
-                    sum += grade;
-                }
-                response->result = sum / request->exam_grades.size();
+                g2_2025_interfaces::srv::Exams::Response::SharedPtr response) {
+                    service_requests_.push_back(*request);
+                    // Mock calculation - average of grades
+                    int sum = 0;
+                    for (const auto& grade : request->exam_grades) {
+                        sum += grade;
+                    }
+                    response->result = sum / request->exam_grades.size();
             }
         );
 
@@ -89,21 +90,25 @@ protected:
     }
 
     void create_final_grade_determinator() {
-        fake_db_ = std::make_unique<assignments::one::FakeDatabaseManager>();
+        fake_db_ = std::make_unique<assignments::one::MockDatabaseManager>();
         final_grade_determinator_ = std::make_shared<FinalGradeDeterminator>(std::move(fake_db_));
     }
 
     void spin_some_time(std::chrono::milliseconds duration = 100ms) {
         auto start_time = std::chrono::steady_clock::now();
+
         while (std::chrono::steady_clock::now() - start_time < duration) {
             rclcpp::spin_some(test_node_);
+
             if (final_grade_determinator_) {
                 rclcpp::spin_some(final_grade_determinator_);
             }
+
             std::this_thread::sleep_for(10ms);
         }
     }
-    std::unique_ptr<assignments::one::FakeDatabaseManager> fake_db_;
+
+    std::unique_ptr<assignments::one::MockDatabaseManager> fake_db_;
     std::shared_ptr<rclcpp::Node> test_node_;
     std::shared_ptr<FinalGradeDeterminator> final_grade_determinator_;
     rclcpp::Subscription<g2_2025_interfaces::msg::Student>::SharedPtr student_subscriber_;
@@ -113,6 +118,8 @@ protected:
     std::vector<g2_2025_interfaces::srv::Exams::Request> service_requests_;
 };
 
+// ---- TEST CASES ----
+
 TEST_F(FinalGradeDeterminatorTest, ConstructorTest) {
     ASSERT_NO_THROW({
         create_final_grade_determinator();
@@ -127,7 +134,7 @@ TEST_F(FinalGradeDeterminatorTest, ExamCollectionTest) {
 
     const std::string student_name = "Test Student";
     const std::string course_name = "Test Course";
-    std::vector<int> grades = {80, 85, 90, 75, 95};
+    std::vector<int> grades = { 80, 85, 90, 75, 95 };
 
     // Send 5 exam results (default collection amount)
     for (const auto& grade : grades) {
@@ -162,7 +169,7 @@ TEST_F(FinalGradeDeterminatorTest, PartialExamCollectionTest) {
     // Send only 3 exam results (less than required 5)
     const std::string student_name = "Test Student";
     const std::string course_name = "Test Course";
-    std::vector<int> grades = {80, 85, 90};
+    std::vector<int> grades = { 80, 85, 90 };
 
     for (const auto& grade : grades) {
         auto msg = std::make_shared<g2_2025_interfaces::msg::Exam>();
@@ -187,9 +194,9 @@ TEST_F(FinalGradeDeterminatorTest, MultipleStudentsTest) {
     create_final_grade_determinator();
     spin_some_time(500ms);
 
-    std::vector<std::string> students = {"Alice", "Bob"};
+    std::vector<std::string> students = { "Alice", "Bob" };
     const std::string course_name = "Test Course";
-    std::vector<int> grades = {80, 85, 90, 75, 95};
+    std::vector<int> grades = { 80, 85, 90, 75, 95 };
 
     // Send complete set of grades for each student
     for (const auto& student : students) {
diff --git a/src/g2_2025_grade_calculator_pkg/test/GradeCalculator.test.cpp b/src/g2_2025_grade_calculator_pkg/test/GradeCalculator.test.cpp
index c213ec4..c3d9a65 100644
--- a/src/g2_2025_grade_calculator_pkg/test/GradeCalculator.test.cpp
+++ b/src/g2_2025_grade_calculator_pkg/test/GradeCalculator.test.cpp
@@ -12,7 +12,7 @@ class GradeCalculatorTest : public ::testing::Test
 protected:
     static void SetUpTestSuite() {
         int argc = 0;
-        char **argv = nullptr;
+        char** argv = nullptr;
         rclcpp::init(argc, argv);
     }
 
@@ -49,7 +49,7 @@ protected:
         client_node_.reset();
     }
 
-    int call_service(const std::string &name, const std::vector<int> &grades)
+    int call_service(const std::string& name, const std::vector<int>& grades)
     {
         if (!client_->wait_for_service(5s)) {
             throw std::runtime_error("Service not available");
@@ -77,27 +77,22 @@ protected:
 
 // ---- TEST CASES ----
 
-TEST_F(GradeCalculatorTest, NormalAverage)
-{
-    EXPECT_EQ(call_service("Alice", {80, 90, 70}), 80);
+TEST_F(GradeCalculatorTest, NormalAverage) {
+    EXPECT_EQ(call_service("Alice", { 80, 90, 70 }), 80);
 }
 
-TEST_F(GradeCalculatorTest, WesselBonus)
-{
-    EXPECT_EQ(call_service("Wessel", {80, 90, 70}), 90);
+TEST_F(GradeCalculatorTest, WesselBonus) {
+    EXPECT_EQ(call_service("Wessel", { 80, 90, 70 }), 90);
 }
 
-TEST_F(GradeCalculatorTest, wesselBonus)
-{
-    EXPECT_EQ(call_service("wessel", {80, 90, 70}), 90);
+TEST_F(GradeCalculatorTest, wesselBonus) {
+    EXPECT_EQ(call_service("wessel", { 80, 90, 70 }), 90);
 }
 
-TEST_F(GradeCalculatorTest, GradeTooHigh)
-{
-    EXPECT_EQ(call_service("Wessel", {100, 100, 100}), 100);
+TEST_F(GradeCalculatorTest, GradeTooHigh) {
+    EXPECT_EQ(call_service("Wessel", { 100, 100, 100 }), 100);
 }
 
-TEST_F(GradeCalculatorTest, GradeTooLow)
-{
-    EXPECT_EQ(call_service("Alice", {0, 0, 0}), 10);
+TEST_F(GradeCalculatorTest, GradeTooLow) {
+    EXPECT_EQ(call_service("Alice", { 0, 0, 0 }), 10);
 }