diff --git a/tests/status_parsing/jsonfiles/12.2.0.2/STATUS.json b/tests/status_parsing/jsonfiles/12.2.0.2/STATUS.json
index 4280368..f42e462 100644
--- a/tests/status_parsing/jsonfiles/12.2.0.2/STATUS.json
+++ b/tests/status_parsing/jsonfiles/12.2.0.2/STATUS.json
@@ -1,19 +1,23 @@
 {
   "Status": {
-    "Module": 6,
+    "ButtonRetain": 0,
+    "ButtonTopic": "0",
     "DeviceName": "Tasmota",
     "FriendlyName": [
       "Tasmota"
     ],
-    "Topic": "tasmota_1A704F",
-    "ButtonTopic": "0",
+    "InfoRetain": 0,
+    "LedMask": "FFFF",
+    "LedState": 1,
+    "Module": 6,
     "Power": 1,
     "PowerOnState": 3,
-    "LedState": 1,
-    "LedMask": "FFFF",
+    "PowerRetain": 0,
     "SaveData": 1,
     "SaveState": 1,
-    "SwitchTopic": "0",
+    "SensorRetain": 0,
+    "StateRetain": 0,
+    "StatusRetain": 0,
     "SwitchMode": [
       0,
       0,
@@ -24,12 +28,8 @@
       0,
       0
     ],
-    "ButtonRetain": 0,
     "SwitchRetain": 0,
-    "SensorRetain": 0,
-    "PowerRetain": 0,
-    "InfoRetain": 0,
-    "StateRetain": 0,
-    "StatusRetain": 0
+    "SwitchTopic": "0",
+    "Topic": "tasmota_1A704F"
   }
 }
