diff --git a/.vscode/settings.json b/.vscode/settings.json
index c128d0f..65a6d92 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -1,8 +1,10 @@
 {
     "python.testing.pytestArgs": [
-        "test"
+        "tests"
     ],
     "python.testing.unittestEnabled": false,
     "python.testing.pytestEnabled": true,
-    "python.analysis.typeCheckingMode": "basic"
+    "python.analysis.typeCheckingMode": "basic",
+    "python.terminal.activateEnvironment": true,
+    "python-envs.defaultEnvManager": "uv",
 }
\ No newline at end of file
diff --git a/test/test_alpine_bits_helper.py b/tests/test_alpine_bits_helper.py
similarity index 100%
rename from test/test_alpine_bits_helper.py
rename to tests/test_alpine_bits_helper.py
diff --git a/test/test_alpine_bits_server.py b/tests/test_alpine_bits_server.py
similarity index 100%
rename from test/test_alpine_bits_server.py
rename to tests/test_alpine_bits_server.py
diff --git a/test/test_alpine_bits_server_read.py b/tests/test_alpine_bits_server_read.py
similarity index 100%
rename from test/test_alpine_bits_server_read.py
rename to tests/test_alpine_bits_server_read.py
diff --git a/test/test_alpinebits_server_ping.py b/tests/test_alpinebits_server_ping.py
similarity index 100%
rename from test/test_alpinebits_server_ping.py
rename to tests/test_alpinebits_server_ping.py
diff --git a/test/test_data/Handshake-OTA_PingRQ.xml b/tests/test_data/Handshake-OTA_PingRQ.xml
similarity index 100%
rename from test/test_data/Handshake-OTA_PingRQ.xml
rename to tests/test_data/Handshake-OTA_PingRQ.xml
diff --git a/test/test_data/Handshake-OTA_PingRS.xml b/tests/test_data/Handshake-OTA_PingRS.xml
similarity index 100%
rename from test/test_data/Handshake-OTA_PingRS.xml
rename to tests/test_data/Handshake-OTA_PingRS.xml
diff --git a/test/test_data/test_form1.json b/tests/test_data/test_form1.json
similarity index 100%
rename from test/test_data/test_form1.json
rename to tests/test_data/test_form1.json
diff --git a/test/test_data/test_form2.json b/tests/test_data/test_form2.json
similarity index 100%
rename from test/test_data/test_form2.json
rename to tests/test_data/test_form2.json
diff --git a/test/test_data/test_form3.json b/tests/test_data/test_form3.json
similarity index 100%
rename from test/test_data/test_form3.json
rename to tests/test_data/test_form3.json
diff --git a/test/test_data/test_form4.json b/tests/test_data/test_form4.json
similarity index 100%
rename from test/test_data/test_form4.json
rename to tests/test_data/test_form4.json
diff --git a/tests/test_output/actual_ping_response.xml b/tests/test_output/actual_ping_response.xml
new file mode 100644
index 0000000..710f8aa
--- /dev/null
+++ b/tests/test_output/actual_ping_response.xml
@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<OTA_PingRS xmlns="http://www.opentravel.org/OTA/2003/05" Version="7.000">
+  <Success/>
+  <Warnings>
+    <Warning Type="11" Status="ALPINEBITS_HANDSHAKE">{
+  "versions": [
+    {
+      "version": "2024-10",
+      "actions": [
+        {
+          "action": "action_OTA_Read"
+        },
+        {
+          "action": "action_OTA_HotelResNotif_GuestRequests"
+        }
+      ]
+    },
+    {
+      "version": "2022-10",
+      "actions": [
+        {
+          "action": "action_OTA_Ping"
+        },
+        {
+          "action": "action_OTA_Read"
+        },
+        {
+          "action": "action_OTA_HotelResNotif_GuestRequests"
+        }
+      ]
+    }
+  ]
+}</Warning>
+  </Warnings>
+  <EchoData>{
+  "versions": [
+    {
+      "version": "2024-10",
+      "actions": [
+        {
+          "action": "action_OTA_Read"
+        },
+        {
+          "action": "action_OTA_HotelResNotif_GuestRequests"
+        }
+      ]
+    },
+    {
+      "version": "2022-10",
+      "actions": [
+        {
+          "action": "action_OTA_Read"
+        },
+        {
+          "action": "action_OTA_Ping"
+        },
+        {
+          "action": "action_OTA_HotelResNotif_GuestRequests"
+        }
+      ]
+    }
+  ]
+}</EchoData>
+</OTA_PingRS>
diff --git a/tests/test_output/expected_ping_response.xml b/tests/test_output/expected_ping_response.xml
new file mode 100644
index 0000000..555c9c9
--- /dev/null
+++ b/tests/test_output/expected_ping_response.xml
@@ -0,0 +1,81 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!-- 
+    AlpineBits 2024-10
+    https://www.alpinebits.org/
+
+    Sample message file for a Handshake response
+
+    Changelog:
+    v. 2024-10 1.2 Example extended with all capabilities and two supported releases
+    v. 2024-10 1.1 Removed the OTA_Ping action    
+    v. 2024-10 1.0 added supported version 2024-10 in the example
+    v. 2018-10 1.0 initial example
+-->
+
+<OTA_PingRS xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+            xmlns="http://www.opentravel.org/OTA/2003/05"
+            xsi:schemaLocation="http://www.opentravel.org/OTA/2003/05 OTA_PingRS.xsd"
+            Version="8.000">
+    <Success/>
+	<Warnings>
+		<Warning Type="11" Status="ALPINEBITS_HANDSHAKE">{
+  "versions": [
+    {
+      "version": "2024-10",
+      "actions": [
+        {
+          "action": "action_OTA_Read"
+        },
+        {
+          "action": "action_OTA_HotelResNotif_GuestRequests"
+        }
+      ]
+    },
+    {
+      "version": "2022-10",
+      "actions": [
+        {
+          "action": "action_OTA_Ping"
+        },
+        {
+          "action": "action_OTA_Read"
+        },
+        {
+          "action": "action_OTA_HotelResNotif_GuestRequests"
+        }
+      ]
+    }
+  ]
+}</Warning>
+	</Warnings>
+	<EchoData>{
+  "versions": [
+    {
+      "version": "2024-10",
+      "actions": [
+        {
+          "action": "action_OTA_Read"
+        },
+        {
+          "action": "action_OTA_HotelResNotif_GuestRequests"
+        }
+      ]
+    },
+    {
+      "version": "2022-10",
+      "actions": [
+        {
+          "action": "action_OTA_Read"
+        },
+        {
+          "action": "action_OTA_Ping"
+        },
+        {
+          "action": "action_OTA_HotelResNotif_GuestRequests"
+        }
+      ]
+    }
+  ]
+}</EchoData>
+</OTA_PingRS>
\ No newline at end of file