diff --git a/Software/src/devboard/utils/events.cpp b/Software/src/devboard/utils/events.cpp
index 8e619c03..3c0783bf 100644
--- a/Software/src/devboard/utils/events.cpp
+++ b/Software/src/devboard/utils/events.cpp
@@ -3,8 +3,8 @@
 #include "../../../USER_SETTINGS.h"
 #include "../config.h"
 
-static unsigned long previous_millis = 0;
-static uint32_t time_seconds = 0;
+unsigned long previous_millis = 0;
+uint32_t time_seconds = 0;
 static uint8_t total_led_color = GREEN;
 static char event_message[256];
 EVENTS_STRUCT_TYPE entries[EVENT_NOF_EVENTS];
diff --git a/Software/src/devboard/utils/events.h b/Software/src/devboard/utils/events.h
index ba8a0ba9..aaa26b17 100644
--- a/Software/src/devboard/utils/events.h
+++ b/Software/src/devboard/utils/events.h
@@ -3,6 +3,8 @@
 
 #ifndef UNIT_TEST
 #include <Arduino.h>
+extern unsigned long time_seconds;
+extern uint32_t previous_millis;
 #endif
 
 #include <stdint.h>
diff --git a/Software/src/devboard/webserver/webserver.h b/Software/src/devboard/webserver/webserver.h
index efb4b3f1..caa3c1ac 100644
--- a/Software/src/devboard/webserver/webserver.h
+++ b/Software/src/devboard/webserver/webserver.h
@@ -65,13 +65,13 @@ extern uint16_t OBC_Charge_Power;
  */
 void init_webserver();
 
-/*
- * @brief loop for monitoring wifi.
+/**
+ * @brief Monitoring loop for WiFi. Will attempt to reconnect to access point if the connection goes down.
  *
  * @param[in] void
- *
+ * 
  * @return void
-*/
+ */
 void wifi_monitor();
 
 /**
diff --git a/test/utils/events_test.cpp b/test/utils/events_test.cpp
index 1d6c0748..8d647d8b 100644
--- a/test/utils/events_test.cpp
+++ b/test/utils/events_test.cpp
@@ -1,9 +1,14 @@
 // The test library must be included first!
-#include "test_lib.h"
+#include "../test_lib.h"
 
-#include "events.cpp"
+#include "../../Software/src/devboard/utils/events.h"
+
+#define EVENTLOGGING
+#define DUMMY_EVENT_ENABLED true
 
 /* Helper functions */
+static char event_message[256]; // Declare the event_message variable
+
 static void reset_event_msg(void) {
   snprintf(event_message, sizeof(event_message), "");
 }
diff --git a/test/utils/timer_test.cpp b/test/utils/timer_test.cpp
index 268c9021..27ee0293 100644
--- a/test/utils/timer_test.cpp
+++ b/test/utils/timer_test.cpp
@@ -1,7 +1,7 @@
 // The test library must be included first!
 #include "../test_lib.h"
 
-#include "timer.cpp"
+#include "../../Software/src/devboard/utils/timer.cpp"
 
 /* Helper functions */