\ No newline at end of file
diff --git a/tests/status_parsing/jsonfiles/12.2.0.2/STATUS1.json b/tests/status_parsing/jsonfiles/12.2.0.2/STATUS1.json
index 062e9ee..c55f514 100644
--- a/tests/status_parsing/jsonfiles/12.2.0.2/STATUS1.json
+++ b/tests/status_parsing/jsonfiles/12.2.0.2/STATUS1.json
@@ -1,17 +1,17 @@
 {
   "StatusPRM": {
+    "BCResetTime": "2022-11-05T18:47:52",
     "Baudrate": 115200,
-    "SerialConfig": "8N1",
+    "BootCount": 12,
+    "CfgHolder": 4617,
     "GroupTopic": "tasmotas",
     "OtaUrl": "http://ota.tasmota.com/tasmota/release/tasmota.bin.gz",
     "RestartReason": "Power On",
-    "Uptime": "94T04:19:39",
-    "StartupUTC": "2023-10-09T15:15:19",
-    "Sleep": 50,
-    "CfgHolder": 4617,
-    "BootCount": 12,
-    "BCResetTime": "2022-11-05T18:47:52",
+    "SaveAddress": "FB000",
     "SaveCount": 896,
-    "SaveAddress": "FB000"
+    "SerialConfig": "8N1",
+    "Sleep": 50,
+    "StartupUTC": "2023-10-09T15:15:19",
+    "Uptime": "94T04:19:39"
   }
-}
+}
\ No newline at end of file
diff --git a/tests/status_parsing/jsonfiles/12.2.0.2/STATUS2.json b/tests/status_parsing/jsonfiles/12.2.0.2/STATUS2.json
index 20c20d8..6da3069 100644
--- a/tests/status_parsing/jsonfiles/12.2.0.2/STATUS2.json
+++ b/tests/status_parsing/jsonfiles/12.2.0.2/STATUS2.json
@@ -1,12 +1,12 @@
 {
   "StatusFWR": {
-    "Version": "12.2.0.2(tasmota)",
-    "BuildDateTime": "2022-11-03T16:54:39",
     "Boot": 31,
+    "BuildDateTime": "2022-11-03T16:54:39",
+    "CR": "369/699",
     "Core": "2_7_4_9",
-    "SDK": "2.2.2-dev(38a443e)",
     "CpuFrequency": 80,
     "Hardware": "ESP8266EX",
-    "CR": "369/699"
+    "SDK": "2.2.2-dev(38a443e)",
+    "Version": "12.2.0.2(tasmota)"
   }
-}
+}
\ No newline at end of file
diff --git a/tests/status_parsing/jsonfiles/14.2.0.4/STATUS5.1.json b/tests/status_parsing/jsonfiles/14.2.0.4/STATUS5.1.json
index 3a82b2a..bb765d1 100644
--- a/tests/status_parsing/jsonfiles/14.2.0.4/STATUS5.1.json
+++ b/tests/status_parsing/jsonfiles/14.2.0.4/STATUS5.1.json
@@ -1,27 +1,27 @@
 {
   "StatusNET": {
-    "Hostname": "tasmota-68FF94-8084",
-    "IPAddress": "0.0.0.0",
-    "Gateway": "192.168.7.1",
-    "Subnetmask": "255.255.255.0",
     "DNSServer1": "192.168.7.1",
     "DNSServer2": "0.0.0.0",
-    "Mac": "34:98:7A:68:FF:94",
-    "IP6Global": "",
-    "IP6Local": "",
     "Ethernet": {
-      "Hostname": "tasmota-68FF94-8084eth",
-      "IPAddress": "192.168.7.187",
-      "Gateway": "192.168.7.1",
-      "Subnetmask": "255.255.255.0",
       "DNSServer1": "192.168.7.1",
       "DNSServer2": "0.0.0.0",
-      "Mac": "34:98:7A:68:FF:97",
+      "Gateway": "192.168.7.1",
+      "Hostname": "tasmota-68FF94-8084eth",
       "IP6Global": "",
-      "IP6Local": "fe80::3698:7aff:fe68:ff97%en1"
+      "IP6Local": "fe80::3698:7aff:fe68:ff97%en1",
+      "IPAddress": "192.168.7.187",
+      "Mac": "34:98:7A:68:FF:97",
+      "Subnetmask": "255.255.255.0"
     },
-    "Webserver": 2,
+    "Gateway": "192.168.7.1",
     "HTTP_API": 1,
+    "Hostname": "tasmota-68FF94-8084",
+    "IP6Global": "",
+    "IP6Local": "",
+    "IPAddress": "0.0.0.0",
+    "Mac": "34:98:7A:68:FF:94",
+    "Subnetmask": "255.255.255.0",
+    "Webserver": 2,
     "WifiConfig": 0,
     "WifiPower": 17.0
   }
diff --git a/tests/status_parsing/jsonfiles/14.2.0.4/STATUS5.json b/tests/status_parsing/jsonfiles/14.2.0.4/STATUS5.json
index 73c6a4e..fd6b062 100644
--- a/tests/status_parsing/jsonfiles/14.2.0.4/STATUS5.json
+++ b/tests/status_parsing/jsonfiles/14.2.0.4/STATUS5.json
@@ -1,27 +1,27 @@
 {
   "StatusNET": {
-    "Hostname": "xxxxxxxx",
-    "IPAddress": "192.168.0.1",
-    "Gateway": "192.168.0.99",
-    "Subnetmask": "255.255.254.0",
     "DNSServer1": "192.168.0.99",
     "DNSServer2": "0.0.0.0",
-    "Mac": "xx:xx:xx:xx:xx:xx",
-    "IP6Global": "xxxx:::::::xxxx",
-    "IP6Local": "fe80::xxxx:xxxx:xxxx:xxxx%st3",
     "Ethernet": {
-      "Hostname": "xxxxxxxx-eth",
-      "IPAddress": "192.168.0.2",
-      "Gateway": "192.168.0.99",
-      "Subnetmask": "255.255.254.0",
       "DNSServer1": "192.168.0.99",
       "DNSServer2": "0.0.0.0",
-      "Mac": "xx:xx:xx:xx:xx:xx",
+      "Gateway": "192.168.0.99",
+      "Hostname": "xxxxxxxx-eth",
       "IP6Global": "xxxx:::::::xxxx",
-      "IP6Local": "fe80::xxxx:xxxx:xxxx:xxxx%en1"
+      "IP6Local": "fe80::xxxx:xxxx:xxxx:xxxx%en1",
+      "IPAddress": "192.168.0.2",
+      "Mac": "xx:xx:xx:xx:xx:xx",
+      "Subnetmask": "255.255.254.0"
     },
-    "Webserver": 2,
+    "Gateway": "192.168.0.99",
     "HTTP_API": 1,
+    "Hostname": "xxxxxxxx",
+    "IP6Global": "xxxx:::::::xxxx",
+    "IP6Local": "fe80::xxxx:xxxx:xxxx:xxxx%st3",
+    "IPAddress": "192.168.0.1",
+    "Mac": "xx:xx:xx:xx:xx:xx",
+    "Subnetmask": "255.255.254.0",
+    "Webserver": 2,
     "WifiConfig": 4,
     "WifiPower": 0.0
   }
diff --git a/tests/status_parsing/jsonfiles/6.3.0.12/STATE.json b/tests/status_parsing/jsonfiles/6.3.0.12/STATE.json
index 5daa964..407b977 100644
--- a/tests/status_parsing/jsonfiles/6.3.0.12/STATE.json
+++ b/tests/status_parsing/jsonfiles/6.3.0.12/STATE.json
@@ -1,13 +1,13 @@
 {
+  "POWER1": "OFF",
   "Time": "2024-01-12T06:29:01",
   "Uptime": "2T05:25:48",
   "Vcc": 3.258,
-  "POWER1": "OFF",
   "Wifi": {
     "AP": 1,
-    "SSId": "xxx",
     "BSSId": "F0:9F:C2:03:CD:73",
     "Channel": 6,
-    "RSSI": 100
+    "RSSI": 100,
+    "SSId": "xxx"
   }
-}
+}
\ No newline at end of file
diff --git a/tests/status_parsing/jsonfiles/6.3.0.12/STATUS.json b/tests/status_parsing/jsonfiles/6.3.0.12/STATUS.json
index 826b85a..00fcd6a 100644
--- a/tests/status_parsing/jsonfiles/6.3.0.12/STATUS.json
+++ b/tests/status_parsing/jsonfiles/6.3.0.12/STATUS.json
@@ -1,17 +1,18 @@
 {
   "Status": {
-    "Module": 1,
+    "ButtonRetain": 0,
+    "ButtonTopic": "0",
     "FriendlyName": [
       "Sonoff_1"
     ],
-    "Topic": "sonoff_1",
-    "ButtonTopic": "0",
+    "LedState": 1,
+    "Module": 1,
     "Power": 1,
     "PowerOnState": 3,
-    "LedState": 1,
+    "PowerRetain": 0,
     "SaveData": 1,
     "SaveState": 1,
-    "SwitchTopic": "0",
+    "SensorRetain": 0,
     "SwitchMode": [
       0,
       0,
@@ -22,9 +23,8 @@
       0,
       0
     ],
-    "ButtonRetain": 0,
     "SwitchRetain": 0,
-    "SensorRetain": 0,
-    "PowerRetain": 0
+    "SwitchTopic": "0",
+    "Topic": "sonoff_1"
   }
 }
\ No newline at end of file
diff --git a/tests/status_parsing/jsonfiles/6.3.0.12/STATUS1.json b/tests/status_parsing/jsonfiles/6.3.0.12/STATUS1.json
index 4d865f2..8c9e798 100644
--- a/tests/status_parsing/jsonfiles/6.3.0.12/STATUS1.json
+++ b/tests/status_parsing/jsonfiles/6.3.0.12/STATUS1.json
@@ -1,14 +1,14 @@
 {
   "StatusPRM": {
     "Baudrate": 115200,
+    "BootCount": 420,
     "GroupTopic": "sonoffs",
     "OtaUrl": "http://sonoff.maddox.co.uk/tasmota/sonoff.ino.bin",
     "RestartReason": "Hardware Watchdog",
-    "Uptime": "1T19:36:45",
-    "StartupUTC": "2024-01-10T00:03:13",
-    "Sleep": 0,
-    "BootCount": 420,
+    "SaveAddress": "F6000",
     "SaveCount": 10693,
-    "SaveAddress": "F6000"
+    "Sleep": 0,
+    "StartupUTC": "2024-01-10T00:03:13",
+    "Uptime": "1T19:36:45"
   }
-}
+}
\ No newline at end of file
diff --git a/tests/status_parsing/jsonfiles/6.3.0.12/STATUS10.json b/tests/status_parsing/jsonfiles/6.3.0.12/STATUS10.json
index 3731aee..63246d0 100644
--- a/tests/status_parsing/jsonfiles/6.3.0.12/STATUS10.json
+++ b/tests/status_parsing/jsonfiles/6.3.0.12/STATUS10.json
@@ -1,10 +1,10 @@
 {
   "StatusSNS": {
-    "Time": "2024-01-11T20:39:58",
     "AM2301": {
-      "Temperature": 23.9,
-      "Humidity": 24.4
+      "Humidity": 24.4,
+      "Temperature": 23.9
     },
-    "TempUnit": "C"
+    "TempUnit": "C",
+    "Time": "2024-01-11T20:39:58"
   }
-}
+}
\ No newline at end of file
diff --git a/tests/status_parsing/jsonfiles/6.3.0.12/STATUS11.json b/tests/status_parsing/jsonfiles/6.3.0.12/STATUS11.json
index a530494..a873dd6 100644
--- a/tests/status_parsing/jsonfiles/6.3.0.12/STATUS11.json
+++ b/tests/status_parsing/jsonfiles/6.3.0.12/STATUS11.json
@@ -1,15 +1,15 @@
 {
   "StatusSTS": {
+    "POWER1": "ON",
     "Time": "2024-01-11T20:39:58",
     "Uptime": "1T19:36:45",
     "Vcc": 3.231,
-    "POWER1": "ON",
     "Wifi": {
       "AP": 1,
-      "SSId": "xxx",
       "BSSId": "F0:9F:C2:03:CD:73",
       "Channel": 6,
-      "RSSI": 100
+      "RSSI": 100,
+      "SSId": "xxx"
     }
   }
-}
+}
\ No newline at end of file
diff --git a/tests/status_parsing/jsonfiles/6.3.0.12/STATUS2.json b/tests/status_parsing/jsonfiles/6.3.0.12/STATUS2.json
index 96a18cc..9c51b7e 100644
--- a/tests/status_parsing/jsonfiles/6.3.0.12/STATUS2.json
+++ b/tests/status_parsing/jsonfiles/6.3.0.12/STATUS2.json
@@ -1,9 +1,9 @@
 {
   "StatusFWR": {
-    "Version": "6.3.0.12(sonoff)",
-    "BuildDateTime": "2018-11-23T14:07:50",
     "Boot": 4,
+    "BuildDateTime": "2018-11-23T14:07:50",
     "Core": "2_3_0",
-    "SDK": "1.5.3(aec24ac9)"
+    "SDK": "1.5.3(aec24ac9)",
+    "Version": "6.3.0.12(sonoff)"
   }
-}
+}
\ No newline at end of file
diff --git a/tests/status_parsing/jsonfiles/6.3.0.12/STATUS3.json b/tests/status_parsing/jsonfiles/6.3.0.12/STATUS3.json
index d14ac9d..4c52cf3 100644
--- a/tests/status_parsing/jsonfiles/6.3.0.12/STATUS3.json
+++ b/tests/status_parsing/jsonfiles/6.3.0.12/STATUS3.json
@@ -1,19 +1,19 @@
 {
   "StatusLOG": {
-    "SerialLog": 2,
-    "WebLog": 2,
-    "SysLog": 0,
     "LogHost": "192.168.0.130",
     "LogPort": 514,
     "SSId": [
       "xxx",
       "xxx-2"
     ],
-    "TelePeriod": 300,
+    "SerialLog": 2,
     "SetOption": [
       "54000009",
       "55818000",
       "00000001"
-    ]
+    ],
+    "SysLog": 0,
+    "TelePeriod": 300,
+    "WebLog": 2
   }
