diff --git a/src/corelibs/wifi/test_wifi_udp_client.cpp b/src/corelibs/wifi/test_wifi_udp_client.cpp
index e1b2eff..6214e03 100644
--- a/src/corelibs/wifi/test_wifi_udp_client.cpp
+++ b/src/corelibs/wifi/test_wifi_udp_client.cpp
@@ -20,6 +20,24 @@ TEST_IFX(wifi_udp_client, wifi_connect_to_ap) {
     TEST_ASSERT_EQUAL_INT(WL_CONNECTED, result);
 }
 
+TEST_IFX(wifi_udp_client, udp_beginpacket) {
+    IPAddress ip(127, 0, 0, 1);
+    uint16_t port = 80;
+    TEST_ASSERT_TRUE(udpClient.beginPacket(ip, port)); // Start a packet to send
+}
+
+TEST_IFX(wifi_udp_client, udp_write){
+    const char *message = "Hello, UDP!";
+    size_t bytes_written = udpClient.write(message[0]); // Write a single byte
+    TEST_ASSERT_EQUAL_INT(1, bytes_written); // Check if all bytes were written
+
+    bytes_written = udpClient.write((const uint8_t *)message, strlen(message));
+    TEST_ASSERT_EQUAL_INT(strlen(message), bytes_written); // Check if all bytes were written
+}
+
 TEST_GROUP_RUNNER(wifi_udp_client) {
     RUN_TEST_CASE(wifi_udp_client, wifi_connect_to_ap);
+    RUN_TEST_CASE(wifi_udp_client, udp_beginpacket);
+    RUN_TEST_CASE(wifi_udp_client, udp_write);
+    while (true) {}; // Keep the client running
 }
\ No newline at end of file
diff --git a/src/corelibs/wifi/test_wifi_udp_server.cpp b/src/corelibs/wifi/test_wifi_udp_server.cpp
index 8735769..41db33b 100644
--- a/src/corelibs/wifi/test_wifi_udp_server.cpp
+++ b/src/corelibs/wifi/test_wifi_udp_server.cpp
@@ -28,21 +28,8 @@ TEST_IFX(wifi_udp_server, udp_begin) {
     Serial.println(port);
 }
 
-TEST_IFX(wifi_udp_server, udp_beginpacket) {
-    IPAddress ip(127, 0, 0, 1);
-    uint16_t port = 80;
-    TEST_ASSERT_TRUE(udpServer.beginPacket(ip, port)); // Start a packet to send
-}
-   
-TEST_IFX(wifi_udp_server, udp_stop) {
-    udpServer.stop();
-    TEST_ASSERT_EQUAL_INT(SOCKET_STATUS_UNINITED, socket.status());
-}
-
 TEST_GROUP_RUNNER(wifi_udp_server) {
     RUN_TEST_CASE(wifi_udp_server, begin_ap);
     RUN_TEST_CASE(wifi_udp_server, udp_begin);
-    RUN_TEST_CASE(wifi_udp_server, udp_beginpacket);
-    RUN_TEST_CASE(wifi_udp_server, udp_stop);
     while (true) {}; // Keep the server running
 }
\ No newline at end of file