-}
+}
\ No newline at end of file
diff --git a/tests/status_parsing/jsonfiles/6.3.0.12/STATUS4.json b/tests/status_parsing/jsonfiles/6.3.0.12/STATUS4.json
index 62b4b48..009d6e3 100644
--- a/tests/status_parsing/jsonfiles/6.3.0.12/STATUS4.json
+++ b/tests/status_parsing/jsonfiles/6.3.0.12/STATUS4.json
@@ -1,18 +1,18 @@
 {
   "StatusMEM": {
-    "ProgramSize": 498,
-    "Free": 504,
-    "Heap": 18,
-    "ProgramFlashSize": 1024,
-    "FlashSize": 1024,
-    "FlashChipId": "1440E0",
-    "FlashMode": 3,
     "Features": [
       "00000809",
       "0FDAE794",
       "240383A0",
       "23B617CE",
       "00003BC0"
-    ]
+    ],
+    "FlashChipId": "1440E0",
+    "FlashMode": 3,
+    "FlashSize": 1024,
+    "Free": 504,
+    "Heap": 18,
+    "ProgramFlashSize": 1024,
+    "ProgramSize": 498
   }
-}
+}
\ No newline at end of file
diff --git a/tests/status_parsing/jsonfiles/6.3.0.12/STATUS5.json b/tests/status_parsing/jsonfiles/6.3.0.12/STATUS5.json
index 46b6ff7..f38013d 100644
--- a/tests/status_parsing/jsonfiles/6.3.0.12/STATUS5.json
+++ b/tests/status_parsing/jsonfiles/6.3.0.12/STATUS5.json
@@ -1,12 +1,12 @@
 {
   "StatusNET": {
+    "DNSServer": "192.168.1.130",
+    "Gateway": "192.168.1.1",
     "Hostname": "sonoff_1-3937",
     "IPAddress": "192.168.1.200",
-    "Gateway": "192.168.1.1",
-    "Subnetmask": "255.255.255.0",
-    "DNSServer": "192.168.1.130",
     "Mac": "5C:CF:7F:E7:4F:61",
+    "Subnetmask": "255.255.255.0",
     "Webserver": 2,
     "WifiConfig": 3
   }
-}
+}
\ No newline at end of file
diff --git a/tests/status_parsing/jsonfiles/6.3.0.12/STATUS6.json b/tests/status_parsing/jsonfiles/6.3.0.12/STATUS6.json
index 57f4930..9433d71 100644
--- a/tests/status_parsing/jsonfiles/6.3.0.12/STATUS6.json
+++ b/tests/status_parsing/jsonfiles/6.3.0.12/STATUS6.json
@@ -1,12 +1,12 @@
 {
   "StatusMQT": {
+    "KEEPALIVE": 15,
+    "MAX_PACKET_SIZE": 1000,
+    "MqttClient": "DVES_E74F61",
+    "MqttClientMask": "DVES_%06X",
     "MqttHost": "192.168.1.130",
     "MqttPort": 1883,
-    "MqttClientMask": "DVES_%06X",
-    "MqttClient": "DVES_E74F61",
-    "MqttUser": "DVES_USER",
     "MqttType": 1,
-    "MAX_PACKET_SIZE": 1000,
-    "KEEPALIVE": 15
+    "MqttUser": "DVES_USER"
   }
-}
+}
\ No newline at end of file
diff --git a/tests/status_parsing/jsonfiles/6.3.0.12/STATUS7.json b/tests/status_parsing/jsonfiles/6.3.0.12/STATUS7.json
index c4d0be8..5b514df 100644
--- a/tests/status_parsing/jsonfiles/6.3.0.12/STATUS7.json
+++ b/tests/status_parsing/jsonfiles/6.3.0.12/STATUS7.json
@@ -1,11 +1,11 @@
 {
   "StatusTIM": {
-    "UTC": "Thu Jan 11 19:39:58 2024",
+    "EndDST": "Sun Oct 27 03:00:00 2024",
     "Local": "Thu Jan 11 20:39:58 2024",
     "StartDST": "Sun Mar 31 02:00:00 2024",
-    "EndDST": "Sun Oct 27 03:00:00 2024",
-    "Timezone": "+01:00",
     "Sunrise": "08:41",
-    "Sunset": "17:14"
+    "Sunset": "17:14",
+    "Timezone": "+01:00",
+    "UTC": "Thu Jan 11 19:39:58 2024"
   }
-}
+}
\ No newline at end of file
diff --git a/tests/status_parsing/jsonfiles/7.0.0.4/STATE.json b/tests/status_parsing/jsonfiles/7.0.0.4/STATE.json
index b2fecef..437919c 100644
--- a/tests/status_parsing/jsonfiles/7.0.0.4/STATE.json
+++ b/tests/status_parsing/jsonfiles/7.0.0.4/STATE.json
@@ -1,19 +1,19 @@
 {
-  "Time": "2024-01-11T11:42:21",
-  "Uptime": "44T15:13:31",
-  "UptimeSec": 3856411,
   "Heap": 26,
-  "SleepMode": "Dynamic",
-  "Sleep": 50,
   "LoadAvg": 19,
   "MqttCount": 12,
+  "Sleep": 50,
+  "SleepMode": "Dynamic",
+  "Time": "2024-01-11T11:42:21",
+  "Uptime": "44T15:13:31",
+  "UptimeSec": 3856411,
   "Wifi": {
     "AP": 1,
-    "SSId": "asdqwe",
     "BSSId": "AA:BB:CC:DD:EE:FF",
     "Channel": 6,
-    "RSSI": 66,
+    "Downtime": "0T02:15:08",
     "LinkCount": 19,
-    "Downtime": "0T02:15:08"
+    "RSSI": 66,
+    "SSId": "asdqwe"
   }
 }
\ No newline at end of file
diff --git a/tests/status_parsing/jsonfiles/8.1.0.3/STATUS.json b/tests/status_parsing/jsonfiles/8.1.0.3/STATUS.json
index db383f7..52cc2ec 100644
--- a/tests/status_parsing/jsonfiles/8.1.0.3/STATUS.json
+++ b/tests/status_parsing/jsonfiles/8.1.0.3/STATUS.json
@@ -1,20 +1,21 @@
 {
   "Status": {
-    "Module": 0,
+    "ButtonRetain": 0,
+    "ButtonTopic": "",
     "FriendlyName": [
-      "Chłopcy Światło",
+      "Ch\u0139\u201aopcy \u0139\u0161wiat\u0139\u201ao",
       "Sonoff2",
       "Sonoff3"
     ],
-    "Topic": "ds102_chlopcy",
-    "ButtonTopic": "",
+    "LedMask": "0000",
+    "LedState": 1,
+    "Module": 0,
     "Power": 1,
     "PowerOnState": 3,
-    "LedState": 1,
-    "LedMask": "0000",
+    "PowerRetain": 0,
     "SaveData": 1,
     "SaveState": 1,
-    "SwitchTopic": "0",
+    "SensorRetain": 0,
     "SwitchMode": [
       5,
       5,
@@ -25,9 +26,8 @@
       0,
       0
     ],
-    "ButtonRetain": 0,
     "SwitchRetain": 0,
-    "SensorRetain": 0,
-    "PowerRetain": 0
+    "SwitchTopic": "0",
+    "Topic": "ds102_chlopcy"
   }
 }
\ No newline at end of file
diff --git a/tests/status_parsing/jsonfiles/8.1.0.3/STATUS1.json b/tests/status_parsing/jsonfiles/8.1.0.3/STATUS1.json
index 5351714..b1e5fed 100644
--- a/tests/status_parsing/jsonfiles/8.1.0.3/STATUS1.json
+++ b/tests/status_parsing/jsonfiles/8.1.0.3/STATUS1.json
@@ -1,16 +1,16 @@
 {
   "StatusPRM": {
     "Baudrate": 115200,
-    "SerialConfig": "8N1",
+    "BootCount": 1793,
+    "CfgHolder": 4617,
     "GroupTopic": "swiatlo",
     "OtaUrl": "http://ota.tasmota.com/tasmota/release-8.5.1/tasmota-lite.bin",
     "RestartReason": "Software/System restart",
-    "Uptime": "17T12:56:51",
-    "StartupUTC": "2024-08-28T23:18:44",
-    "Sleep": 50,
-    "CfgHolder": 4617,
-    "BootCount": 1793,
+    "SaveAddress": "FB000",
     "SaveCount": 16456,
-    "SaveAddress": "FB000"
+    "SerialConfig": "8N1",
+    "Sleep": 50,
+    "StartupUTC": "2024-08-28T23:18:44",
+    "Uptime": "17T12:56:51"
   }
 }
\ No newline at end of file
diff --git a/tests/status_parsing/jsonfiles/8.1.0.3/STATUS10.json b/tests/status_parsing/jsonfiles/8.1.0.3/STATUS10.json
index c6d236d..cf9bfbf 100644
--- a/tests/status_parsing/jsonfiles/8.1.0.3/STATUS10.json
+++ b/tests/status_parsing/jsonfiles/8.1.0.3/STATUS10.json
@@ -1,8 +1,8 @@
 {
   "StatusSNS": {
-    "Time": "2024-09-15T13:15:35",
     "Switch1": "ON",
     "Switch2": "ON",
-    "Switch3": "ON"
+    "Switch3": "ON",
+    "Time": "2024-09-15T13:15:35"
   }
 }
\ No newline at end of file
diff --git a/tests/status_parsing/jsonfiles/8.1.0.3/STATUS11.json b/tests/status_parsing/jsonfiles/8.1.0.3/STATUS11.json
index 254eb2f..ac24549 100644
--- a/tests/status_parsing/jsonfiles/8.1.0.3/STATUS11.json
+++ b/tests/status_parsing/jsonfiles/8.1.0.3/STATUS11.json
@@ -1,25 +1,25 @@
 {
   "StatusSTS": {
-    "Time": "2024-09-15T13:15:35",
-    "Uptime": "17T12:56:51",
-    "UptimeSec": 1515411,
     "Heap": 25,
-    "SleepMode": "Dynamic",
-    "Sleep": 50,
     "LoadAvg": 19,
     "MqttCount": 2,
     "POWER1": "ON",
     "POWER2": "OFF",
     "POWER3": "OFF",
+    "Sleep": 50,
+    "SleepMode": "Dynamic",
+    "Time": "2024-09-15T13:15:35",
+    "Uptime": "17T12:56:51",
+    "UptimeSec": 1515411,
     "Wifi": {
       "AP": 1,
-      "SSId": "NznCoDk3McKgMzgy",
       "BSSId": "0A:55:31:5F:EB:B5",
       "Channel": 6,
-      "RSSI": 72,
-      "Signal": -64,
+      "Downtime": "0T00:00:09",
       "LinkCount": 2,
-      "Downtime": "0T00:00:09"
+      "RSSI": 72,
+      "SSId": "NznCoDk3McKgMzgy",
+      "Signal": -64
     }
   }
 }
\ No newline at end of file
diff --git a/tests/status_parsing/jsonfiles/8.1.0.3/STATUS2.json b/tests/status_parsing/jsonfiles/8.1.0.3/STATUS2.json
index d6192ad..322c89d 100644
--- a/tests/status_parsing/jsonfiles/8.1.0.3/STATUS2.json
+++ b/tests/status_parsing/jsonfiles/8.1.0.3/STATUS2.json
@@ -1,11 +1,11 @@
 {
   "StatusFWR": {
-    "Version": "8.1.0.3(e7b061c-tasmota)",
-    "BuildDateTime": "2020-01-11T17:00:11",
     "Boot": 31,
+    "BuildDateTime": "2020-01-11T17:00:11",
+    "CR": "351/699",
     "Core": "2_6_1",
-    "SDK": "2.2.2-dev(38a443e)",
     "Hardware": "ESP8266EX",
-    "CR": "351/699"
+    "SDK": "2.2.2-dev(38a443e)",
+    "Version": "8.1.0.3(e7b061c-tasmota)"
   }
-}
+}
\ No newline at end of file
diff --git a/tests/status_parsing/jsonfiles/8.1.0.3/STATUS3.json b/tests/status_parsing/jsonfiles/8.1.0.3/STATUS3.json
index ff1cf67..f13fdfc 100644
--- a/tests/status_parsing/jsonfiles/8.1.0.3/STATUS3.json
+++ b/tests/status_parsing/jsonfiles/8.1.0.3/STATUS3.json
@@ -1,22 +1,22 @@
 {
   "StatusLOG": {
-    "SerialLog": 2,
-    "WebLog": 2,
-    "MqttLog": 0,
-    "SysLog": 0,
     "LogHost": "",
     "LogPort": 514,
+    "MqttLog": 0,
+    "Resolution": "558180C0",
     "SSId": [
       "NznCoDk3McKgMzgy",
       ""
     ],
-    "TelePeriod": 60,
-    "Resolution": "558180C0",
+    "SerialLog": 2,
     "SetOption": [
       "0000A009",
       "0505C8000100060000005AFF000000000000",
       "02808001",
       "00000000"
-    ]
+    ],
+    "SysLog": 0,
+    "TelePeriod": 60,
+    "WebLog": 2
   }
 }
\ No newline at end of file
diff --git a/tests/status_parsing/jsonfiles/8.1.0.3/STATUS4.json b/tests/status_parsing/jsonfiles/8.1.0.3/STATUS4.json
index 6c80d1b..6f718c8 100644
--- a/tests/status_parsing/jsonfiles/8.1.0.3/STATUS4.json
+++ b/tests/status_parsing/jsonfiles/8.1.0.3/STATUS4.json
@@ -1,12 +1,6 @@
 {
   "StatusMEM": {
-    "ProgramSize": 568,
-    "Free": 432,
-    "Heap": 25,
-    "ProgramFlashSize": 1024,
-    "FlashSize": 1024,
-    "FlashChipId": "1440C8",
-    "FlashMode": 3,
+    "Drivers": "1,2,3,4,5,6,7,8,9,10,12,16,18,19,20,21,22,24,26,29",
     "Features": [
       "00000809",
       "8FDAE397",
@@ -15,7 +9,13 @@
       "01001BC0",
       "00007881"
     ],
-    "Drivers": "1,2,3,4,5,6,7,8,9,10,12,16,18,19,20,21,22,24,26,29",
+    "FlashChipId": "1440C8",
+    "FlashMode": 3,
+    "FlashSize": 1024,
+    "Free": 432,
+    "Heap": 25,
+    "ProgramFlashSize": 1024,
+    "ProgramSize": 568,
     "Sensors": "1,2,3,4,5,6,7,8,9,10,14,15,17,18,20,22,26,34"
   }
 }
\ No newline at end of file
diff --git a/tests/status_parsing/jsonfiles/8.1.0.3/STATUS5.json b/tests/status_parsing/jsonfiles/8.1.0.3/STATUS5.json
index 8e62eec..a5c4ba8 100644
--- a/tests/status_parsing/jsonfiles/8.1.0.3/STATUS5.json
+++ b/tests/status_parsing/jsonfiles/8.1.0.3/STATUS5.json
@@ -1,11 +1,11 @@
 {
   "StatusNET": {
+    "DNSServer": "10.2.30.254",
+    "Gateway": "10.2.30.254",
     "Hostname": "ds102_chlopcy-4858",
     "IPAddress": "10.2.30.40",
-    "Gateway": "10.2.30.254",
-    "Subnetmask": "255.255.255.0",
-    "DNSServer": "10.2.30.254",
     "Mac": "80:7D:3A:60:92:FA",
+    "Subnetmask": "255.255.255.0",
     "Webserver": 2,
     "WifiConfig": 2,
     "WifiPower": 17.0
diff --git a/tests/status_parsing/jsonfiles/8.1.0.3/STATUS6.json b/tests/status_parsing/jsonfiles/8.1.0.3/STATUS6.json
index cb11a85..217a975 100644
--- a/tests/status_parsing/jsonfiles/8.1.0.3/STATUS6.json
+++ b/tests/status_parsing/jsonfiles/8.1.0.3/STATUS6.json
@@ -1,12 +1,12 @@
 {
   "StatusMQT": {
-    "MqttHost": "mqtt.iot",
-    "MqttPort": 1883,
-    "MqttClientMask": "DVES_%06X",
+    "KEEPALIVE": 30,
+    "MAX_PACKET_SIZE": 1000,
     "MqttClient": "DVES_6092FA",
-    "MqttUser": "DVES_USER",
+    "MqttClientMask": "DVES_%06X",
     "MqttCount": 2,
-    "MAX_PACKET_SIZE": 1000,
-    "KEEPALIVE": 30
+    "MqttHost": "mqtt.iot",
+    "MqttPort": 1883,
+    "MqttUser": "DVES_USER"
   }
 }
\ No newline at end of file
diff --git a/tests/status_parsing/jsonfiles/8.1.0.3/STATUS7.json b/tests/status_parsing/jsonfiles/8.1.0.3/STATUS7.json
index 1de40ec..7eebe63 100644
--- a/tests/status_parsing/jsonfiles/8.1.0.3/STATUS7.json
+++ b/tests/status_parsing/jsonfiles/8.1.0.3/STATUS7.json
@@ -1,11 +1,11 @@
 {
   "StatusTIM": {
-    "UTC": "Sun Sep 15 12:15:35 2024",
+    "EndDST": "Sun Oct 27 03:00:00 2024",
     "Local": "Sun Sep 15 13:15:35 2024",
     "StartDST": "Sun Mar 31 02:00:00 2024",
-    "EndDST": "Sun Oct 27 03:00:00 2024",
-    "Timezone": "+01:00",
     "Sunrise": "06:27",
-    "Sunset": "19:02"
+    "Sunset": "19:02",
+    "Timezone": "+01:00",
+    "UTC": "Sun Sep 15 12:15:35 2024"
   }
 }
\ No newline at end of file
diff --git a/tests/status_parsing/jsonfiles/9.5.0.4/STATUS.json b/tests/status_parsing/jsonfiles/9.5.0.4/STATUS.json
new file mode 100644
index 0000000..d56176f
--- /dev/null
+++ b/tests/status_parsing/jsonfiles/9.5.0.4/STATUS.json
@@ -0,0 +1,34 @@
+{
+  "Status": {
+    "ButtonRetain": 0,
+    "ButtonTopic": "0",
+    "DeviceName": "Woonkamer zigbee",
+    "FriendlyName": [
+      "Woonkamer zigbee"
+    ],
+    "InfoRetain": 0,
+    "LedMask": "FFFF",
+    "LedState": 1,
+    "Module": 18,
+    "Power": 0,
+    "PowerOnState": 3,
+    "PowerRetain": 0,
+    "SaveData": 1,
+    "SaveState": 1,
+    "SensorRetain": 0,
+    "StateRetain": 0,
+    "SwitchMode": [
+      0,
+      0,
+      0,
+      0,
+      0,
+      0,
+      0,
+      0
+    ],
+    "SwitchRetain": 0,
+    "SwitchTopic": "0",
+    "Topic": "zigbee"
+  }
+}
\ No newline at end of file
diff --git a/tests/status_parsing/jsonfiles/9.5.0.4/STATUS1.json b/tests/status_parsing/jsonfiles/9.5.0.4/STATUS1.json
new file mode 100644
index 0000000..1fcd704
--- /dev/null
+++ b/tests/status_parsing/jsonfiles/9.5.0.4/STATUS1.json
@@ -0,0 +1,17 @@
+{
+  "StatusPRM": {
+    "BCResetTime": "2021-07-30T15:31:28",
+    "Baudrate": 115200,
+    "BootCount": 17,
+    "CfgHolder": 4617,
+    "GroupTopic": "tasmotas",
+    "OtaUrl": "http://otaserver/ota/tasmota/tasmota.bin.gz",
+    "RestartReason": "Power On",
+    "SaveAddress": "F5000",
+    "SaveCount": 4439,
+    "SerialConfig": "8N1",
+    "Sleep": 50,
+    "StartupUTC": "2023-10-30T08:26:27",
+    "Uptime": "321T06:15:00"
+  }
+}
\ No newline at end of file
diff --git a/tests/status_parsing/jsonfiles/9.5.0.4/STATUS11.json b/tests/status_parsing/jsonfiles/9.5.0.4/STATUS11.json
new file mode 100644
index 0000000..8c9c467
--- /dev/null
+++ b/tests/status_parsing/jsonfiles/9.5.0.4/STATUS11.json
@@ -0,0 +1,23 @@
+{
+  "StatusSTS": {
+    "Heap": 24,
+    "LoadAvg": 22,
+    "MqttCount": 117,
+    "Sleep": 50,
+    "SleepMode": "Dynamic",
+    "Time": "2024-09-15T16:41:27",
+    "Uptime": "321T06:15:00",
+    "UptimeSec": 27756900,
+    "Wifi": {
+      "AP": 1,
+      "BSSId": "74:83:C2:2A:F1:AC",
+      "Channel": 1,
+      "Downtime": "0T00:14:26",
+      "LinkCount": 106,
+      "Mode": "11n",
+      "RSSI": 76,
+      "SSId": "indebuurt_IoT",
+      "Signal": -62
+    }
+  }
+}
\ No newline at end of file
diff --git a/tests/status_parsing/jsonfiles/9.5.0.4/STATUS2.json b/tests/status_parsing/jsonfiles/9.5.0.4/STATUS2.json
new file mode 100644
index 0000000..8e47e2f
--- /dev/null
+++ b/tests/status_parsing/jsonfiles/9.5.0.4/STATUS2.json
@@ -0,0 +1,12 @@
+{
+  "StatusFWR": {
+    "Boot": 31,
+    "BuildDateTime": "2021-07-30T16:05:47",
+    "CR": "358/699",
+    "Core": "2_7_4_9",
+    "CpuFrequency": 80,
+    "Hardware": "ESP8266EX",
+    "SDK": "2.2.2-dev(38a443e)",
+    "Version": "9.5.0.4(tzigbee)"
+  }
+}
\ No newline at end of file
diff --git a/tests/status_parsing/jsonfiles/9.5.0.4/STATUS3.json b/tests/status_parsing/jsonfiles/9.5.0.4/STATUS3.json
new file mode 100644
index 0000000..42be1f1
--- /dev/null
+++ b/tests/status_parsing/jsonfiles/9.5.0.4/STATUS3.json
@@ -0,0 +1,23 @@
+{
+  "StatusLOG": {
+    "LogHost": "loghost",
+    "LogPort": 514,
+    "MqttLog": 0,
+    "Resolution": "558180C0",
+    "SSId": [
+      "indebuurt_IoT",
+      "indebuurt"
+    ],
+    "SerialLog": 3,
+    "SetOption": [
+      "00008009",
+      "2805C8000100060000005A0A000000000000",
+      "00000080",
+      "00046002",
+      "00000000"
+    ],
+    "SysLog": 2,
+    "TelePeriod": 300,
+    "WebLog": 2
+  }
+}
\ No newline at end of file
diff --git a/tests/status_parsing/jsonfiles/9.5.0.4/STATUS4.json b/tests/status_parsing/jsonfiles/9.5.0.4/STATUS4.json
new file mode 100644
index 0000000..41d6ab9
--- /dev/null
+++ b/tests/status_parsing/jsonfiles/9.5.0.4/STATUS4.json
@@ -0,0 +1,25 @@
+{
+  "StatusMEM": {
+    "Drivers": "1,2,7,9,10,12,23,24,38",
+    "Features": [
+      "00000809",
+      "0F100580",
+      "04400001",
+      "00000002",
+      "00000000",
+      "00000001",
+      "00000080",
+      "00000000",
+      "00000000"
+    ],
+    "FlashChipId": "1640E0",
+    "FlashFrequency": 40,
+    "FlashMode": 3,
+    "FlashSize": 4096,
+    "Free": 476,
+    "Heap": 25,
+    "ProgramFlashSize": 1024,
+    "ProgramSize": 527,
+    "Sensors": "2"
+  }
+}
\ No newline at end of file
diff --git a/tests/status_parsing/jsonfiles/9.5.0.4/STATUS5.json b/tests/status_parsing/jsonfiles/9.5.0.4/STATUS5.json
new file mode 100644
index 0000000..2512700
--- /dev/null
+++ b/tests/status_parsing/jsonfiles/9.5.0.4/STATUS5.json
@@ -0,0 +1,14 @@
+{
+  "StatusNET": {
+    "DNSServer1": "192.168.2.27",
+    "DNSServer2": "192.168.2.24",
+    "Gateway": "192.168.2.254",
+    "Hostname": "zigbee",
+    "IPAddress": "192.168.2.175",
+    "Mac": "5C:CF:7F:13:9F:D8",
+    "Subnetmask": "255.255.255.0",
+    "Webserver": 2,
+    "WifiConfig": 4,
+    "WifiPower": 17.0
+  }
+}
\ No newline at end of file
diff --git a/tests/status_parsing/jsonfiles/9.5.0.4/STATUS6.json b/tests/status_parsing/jsonfiles/9.5.0.4/STATUS6.json
new file mode 100644
index 0000000..77abd89
--- /dev/null
+++ b/tests/status_parsing/jsonfiles/9.5.0.4/STATUS6.json
@@ -0,0 +1,13 @@
+{
+  "StatusMQT": {
+    "KEEPALIVE": 30,
+    "MAX_PACKET_SIZE": 1200,
+    "MqttClient": "DVES_139FD8",
+    "MqttClientMask": "DVES_%06X",
+    "MqttCount": 117,
+    "MqttHost": "mqttbroker",
+    "MqttPort": 1883,
+    "MqttUser": "DVES_USER",
+    "SOCKET_TIMEOUT": 4
+  }
+}
\ No newline at end of file
diff --git a/tests/status_parsing/jsonfiles/9.5.0.4/STATUS7.json b/tests/status_parsing/jsonfiles/9.5.0.4/STATUS7.json
new file mode 100644
index 0000000..91cdfde
--- /dev/null
+++ b/tests/status_parsing/jsonfiles/9.5.0.4/STATUS7.json
@@ -0,0 +1,11 @@
+{
+  "StatusTIM": {
+    "EndDST": "2024-10-27T03:00:00",
+    "Local": "2024-09-15T16:41:27",
+    "StartDST": "2024-03-31T02:00:00",
+    "Sunrise": "07:06",
+    "Sunset": "19:46",
+    "Timezone": 99,
+    "UTC": "2024-09-15T14:41:27"
+  }
+}
\ No newline at end of file