From 779321c2af70a0d10d0356e6a0a955d8dc424d4b Mon Sep 17 00:00:00 2001
From: Tom Scholten <git@scholten.nu>
Date: Mon, 7 Sep 2020 16:22:30 +0200
Subject: [PATCH 1/2] Convert pickle to picklejson for testdata

---
 .coverage                                     | Bin 53248 -> 53248 bytes
 tests/test_Smile.py                           |  16 ++++++++++++++++
 .../get_all_devices.json                      |   1 +
 .../get_all_devices.pickle                    | Bin 2187 -> 0 bytes
 .../02cf28bfec924855854c544690a609ef.json     |   1 +
 .../02cf28bfec924855854c544690a609ef.pickle   | Bin 171 -> 0 bytes
 .../21f2b542c49845e6bb416884c55778d6.json     |   1 +
 .../21f2b542c49845e6bb416884c55778d6.pickle   | Bin 171 -> 0 bytes
 .../4a810418d5394b3f82727340b91ba740.json     |   1 +
 .../4a810418d5394b3f82727340b91ba740.pickle   | Bin 171 -> 0 bytes
 .../675416a629f343c495449970e2ca37b5.json     |   1 +
 .../675416a629f343c495449970e2ca37b5.pickle   | Bin 171 -> 0 bytes
 .../680423ff840043738f42cc7f1ff97a36.json     |   1 +
 .../680423ff840043738f42cc7f1ff97a36.pickle   | Bin 138 -> 0 bytes
 .../6a3bf693d05e48e0b460c815a4fdd09d.json     |   1 +
 .../6a3bf693d05e48e0b460c815a4fdd09d.pickle   | Bin 387 -> 0 bytes
 .../78d1126fc4c743db81b61c20e88342a7.json     |   1 +
 .../78d1126fc4c743db81b61c20e88342a7.pickle   | Bin 171 -> 0 bytes
 .../90986d591dcd426cae3ec3e8111ff730.json     |   1 +
 .../90986d591dcd426cae3ec3e8111ff730.pickle   | Bin 112 -> 0 bytes
 .../a28f588dc4a049a483fd03a30361ad3a.json     |   1 +
 .../a28f588dc4a049a483fd03a30361ad3a.pickle   | Bin 171 -> 0 bytes
 .../a2c3583e0a6349358998b760cea82d2a.json     |   1 +
 .../a2c3583e0a6349358998b760cea82d2a.pickle   | Bin 138 -> 0 bytes
 .../b310b72a0e354bfab43089919b9a88bf.json     |   1 +
 .../b310b72a0e354bfab43089919b9a88bf.pickle   | Bin 119 -> 0 bytes
 .../b59bcebaf94b499ea7d46e4a66fb62d8.json     |   1 +
 .../b59bcebaf94b499ea7d46e4a66fb62d8.pickle   | Bin 395 -> 0 bytes
 .../cd0ddb54ef694e11ac18ed1cbce5dbbd.json     |   1 +
 .../cd0ddb54ef694e11ac18ed1cbce5dbbd.pickle   | Bin 171 -> 0 bytes
 .../d3da73bde12a47d5a6b8f9dad971f2ec.json     |   1 +
 .../d3da73bde12a47d5a6b8f9dad971f2ec.pickle   | Bin 138 -> 0 bytes
 .../df4a4a8169904cdb9c03d61a21f42140.json     |   1 +
 .../df4a4a8169904cdb9c03d61a21f42140.pickle   | Bin 352 -> 0 bytes
 .../e7693eb9582644e5b865dba8d4447cf1.json     |   1 +
 .../e7693eb9582644e5b865dba8d4447cf1.pickle   | Bin 416 -> 0 bytes
 .../f1fee6043d3642a9b0a65297455f008e.json     |   1 +
 .../f1fee6043d3642a9b0a65297455f008e.pickle   | Bin 397 -> 0 bytes
 .../fe799307f1624099878210aa0b9f1475.json     |   1 +
 .../fe799307f1624099878210aa0b9f1475.pickle   | Bin 46 -> 0 bytes
 .../adam_plus_anna/get_all_devices.json       |   1 +
 .../adam_plus_anna/get_all_devices.pickle     | Bin 605 -> 0 bytes
 .../2743216f626f43948deec1f7ab3b3d70.json     |   1 +
 .../2743216f626f43948deec1f7ab3b3d70.pickle   | Bin 129 -> 0 bytes
 .../aa6b0002df0a46e1b1eb94beb61eddfe.json     |   1 +
 .../aa6b0002df0a46e1b1eb94beb61eddfe.pickle   | Bin 171 -> 0 bytes
 .../b128b4bbbd1f47e9bf4d756e8fb5ee94.json     |   1 +
 .../b128b4bbbd1f47e9bf4d756e8fb5ee94.pickle   | Bin 46 -> 0 bytes
 .../ee62cad889f94e8ca3d09021f03a660b.json     |   1 +
 .../ee62cad889f94e8ca3d09021f03a660b.pickle   | Bin 368 -> 0 bytes
 .../f2be121e4a9345ac83c6e99ed89a98be.json     |   1 +
 .../f2be121e4a9345ac83c6e99ed89a98be.pickle   | Bin 171 -> 0 bytes
 .../adam_zone_per_device/get_all_devices.json |   1 +
 .../get_all_devices.pickle                    | Bin 2187 -> 0 bytes
 .../02cf28bfec924855854c544690a609ef.json     |   1 +
 .../02cf28bfec924855854c544690a609ef.pickle   | Bin 171 -> 0 bytes
 .../21f2b542c49845e6bb416884c55778d6.json     |   1 +
 .../21f2b542c49845e6bb416884c55778d6.pickle   | Bin 171 -> 0 bytes
 .../4a810418d5394b3f82727340b91ba740.json     |   1 +
 .../4a810418d5394b3f82727340b91ba740.pickle   | Bin 171 -> 0 bytes
 .../675416a629f343c495449970e2ca37b5.json     |   1 +
 .../675416a629f343c495449970e2ca37b5.pickle   | Bin 171 -> 0 bytes
 .../680423ff840043738f42cc7f1ff97a36.json     |   1 +
 .../680423ff840043738f42cc7f1ff97a36.pickle   | Bin 138 -> 0 bytes
 .../6a3bf693d05e48e0b460c815a4fdd09d.json     |   1 +
 .../6a3bf693d05e48e0b460c815a4fdd09d.pickle   | Bin 387 -> 0 bytes
 .../78d1126fc4c743db81b61c20e88342a7.json     |   1 +
 .../78d1126fc4c743db81b61c20e88342a7.pickle   | Bin 171 -> 0 bytes
 .../90986d591dcd426cae3ec3e8111ff730.json     |   1 +
 .../90986d591dcd426cae3ec3e8111ff730.pickle   | Bin 112 -> 0 bytes
 .../a28f588dc4a049a483fd03a30361ad3a.json     |   1 +
 .../a28f588dc4a049a483fd03a30361ad3a.pickle   | Bin 171 -> 0 bytes
 .../a2c3583e0a6349358998b760cea82d2a.json     |   1 +
 .../a2c3583e0a6349358998b760cea82d2a.pickle   | Bin 138 -> 0 bytes
 .../b310b72a0e354bfab43089919b9a88bf.json     |   1 +
 .../b310b72a0e354bfab43089919b9a88bf.pickle   | Bin 119 -> 0 bytes
 .../b59bcebaf94b499ea7d46e4a66fb62d8.json     |   1 +
 .../b59bcebaf94b499ea7d46e4a66fb62d8.pickle   | Bin 395 -> 0 bytes
 .../cd0ddb54ef694e11ac18ed1cbce5dbbd.json     |   1 +
 .../cd0ddb54ef694e11ac18ed1cbce5dbbd.pickle   | Bin 171 -> 0 bytes
 .../d3da73bde12a47d5a6b8f9dad971f2ec.json     |   1 +
 .../d3da73bde12a47d5a6b8f9dad971f2ec.pickle   | Bin 138 -> 0 bytes
 .../df4a4a8169904cdb9c03d61a21f42140.json     |   1 +
 .../df4a4a8169904cdb9c03d61a21f42140.pickle   | Bin 352 -> 0 bytes
 .../e7693eb9582644e5b865dba8d4447cf1.json     |   1 +
 .../e7693eb9582644e5b865dba8d4447cf1.pickle   | Bin 416 -> 0 bytes
 .../f1fee6043d3642a9b0a65297455f008e.json     |   1 +
 .../f1fee6043d3642a9b0a65297455f008e.pickle   | Bin 397 -> 0 bytes
 .../fe799307f1624099878210aa0b9f1475.json     |   1 +
 .../fe799307f1624099878210aa0b9f1475.pickle   | Bin 46 -> 0 bytes
 .../anna_heatpump/get_all_devices.json        |   1 +
 .../anna_heatpump/get_all_devices.pickle      | Bin 357 -> 0 bytes
 .../015ae9ea3f964e668e490fa39da3870b.json     |   1 +
 .../015ae9ea3f964e668e490fa39da3870b.pickle   | Bin 46 -> 0 bytes
 .../1cbf783bb11e4a7c8a6843dee3a86927.json     |   1 +
 .../1cbf783bb11e4a7c8a6843dee3a86927.pickle   | Bin 272 -> 0 bytes
 .../3cb70739631c4d17a86b8b12e8a5161b.json     |   1 +
 .../3cb70739631c4d17a86b8b12e8a5161b.pickle   | Bin 381 -> 0 bytes
 .../get_all_devices.json                      |   1 +
 .../get_all_devices.pickle                    | Bin 357 -> 0 bytes
 .../015ae9ea3f964e668e490fa39da3870b.json     |   1 +
 .../015ae9ea3f964e668e490fa39da3870b.pickle   | Bin 46 -> 0 bytes
 .../1cbf783bb11e4a7c8a6843dee3a86927.json     |   1 +
 .../1cbf783bb11e4a7c8a6843dee3a86927.pickle   | Bin 272 -> 0 bytes
 .../3cb70739631c4d17a86b8b12e8a5161b.json     |   1 +
 .../3cb70739631c4d17a86b8b12e8a5161b.pickle   | Bin 380 -> 0 bytes
 tests/testdata/anna_v4/get_all_devices.json   |   1 +
 tests/testdata/anna_v4/get_all_devices.pickle | Bin 357 -> 0 bytes
 .../01b85360fdd243d0aaad4d6ac2a5ba7e.json     |   1 +
 .../01b85360fdd243d0aaad4d6ac2a5ba7e.pickle   | Bin 403 -> 0 bytes
 .../0466eae8520144c78afb29628384edeb.json     |   1 +
 .../0466eae8520144c78afb29628384edeb.pickle   | Bin 46 -> 0 bytes
 .../cd0e6156b1f04d5f952349ffbe397481.json     |   1 +
 .../cd0e6156b1f04d5f952349ffbe397481.pickle   | Bin 213 -> 0 bytes
 .../get_all_devices.json                      |   1 +
 .../get_all_devices.pickle                    | Bin 355 -> 0 bytes
 .../7ffbb3ab4b6c4ab2915d7510f7bf8fe9.json     |   1 +
 .../7ffbb3ab4b6c4ab2915d7510f7bf8fe9.pickle   | Bin 356 -> 0 bytes
 .../a270735e4ccd45239424badc0578a2b1.json     |   1 +
 .../a270735e4ccd45239424badc0578a2b1.pickle   | Bin 46 -> 0 bytes
 .../c46b4794d28149699eacf053deedd003.json     |   1 +
 .../c46b4794d28149699eacf053deedd003.pickle   | Bin 32 -> 0 bytes
 .../get_all_devices.json                      |   1 +
 .../get_all_devices.pickle                    | Bin 355 -> 0 bytes
 .../7ffbb3ab4b6c4ab2915d7510f7bf8fe9.json     |   1 +
 .../7ffbb3ab4b6c4ab2915d7510f7bf8fe9.pickle   | Bin 391 -> 0 bytes
 .../a270735e4ccd45239424badc0578a2b1.json     |   1 +
 .../a270735e4ccd45239424badc0578a2b1.pickle   | Bin 46 -> 0 bytes
 .../c46b4794d28149699eacf053deedd003.json     |   1 +
 .../c46b4794d28149699eacf053deedd003.pickle   | Bin 32 -> 0 bytes
 .../testdata/legacy_anna/get_all_devices.json |   1 +
 .../legacy_anna/get_all_devices.pickle        | Bin 217 -> 0 bytes
 .../04e4cbfe7f4340f090f85ec3b9e6a950.json     |   1 +
 .../04e4cbfe7f4340f090f85ec3b9e6a950.pickle   | Bin 185 -> 0 bytes
 .../0d266432d64443e283b5d708ae98b455.json     |   1 +
 .../0d266432d64443e283b5d708ae98b455.pickle   | Bin 354 -> 0 bytes
 .../legacy_anna_2/get_all_devices.json        |   1 +
 .../legacy_anna_2/get_all_devices.pickle      | Bin 257 -> 0 bytes
 .../9e7377867dc24e51b8098a5ba02bd89d.json     |   1 +
 .../9e7377867dc24e51b8098a5ba02bd89d.pickle   | Bin 348 -> 0 bytes
 .../ea5d8a7177e541b0a4b52da815166de4.json     |   1 +
 .../ea5d8a7177e541b0a4b52da815166de4.pickle   | Bin 216 -> 0 bytes
 tests/testdata/p1v3/get_all_devices.json      |   1 +
 tests/testdata/p1v3/get_all_devices.pickle    | Bin 157 -> 0 bytes
 .../ba4de7613517478da82dd9b6abea36af.json     |   1 +
 .../ba4de7613517478da82dd9b6abea36af.pickle   | Bin 645 -> 0 bytes
 .../p1v3_full_option/get_all_devices.json     |   1 +
 .../p1v3_full_option/get_all_devices.pickle   | Bin 157 -> 0 bytes
 .../e950c7d5e1ee407a858e2a8b5016c8b3.json     |   1 +
 .../e950c7d5e1ee407a858e2a8b5016c8b3.pickle   | Bin 763 -> 0 bytes
 .../p1v3solarfake/get_all_devices.json        |   1 +
 .../p1v3solarfake/get_all_devices.pickle      | Bin 157 -> 0 bytes
 .../ba4de7613517478da82dd9b6abea36af.json     |   1 +
 .../ba4de7613517478da82dd9b6abea36af.pickle   | Bin 645 -> 0 bytes
 .../testdata/smile_p1_v2/get_all_devices.json |   1 +
 .../smile_p1_v2/get_all_devices.pickle        | Bin 124 -> 0 bytes
 .../938696c4bcdb4b8a9a595cb38ed43913.json     |   1 +
 .../938696c4bcdb4b8a9a595cb38ed43913.pickle   | Bin 669 -> 0 bytes
 .../smile_p1_v2_2/get_all_devices.json        |   1 +
 .../smile_p1_v2_2/get_all_devices.pickle      | Bin 124 -> 0 bytes
 .../199aa40f126840f392983d171374ab0b.json     |   1 +
 .../199aa40f126840f392983d171374ab0b.pickle   | Bin 669 -> 0 bytes
 .../testdata/stretch_v31/get_all_devices.json |   1 +
 .../stretch_v31/get_all_devices.pickle        | Bin 484 -> 0 bytes
 .../059e4d03c7a34d278add5c7a4a781d19.json     |   1 +
 .../059e4d03c7a34d278add5c7a4a781d19.pickle   | Bin 130 -> 0 bytes
 .../5871317346d045bc9f6b987ef25ee638.json     |   1 +
 .../5871317346d045bc9f6b987ef25ee638.pickle   | Bin 89 -> 0 bytes
 .../aac7b735042c4832ac9ff33aae4f453b.json     |   1 +
 .../aac7b735042c4832ac9ff33aae4f453b.pickle   | Bin 89 -> 0 bytes
 .../cfe95cf3de1948c0b8955125bf754614.json     |   1 +
 .../cfe95cf3de1948c0b8955125bf754614.pickle   | Bin 130 -> 0 bytes
 .../d950b314e9d8499f968e6db8d82ef78c.json     |   1 +
 .../e1c884e7dede431dadee09506ec4f859.json     |   1 +
 .../e1c884e7dede431dadee09506ec4f859.pickle   | Bin 89 -> 0 bytes
 175 files changed, 103 insertions(+)
 create mode 100644 tests/testdata/adam_multiple_devices_per_zone/get_all_devices.json
 delete mode 100644 tests/testdata/adam_multiple_devices_per_zone/get_all_devices.pickle
 create mode 100644 tests/testdata/adam_multiple_devices_per_zone/get_device_data/02cf28bfec924855854c544690a609ef.json
 delete mode 100644 tests/testdata/adam_multiple_devices_per_zone/get_device_data/02cf28bfec924855854c544690a609ef.pickle
 create mode 100644 tests/testdata/adam_multiple_devices_per_zone/get_device_data/21f2b542c49845e6bb416884c55778d6.json
 delete mode 100644 tests/testdata/adam_multiple_devices_per_zone/get_device_data/21f2b542c49845e6bb416884c55778d6.pickle
 create mode 100644 tests/testdata/adam_multiple_devices_per_zone/get_device_data/4a810418d5394b3f82727340b91ba740.json
 delete mode 100644 tests/testdata/adam_multiple_devices_per_zone/get_device_data/4a810418d5394b3f82727340b91ba740.pickle
 create mode 100644 tests/testdata/adam_multiple_devices_per_zone/get_device_data/675416a629f343c495449970e2ca37b5.json
 delete mode 100644 tests/testdata/adam_multiple_devices_per_zone/get_device_data/675416a629f343c495449970e2ca37b5.pickle
 create mode 100644 tests/testdata/adam_multiple_devices_per_zone/get_device_data/680423ff840043738f42cc7f1ff97a36.json
 delete mode 100644 tests/testdata/adam_multiple_devices_per_zone/get_device_data/680423ff840043738f42cc7f1ff97a36.pickle
 create mode 100644 tests/testdata/adam_multiple_devices_per_zone/get_device_data/6a3bf693d05e48e0b460c815a4fdd09d.json
 delete mode 100644 tests/testdata/adam_multiple_devices_per_zone/get_device_data/6a3bf693d05e48e0b460c815a4fdd09d.pickle
 create mode 100644 tests/testdata/adam_multiple_devices_per_zone/get_device_data/78d1126fc4c743db81b61c20e88342a7.json
 delete mode 100644 tests/testdata/adam_multiple_devices_per_zone/get_device_data/78d1126fc4c743db81b61c20e88342a7.pickle
 create mode 100644 tests/testdata/adam_multiple_devices_per_zone/get_device_data/90986d591dcd426cae3ec3e8111ff730.json
 delete mode 100644 tests/testdata/adam_multiple_devices_per_zone/get_device_data/90986d591dcd426cae3ec3e8111ff730.pickle
 create mode 100644 tests/testdata/adam_multiple_devices_per_zone/get_device_data/a28f588dc4a049a483fd03a30361ad3a.json
 delete mode 100644 tests/testdata/adam_multiple_devices_per_zone/get_device_data/a28f588dc4a049a483fd03a30361ad3a.pickle
 create mode 100644 tests/testdata/adam_multiple_devices_per_zone/get_device_data/a2c3583e0a6349358998b760cea82d2a.json
 delete mode 100644 tests/testdata/adam_multiple_devices_per_zone/get_device_data/a2c3583e0a6349358998b760cea82d2a.pickle
 create mode 100644 tests/testdata/adam_multiple_devices_per_zone/get_device_data/b310b72a0e354bfab43089919b9a88bf.json
 delete mode 100644 tests/testdata/adam_multiple_devices_per_zone/get_device_data/b310b72a0e354bfab43089919b9a88bf.pickle
 create mode 100644 tests/testdata/adam_multiple_devices_per_zone/get_device_data/b59bcebaf94b499ea7d46e4a66fb62d8.json
 delete mode 100644 tests/testdata/adam_multiple_devices_per_zone/get_device_data/b59bcebaf94b499ea7d46e4a66fb62d8.pickle
 create mode 100644 tests/testdata/adam_multiple_devices_per_zone/get_device_data/cd0ddb54ef694e11ac18ed1cbce5dbbd.json
 delete mode 100644 tests/testdata/adam_multiple_devices_per_zone/get_device_data/cd0ddb54ef694e11ac18ed1cbce5dbbd.pickle
 create mode 100644 tests/testdata/adam_multiple_devices_per_zone/get_device_data/d3da73bde12a47d5a6b8f9dad971f2ec.json
 delete mode 100644 tests/testdata/adam_multiple_devices_per_zone/get_device_data/d3da73bde12a47d5a6b8f9dad971f2ec.pickle
 create mode 100644 tests/testdata/adam_multiple_devices_per_zone/get_device_data/df4a4a8169904cdb9c03d61a21f42140.json
 delete mode 100644 tests/testdata/adam_multiple_devices_per_zone/get_device_data/df4a4a8169904cdb9c03d61a21f42140.pickle
 create mode 100644 tests/testdata/adam_multiple_devices_per_zone/get_device_data/e7693eb9582644e5b865dba8d4447cf1.json
 delete mode 100644 tests/testdata/adam_multiple_devices_per_zone/get_device_data/e7693eb9582644e5b865dba8d4447cf1.pickle
 create mode 100644 tests/testdata/adam_multiple_devices_per_zone/get_device_data/f1fee6043d3642a9b0a65297455f008e.json
 delete mode 100644 tests/testdata/adam_multiple_devices_per_zone/get_device_data/f1fee6043d3642a9b0a65297455f008e.pickle
 create mode 100644 tests/testdata/adam_multiple_devices_per_zone/get_device_data/fe799307f1624099878210aa0b9f1475.json
 delete mode 100644 tests/testdata/adam_multiple_devices_per_zone/get_device_data/fe799307f1624099878210aa0b9f1475.pickle
 create mode 100644 tests/testdata/adam_plus_anna/get_all_devices.json
 delete mode 100644 tests/testdata/adam_plus_anna/get_all_devices.pickle
 create mode 100644 tests/testdata/adam_plus_anna/get_device_data/2743216f626f43948deec1f7ab3b3d70.json
 delete mode 100644 tests/testdata/adam_plus_anna/get_device_data/2743216f626f43948deec1f7ab3b3d70.pickle
 create mode 100644 tests/testdata/adam_plus_anna/get_device_data/aa6b0002df0a46e1b1eb94beb61eddfe.json
 delete mode 100644 tests/testdata/adam_plus_anna/get_device_data/aa6b0002df0a46e1b1eb94beb61eddfe.pickle
 create mode 100644 tests/testdata/adam_plus_anna/get_device_data/b128b4bbbd1f47e9bf4d756e8fb5ee94.json
 delete mode 100644 tests/testdata/adam_plus_anna/get_device_data/b128b4bbbd1f47e9bf4d756e8fb5ee94.pickle
 create mode 100644 tests/testdata/adam_plus_anna/get_device_data/ee62cad889f94e8ca3d09021f03a660b.json
 delete mode 100644 tests/testdata/adam_plus_anna/get_device_data/ee62cad889f94e8ca3d09021f03a660b.pickle
 create mode 100644 tests/testdata/adam_plus_anna/get_device_data/f2be121e4a9345ac83c6e99ed89a98be.json
 delete mode 100644 tests/testdata/adam_plus_anna/get_device_data/f2be121e4a9345ac83c6e99ed89a98be.pickle
 create mode 100644 tests/testdata/adam_zone_per_device/get_all_devices.json
 delete mode 100644 tests/testdata/adam_zone_per_device/get_all_devices.pickle
 create mode 100644 tests/testdata/adam_zone_per_device/get_device_data/02cf28bfec924855854c544690a609ef.json
 delete mode 100644 tests/testdata/adam_zone_per_device/get_device_data/02cf28bfec924855854c544690a609ef.pickle
 create mode 100644 tests/testdata/adam_zone_per_device/get_device_data/21f2b542c49845e6bb416884c55778d6.json
 delete mode 100644 tests/testdata/adam_zone_per_device/get_device_data/21f2b542c49845e6bb416884c55778d6.pickle
 create mode 100644 tests/testdata/adam_zone_per_device/get_device_data/4a810418d5394b3f82727340b91ba740.json
 delete mode 100644 tests/testdata/adam_zone_per_device/get_device_data/4a810418d5394b3f82727340b91ba740.pickle
 create mode 100644 tests/testdata/adam_zone_per_device/get_device_data/675416a629f343c495449970e2ca37b5.json
 delete mode 100644 tests/testdata/adam_zone_per_device/get_device_data/675416a629f343c495449970e2ca37b5.pickle
 create mode 100644 tests/testdata/adam_zone_per_device/get_device_data/680423ff840043738f42cc7f1ff97a36.json
 delete mode 100644 tests/testdata/adam_zone_per_device/get_device_data/680423ff840043738f42cc7f1ff97a36.pickle
 create mode 100644 tests/testdata/adam_zone_per_device/get_device_data/6a3bf693d05e48e0b460c815a4fdd09d.json
 delete mode 100644 tests/testdata/adam_zone_per_device/get_device_data/6a3bf693d05e48e0b460c815a4fdd09d.pickle
 create mode 100644 tests/testdata/adam_zone_per_device/get_device_data/78d1126fc4c743db81b61c20e88342a7.json
 delete mode 100644 tests/testdata/adam_zone_per_device/get_device_data/78d1126fc4c743db81b61c20e88342a7.pickle
 create mode 100644 tests/testdata/adam_zone_per_device/get_device_data/90986d591dcd426cae3ec3e8111ff730.json
 delete mode 100644 tests/testdata/adam_zone_per_device/get_device_data/90986d591dcd426cae3ec3e8111ff730.pickle
 create mode 100644 tests/testdata/adam_zone_per_device/get_device_data/a28f588dc4a049a483fd03a30361ad3a.json
 delete mode 100644 tests/testdata/adam_zone_per_device/get_device_data/a28f588dc4a049a483fd03a30361ad3a.pickle
 create mode 100644 tests/testdata/adam_zone_per_device/get_device_data/a2c3583e0a6349358998b760cea82d2a.json
 delete mode 100644 tests/testdata/adam_zone_per_device/get_device_data/a2c3583e0a6349358998b760cea82d2a.pickle
 create mode 100644 tests/testdata/adam_zone_per_device/get_device_data/b310b72a0e354bfab43089919b9a88bf.json
 delete mode 100644 tests/testdata/adam_zone_per_device/get_device_data/b310b72a0e354bfab43089919b9a88bf.pickle
 create mode 100644 tests/testdata/adam_zone_per_device/get_device_data/b59bcebaf94b499ea7d46e4a66fb62d8.json
 delete mode 100644 tests/testdata/adam_zone_per_device/get_device_data/b59bcebaf94b499ea7d46e4a66fb62d8.pickle
 create mode 100644 tests/testdata/adam_zone_per_device/get_device_data/cd0ddb54ef694e11ac18ed1cbce5dbbd.json
 delete mode 100644 tests/testdata/adam_zone_per_device/get_device_data/cd0ddb54ef694e11ac18ed1cbce5dbbd.pickle
 create mode 100644 tests/testdata/adam_zone_per_device/get_device_data/d3da73bde12a47d5a6b8f9dad971f2ec.json
 delete mode 100644 tests/testdata/adam_zone_per_device/get_device_data/d3da73bde12a47d5a6b8f9dad971f2ec.pickle
 create mode 100644 tests/testdata/adam_zone_per_device/get_device_data/df4a4a8169904cdb9c03d61a21f42140.json
 delete mode 100644 tests/testdata/adam_zone_per_device/get_device_data/df4a4a8169904cdb9c03d61a21f42140.pickle
 create mode 100644 tests/testdata/adam_zone_per_device/get_device_data/e7693eb9582644e5b865dba8d4447cf1.json
 delete mode 100644 tests/testdata/adam_zone_per_device/get_device_data/e7693eb9582644e5b865dba8d4447cf1.pickle
 create mode 100644 tests/testdata/adam_zone_per_device/get_device_data/f1fee6043d3642a9b0a65297455f008e.json
 delete mode 100644 tests/testdata/adam_zone_per_device/get_device_data/f1fee6043d3642a9b0a65297455f008e.pickle
 create mode 100644 tests/testdata/adam_zone_per_device/get_device_data/fe799307f1624099878210aa0b9f1475.json
 delete mode 100644 tests/testdata/adam_zone_per_device/get_device_data/fe799307f1624099878210aa0b9f1475.pickle
 create mode 100644 tests/testdata/anna_heatpump/get_all_devices.json
 delete mode 100644 tests/testdata/anna_heatpump/get_all_devices.pickle
 create mode 100644 tests/testdata/anna_heatpump/get_device_data/015ae9ea3f964e668e490fa39da3870b.json
 delete mode 100644 tests/testdata/anna_heatpump/get_device_data/015ae9ea3f964e668e490fa39da3870b.pickle
 create mode 100644 tests/testdata/anna_heatpump/get_device_data/1cbf783bb11e4a7c8a6843dee3a86927.json
 delete mode 100644 tests/testdata/anna_heatpump/get_device_data/1cbf783bb11e4a7c8a6843dee3a86927.pickle
 create mode 100644 tests/testdata/anna_heatpump/get_device_data/3cb70739631c4d17a86b8b12e8a5161b.json
 delete mode 100644 tests/testdata/anna_heatpump/get_device_data/3cb70739631c4d17a86b8b12e8a5161b.pickle
 create mode 100644 tests/testdata/anna_heatpump_cooling/get_all_devices.json
 delete mode 100644 tests/testdata/anna_heatpump_cooling/get_all_devices.pickle
 create mode 100644 tests/testdata/anna_heatpump_cooling/get_device_data/015ae9ea3f964e668e490fa39da3870b.json
 delete mode 100644 tests/testdata/anna_heatpump_cooling/get_device_data/015ae9ea3f964e668e490fa39da3870b.pickle
 create mode 100644 tests/testdata/anna_heatpump_cooling/get_device_data/1cbf783bb11e4a7c8a6843dee3a86927.json
 delete mode 100644 tests/testdata/anna_heatpump_cooling/get_device_data/1cbf783bb11e4a7c8a6843dee3a86927.pickle
 create mode 100644 tests/testdata/anna_heatpump_cooling/get_device_data/3cb70739631c4d17a86b8b12e8a5161b.json
 delete mode 100644 tests/testdata/anna_heatpump_cooling/get_device_data/3cb70739631c4d17a86b8b12e8a5161b.pickle
 create mode 100644 tests/testdata/anna_v4/get_all_devices.json
 delete mode 100644 tests/testdata/anna_v4/get_all_devices.pickle
 create mode 100644 tests/testdata/anna_v4/get_device_data/01b85360fdd243d0aaad4d6ac2a5ba7e.json
 delete mode 100644 tests/testdata/anna_v4/get_device_data/01b85360fdd243d0aaad4d6ac2a5ba7e.pickle
 create mode 100644 tests/testdata/anna_v4/get_device_data/0466eae8520144c78afb29628384edeb.json
 delete mode 100644 tests/testdata/anna_v4/get_device_data/0466eae8520144c78afb29628384edeb.pickle
 create mode 100644 tests/testdata/anna_v4/get_device_data/cd0e6156b1f04d5f952349ffbe397481.json
 delete mode 100644 tests/testdata/anna_v4/get_device_data/cd0e6156b1f04d5f952349ffbe397481.pickle
 create mode 100644 tests/testdata/anna_without_boiler_fw3/get_all_devices.json
 delete mode 100644 tests/testdata/anna_without_boiler_fw3/get_all_devices.pickle
 create mode 100644 tests/testdata/anna_without_boiler_fw3/get_device_data/7ffbb3ab4b6c4ab2915d7510f7bf8fe9.json
 delete mode 100644 tests/testdata/anna_without_boiler_fw3/get_device_data/7ffbb3ab4b6c4ab2915d7510f7bf8fe9.pickle
 create mode 100644 tests/testdata/anna_without_boiler_fw3/get_device_data/a270735e4ccd45239424badc0578a2b1.json
 delete mode 100644 tests/testdata/anna_without_boiler_fw3/get_device_data/a270735e4ccd45239424badc0578a2b1.pickle
 create mode 100644 tests/testdata/anna_without_boiler_fw3/get_device_data/c46b4794d28149699eacf053deedd003.json
 delete mode 100644 tests/testdata/anna_without_boiler_fw3/get_device_data/c46b4794d28149699eacf053deedd003.pickle
 create mode 100644 tests/testdata/anna_without_boiler_fw4/get_all_devices.json
 delete mode 100644 tests/testdata/anna_without_boiler_fw4/get_all_devices.pickle
 create mode 100644 tests/testdata/anna_without_boiler_fw4/get_device_data/7ffbb3ab4b6c4ab2915d7510f7bf8fe9.json
 delete mode 100644 tests/testdata/anna_without_boiler_fw4/get_device_data/7ffbb3ab4b6c4ab2915d7510f7bf8fe9.pickle
 create mode 100644 tests/testdata/anna_without_boiler_fw4/get_device_data/a270735e4ccd45239424badc0578a2b1.json
 delete mode 100644 tests/testdata/anna_without_boiler_fw4/get_device_data/a270735e4ccd45239424badc0578a2b1.pickle
 create mode 100644 tests/testdata/anna_without_boiler_fw4/get_device_data/c46b4794d28149699eacf053deedd003.json
 delete mode 100644 tests/testdata/anna_without_boiler_fw4/get_device_data/c46b4794d28149699eacf053deedd003.pickle
 create mode 100644 tests/testdata/legacy_anna/get_all_devices.json
 delete mode 100644 tests/testdata/legacy_anna/get_all_devices.pickle
 create mode 100644 tests/testdata/legacy_anna/get_device_data/04e4cbfe7f4340f090f85ec3b9e6a950.json
 delete mode 100644 tests/testdata/legacy_anna/get_device_data/04e4cbfe7f4340f090f85ec3b9e6a950.pickle
 create mode 100644 tests/testdata/legacy_anna/get_device_data/0d266432d64443e283b5d708ae98b455.json
 delete mode 100644 tests/testdata/legacy_anna/get_device_data/0d266432d64443e283b5d708ae98b455.pickle
 create mode 100644 tests/testdata/legacy_anna_2/get_all_devices.json
 delete mode 100644 tests/testdata/legacy_anna_2/get_all_devices.pickle
 create mode 100644 tests/testdata/legacy_anna_2/get_device_data/9e7377867dc24e51b8098a5ba02bd89d.json
 delete mode 100644 tests/testdata/legacy_anna_2/get_device_data/9e7377867dc24e51b8098a5ba02bd89d.pickle
 create mode 100644 tests/testdata/legacy_anna_2/get_device_data/ea5d8a7177e541b0a4b52da815166de4.json
 delete mode 100644 tests/testdata/legacy_anna_2/get_device_data/ea5d8a7177e541b0a4b52da815166de4.pickle
 create mode 100644 tests/testdata/p1v3/get_all_devices.json
 delete mode 100644 tests/testdata/p1v3/get_all_devices.pickle
 create mode 100644 tests/testdata/p1v3/get_device_data/ba4de7613517478da82dd9b6abea36af.json
 delete mode 100644 tests/testdata/p1v3/get_device_data/ba4de7613517478da82dd9b6abea36af.pickle
 create mode 100644 tests/testdata/p1v3_full_option/get_all_devices.json
 delete mode 100644 tests/testdata/p1v3_full_option/get_all_devices.pickle
 create mode 100644 tests/testdata/p1v3_full_option/get_device_data/e950c7d5e1ee407a858e2a8b5016c8b3.json
 delete mode 100644 tests/testdata/p1v3_full_option/get_device_data/e950c7d5e1ee407a858e2a8b5016c8b3.pickle
 create mode 100644 tests/testdata/p1v3solarfake/get_all_devices.json
 delete mode 100644 tests/testdata/p1v3solarfake/get_all_devices.pickle
 create mode 100644 tests/testdata/p1v3solarfake/get_device_data/ba4de7613517478da82dd9b6abea36af.json
 delete mode 100644 tests/testdata/p1v3solarfake/get_device_data/ba4de7613517478da82dd9b6abea36af.pickle
 create mode 100644 tests/testdata/smile_p1_v2/get_all_devices.json
 delete mode 100644 tests/testdata/smile_p1_v2/get_all_devices.pickle
 create mode 100644 tests/testdata/smile_p1_v2/get_device_data/938696c4bcdb4b8a9a595cb38ed43913.json
 delete mode 100644 tests/testdata/smile_p1_v2/get_device_data/938696c4bcdb4b8a9a595cb38ed43913.pickle
 create mode 100644 tests/testdata/smile_p1_v2_2/get_all_devices.json
 delete mode 100644 tests/testdata/smile_p1_v2_2/get_all_devices.pickle
 create mode 100644 tests/testdata/smile_p1_v2_2/get_device_data/199aa40f126840f392983d171374ab0b.json
 delete mode 100644 tests/testdata/smile_p1_v2_2/get_device_data/199aa40f126840f392983d171374ab0b.pickle
 create mode 100644 tests/testdata/stretch_v31/get_all_devices.json
 delete mode 100644 tests/testdata/stretch_v31/get_all_devices.pickle
 create mode 100644 tests/testdata/stretch_v31/get_device_data/059e4d03c7a34d278add5c7a4a781d19.json
 delete mode 100644 tests/testdata/stretch_v31/get_device_data/059e4d03c7a34d278add5c7a4a781d19.pickle
 create mode 100644 tests/testdata/stretch_v31/get_device_data/5871317346d045bc9f6b987ef25ee638.json
 delete mode 100644 tests/testdata/stretch_v31/get_device_data/5871317346d045bc9f6b987ef25ee638.pickle
 create mode 100644 tests/testdata/stretch_v31/get_device_data/aac7b735042c4832ac9ff33aae4f453b.json
 delete mode 100644 tests/testdata/stretch_v31/get_device_data/aac7b735042c4832ac9ff33aae4f453b.pickle
 create mode 100644 tests/testdata/stretch_v31/get_device_data/cfe95cf3de1948c0b8955125bf754614.json
 delete mode 100644 tests/testdata/stretch_v31/get_device_data/cfe95cf3de1948c0b8955125bf754614.pickle
 create mode 100644 tests/testdata/stretch_v31/get_device_data/d950b314e9d8499f968e6db8d82ef78c.json
 create mode 100644 tests/testdata/stretch_v31/get_device_data/e1c884e7dede431dadee09506ec4f859.json
 delete mode 100644 tests/testdata/stretch_v31/get_device_data/e1c884e7dede431dadee09506ec4f859.pickle

diff --git a/.coverage b/.coverage
index 717625a714618e77f06f43c4fcad0032acb42140..530679b872dd8a8521fafd280b445d65f3547e51 100644
GIT binary patch
delta 385
zcmV-{0e=2~paX!Q1F$(S4LL0^Hy|-JIx{soF*378FThX;oB$754^a-Bvk?%E4l;o<
z0|fyIf@A|aP44gdpz5x#)_HgL?%o?Co&Z$;{-wJCbjtnkA1+n^H%AqKcDn$UlirRP
zfA^`+yYYEX_50d$cj%LuyrbGzwdZxU{eORIPoBB`#?#F?T*21%a<ywg`~TP1=HuA@
z&%YMjy|!WBsn6fHvi<&V{`CJ=d+mDN+v;z9tGR;R-=W&=upVoxBLKW@(Vco*tGDm4
zZQHgD1_A^D2@V1(fg}M12?>Hq%5znLe|1@x#rNaRrPu5A*IKJ8t*zhvJpXiOXS417
zv%UU*41a!})&3ur|Ka}+|92l4==r$+>g~6Ip4@-+_S^L1{_C1P?!RuJ=jHzE+iwHC
za{qPvZJ<}~ziz()0001h>1W6N*WGWMp65I}?!RvL`!+q#d3M}?-R}2odfdNm9QwHb
fy6KPmubZBi`>&gxm;0|9_g|aNxWD#o8={av)C$`(

delta 369
zcmV-%0gnEFpaX!Q1F$(S4LB_`Fd#B9Ix{djG%&M9FThX;tN;&S4_FSYvk?%U4l;o$
z0|fyIf>HxIP42H=P<8j!I`8h@-FssM6M*X9zjQZ%PPrcdE>-|HM-_l}y8ysolg^G9
ze;4TUZhYQT{l50x9r|P@@2K`w?RnLnJahYvr`rm)wwJ423)=6mug%A?{pYU*cdu>O
zck1)^t!%&ln?L=()n2<^_qO_5-)gR4_jjmvJFLgr>bz~yoqAiVx9_lR+qMk`0t5jG
z4gxBH9RURi34%Pzb5&qn7T=FMmtL<If9SQ=s!D6?cR$ZR-Pze}d;e_L|Hts>=UMIl
zVfi2a|L}kJfq|Zn`>)=98|caXS8u;fKkmP->Er(E26|rZzrOu8&@1;}x8DYO<^JpT
z8vp<R0GNJu+<)Euw&{7!v*Z5jcE4}a^PFeL{nzb&-=@d?>!y$Uubck3|GMdU47vZh
P>3O;Tx^e%tZK9As8s5sD

diff --git a/tests/test_Smile.py b/tests/test_Smile.py
index afe0a52..48edf7e 100644
--- a/tests/test_Smile.py
+++ b/tests/test_Smile.py
@@ -13,6 +13,8 @@
 import pickle
 import os
 
+import jsonpickle as json
+
 from Plugwise_Smile.Smile import Smile
 
 pp = PrettyPrinter(indent=8)
@@ -41,6 +43,18 @@ def _write_pickle(self, call, data):
         with open(datafile, "wb") as fixture_file:
             pickle.dump(data, fixture_file)
 
+    def _write_json(self, call, data):
+        """Store JSON data to per-setup files for HA component testing."""
+        path = os.path.join(os.path.dirname(__file__), "testdata/" + self.smile_setup)
+        datafile = os.path.join(path, call + ".json")
+        if not os.path.exists(path):
+            os.mkdir(path)
+        if not os.path.exists(os.path.dirname(datafile)):
+            os.mkdir(os.path.dirname(datafile))
+
+        with open(datafile, "w") as fixture_file:
+            fixture_file.write(json.encode(data))
+
     async def setup_app(
         self, broken=False, timeout=False, put_timeout=False,
     ):
@@ -244,6 +258,7 @@ async def device_test(self, smile=Smile, testdata=None):
         _LOGGER.info("Asserting testdata:")
         device_list = smile.get_all_devices()
         self._write_pickle("get_all_devices", device_list)
+        self._write_json("get_all_devices", device_list)
 
         location_list, dummy = smile.scan_thermostats()
 
@@ -256,6 +271,7 @@ async def device_test(self, smile=Smile, testdata=None):
         for dev_id, details in device_list.items():
             data = smile.get_device_data(dev_id)
             self._write_pickle("get_device_data/" + dev_id, data)
+            self._write_json("get_device_data/" + dev_id, data)
             _LOGGER.debug(
                 "%s",
                 "Device {} id:{}\nDetails: {}\nData: {}".format(
diff --git a/tests/testdata/adam_multiple_devices_per_zone/get_all_devices.json b/tests/testdata/adam_multiple_devices_per_zone/get_all_devices.json
new file mode 100644
index 0000000..61ebc4d
--- /dev/null
+++ b/tests/testdata/adam_multiple_devices_per_zone/get_all_devices.json
@@ -0,0 +1 @@
+{"df4a4a8169904cdb9c03d61a21f42140": {"name": "Zone Lisa Bios", "types": {"py/set": ["thermostat"]}, "class": "zone_thermostat", "location": "12493538af164a409c6a1c79e38afe1c"}, "b310b72a0e354bfab43089919b9a88bf": {"name": "Floor kraan", "types": {"py/set": ["thermostat"]}, "class": "thermo_sensor", "location": "c50f167537524366a5af7aa3942feb1e"}, "a2c3583e0a6349358998b760cea82d2a": {"name": "Bios Cv Thermostatic Radiator ", "types": {"py/set": ["thermostat"]}, "class": "thermo_sensor", "location": "12493538af164a409c6a1c79e38afe1c"}, "b59bcebaf94b499ea7d46e4a66fb62d8": {"name": "Zone Lisa WK", "types": {"py/set": ["thermostat"]}, "class": "zone_thermostat", "location": "c50f167537524366a5af7aa3942feb1e"}, "fe799307f1624099878210aa0b9f1475": {"name": "Adam", "types": {"py/set": ["temperature", "thermostat", "home"]}, "class": "gateway", "location": "1f9dcf83fd4e4b66b72ff787957bfe5d"}, "d3da73bde12a47d5a6b8f9dad971f2ec": {"name": "Thermostatic Radiator Jessie", "types": {"py/set": ["thermostat"]}, "class": "thermo_sensor", "location": "82fa13f017d240daa0d0ea1775420f24"}, "21f2b542c49845e6bb416884c55778d6": {"name": "Playstation Smart Plug", "types": {"py/set": ["plug", "power"]}, "class": "game_console", "location": "cd143c07248f491493cea0533bc3d669"}, "78d1126fc4c743db81b61c20e88342a7": {"name": "CV Pomp", "types": {"py/set": ["plug", "power"]}, "class": "central_heating_pump", "location": "c50f167537524366a5af7aa3942feb1e"}, "90986d591dcd426cae3ec3e8111ff730": {"name": "Adam", "types": {"py/set": ["temperature", "thermostat", "home"]}, "class": "heater_central", "location": "1f9dcf83fd4e4b66b72ff787957bfe5d"}, "cd0ddb54ef694e11ac18ed1cbce5dbbd": {"name": "NAS", "types": {"py/set": ["plug", "power"]}, "class": "vcr", "location": "cd143c07248f491493cea0533bc3d669"}, "4a810418d5394b3f82727340b91ba740": {"name": "USG Smart Plug", "types": {"py/set": ["plug", "power"]}, "class": "router", "location": "cd143c07248f491493cea0533bc3d669"}, "02cf28bfec924855854c544690a609ef": {"name": "NVR", "types": {"py/set": ["plug", "power"]}, "class": "vcr", "location": "cd143c07248f491493cea0533bc3d669"}, "a28f588dc4a049a483fd03a30361ad3a": {"name": "Fibaro HC2", "types": {"py/set": ["plug", "power"]}, "class": "settop", "location": "cd143c07248f491493cea0533bc3d669"}, "6a3bf693d05e48e0b460c815a4fdd09d": {"name": "Zone Thermostat Jessie", "types": {"py/set": ["thermostat"]}, "class": "zone_thermostat", "location": "82fa13f017d240daa0d0ea1775420f24"}, "680423ff840043738f42cc7f1ff97a36": {"name": "Thermostatic Radiator Badkamer", "types": {"py/set": ["thermostat"]}, "class": "thermo_sensor", "location": "08963fec7c53423ca5680aa4cb502c63"}, "f1fee6043d3642a9b0a65297455f008e": {"name": "Zone Thermostat Badkamer", "types": {"py/set": ["thermostat"]}, "class": "zone_thermostat", "location": "08963fec7c53423ca5680aa4cb502c63"}, "675416a629f343c495449970e2ca37b5": {"name": "Ziggo Modem", "types": {"py/set": ["plug", "power"]}, "class": "router", "location": "cd143c07248f491493cea0533bc3d669"}, "e7693eb9582644e5b865dba8d4447cf1": {"name": "CV Kraan Garage", "types": {"py/set": ["thermostat"]}, "class": "thermostatic_radiator_valve", "location": "446ac08dd04d4eff8ac57489757b7314"}}
\ No newline at end of file
diff --git a/tests/testdata/adam_multiple_devices_per_zone/get_all_devices.pickle b/tests/testdata/adam_multiple_devices_per_zone/get_all_devices.pickle
deleted file mode 100644
index df880b7cd1b236472ccfddc4776a76d240fcb5ab..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2187
zcmbtVOKTiQ5DrMPgyhIM1Y<~W=8!{9PCu$&M_XWrI5EOX9PnkS?ylZhyxI}7BN+t(
z{s9B=Ve@}eBaJNC)?rEZwlh6^Ro|=MZT|Ca=ZlNqU#lPbDi=UNFKq|{QjQ@BovlPA
z3n&R<HJsX9;4!WG{nyQcs$XVHte(u8<*MK6&QEB$`kRmJb~Uxf&9cL8^}gRqb6oO)
zdw=p5lN+!4oq3b6n>CA7Ur7Z)8||@3%TtJuEXw2p4Ub5s)oEWvEk$$+1!)7ZU<56E
z2r|Tg-p4Y`S8w!tPv=e3R&QFw#j4)oiR$h5^-llgCH7=Vi)GWU>fOFdMlhZ;+8G7f
zS~OT3q7I-6MM(oHs-%tAB+%+%Mn?3}S&<06$_hu+hXW1O!CCd&hvjFfdWm_49Zz#(
zkov0udaZ>`h>0SW01-kUbQvrGT3e!3*^kh7ueJE&`3<1YDPMQzLM{X?9FwD1i{PDC
zQXq;LiUemy;LXPwk1qlH&AMS<)Z6`DN5?1BVt3loYT$i)iXFYh^9#mh2{{$7O9p~y
zE$dl|^DY<{3z<AHo^?j2V<xE(TsCN<=g%+)CySyqqJMik(?8R4Ipaw_2!F}9R|Tam
zLb}W=W!@zVLg}0VC5nOpn2oL?|4$G+7_u>fwBAE9#yOwu2z>u=j^~5B*}B!yF}7WG
zI6s|^L~NZjZ>e4Nn<vAwfq=VHj?5%AY`ZxRHux?}&`CH2zCe&{D|VAGTF1nRvtby9
z0i{&7BuEZ)j$TG9lM>{;28C`MX8Yh(b=VxAj0-=ie;gpcPPFJ+oKI@vF&ERx$?0%p
zP0I%nyv-)aoH8hzkTfMtUP{Sg>5C$$H|p=|t-4~c{Q-p9$%x4?_4m9$$|7f`lZp*M
zQeu*xvP^7glVi-|0vj(LAALOh##tKUxdu%`VF{2v8%}N1#Ve<r26n29=q^i(OJV=_
zqi3IKRgY}lX`54CU~OrHN=0$uPztP|G2XC60Bqon5P`0WXye7Jm;YlkRK6JRa{?3)
z5QfkQjaq2#<gBlXXZPtWV%t<d9jK4N?kuV6no;#Nn6#)POQo|g1fE0$E;%m^LdjW#
zE4}Vtw9R$)s?P#<d+)3hK<fo4U5W=GKs(LpP$_W@l@c84s{lT{M!(syPcXmXq_K{l
zWS?&dt643V3`a*NGz^3YDH@j2>LG57L1Y;<Ys>Kpk+n1`I54IN;c0a1gHN}=1@!j)
z*BOGZB5oYCDiqBH0fAi=f)k_?Y8S71cklIVI&G?7n@nT<{#PfHW5Fo~<CO&<6TRhZ
zqR#-}Qjz1<_qb%95BF*H3|pMuY}fvq?#6{TX~zq1a)$G>%d+EOU=p4^1YG(oE+*r^
O2gjA~wB+VJee^FQlD4A&

diff --git a/tests/testdata/adam_multiple_devices_per_zone/get_device_data/02cf28bfec924855854c544690a609ef.json b/tests/testdata/adam_multiple_devices_per_zone/get_device_data/02cf28bfec924855854c544690a609ef.json
new file mode 100644
index 0000000..238da9d
--- /dev/null
+++ b/tests/testdata/adam_multiple_devices_per_zone/get_device_data/02cf28bfec924855854c544690a609ef.json
@@ -0,0 +1 @@
+{"electricity_consumed": 34.0, "electricity_consumed_interval": 9.15, "electricity_produced": 0.0, "electricity_produced_interval": 0.0, "relay": true}
\ No newline at end of file
diff --git a/tests/testdata/adam_multiple_devices_per_zone/get_device_data/02cf28bfec924855854c544690a609ef.pickle b/tests/testdata/adam_multiple_devices_per_zone/get_device_data/02cf28bfec924855854c544690a609ef.pickle
deleted file mode 100644
index 52c7cb2a25c16b33ca6050bb0d67e6b1cba8dec0..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 171
zcmZo*nYw@h0&1sd^oXS9q$ZaXWhQ5qRK_Rg=M|Ucrlw4BcW{I#>5;`IAD@|5l3G-j
um;+R(<Z}iH&Y~JrP?VoinhY`sY83;jK`?nFgWw8Ti&AqEE2ngn>Hz@lMmu@{

diff --git a/tests/testdata/adam_multiple_devices_per_zone/get_device_data/21f2b542c49845e6bb416884c55778d6.json b/tests/testdata/adam_multiple_devices_per_zone/get_device_data/21f2b542c49845e6bb416884c55778d6.json
new file mode 100644
index 0000000..4fcb40c
--- /dev/null
+++ b/tests/testdata/adam_multiple_devices_per_zone/get_device_data/21f2b542c49845e6bb416884c55778d6.json
@@ -0,0 +1 @@
+{"electricity_consumed": 82.6, "electricity_consumed_interval": 8.6, "electricity_produced": 0.0, "electricity_produced_interval": 0.0, "relay": true}
\ No newline at end of file
diff --git a/tests/testdata/adam_multiple_devices_per_zone/get_device_data/21f2b542c49845e6bb416884c55778d6.pickle b/tests/testdata/adam_multiple_devices_per_zone/get_device_data/21f2b542c49845e6bb416884c55778d6.pickle
deleted file mode 100644
index eceed1fd6952ce27bba8862ad7ee02ea35125fc8..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 171
zcmZo*nYw@h0&1sd^oXS9q$ZaXWhQ5qRK_Rg=M|Ucrlw4BcL-UQ1_C{@*yQ6g^GZ^S
t$`W&c3KfmP0M(#^qWqN7WRO8ns~AuXg2^Kp1Xsvfl$w)RIi;gi4*)%$I~f1~

diff --git a/tests/testdata/adam_multiple_devices_per_zone/get_device_data/4a810418d5394b3f82727340b91ba740.json b/tests/testdata/adam_multiple_devices_per_zone/get_device_data/4a810418d5394b3f82727340b91ba740.json
new file mode 100644
index 0000000..feb6290
--- /dev/null
+++ b/tests/testdata/adam_multiple_devices_per_zone/get_device_data/4a810418d5394b3f82727340b91ba740.json
@@ -0,0 +1 @@
+{"electricity_consumed": 8.5, "electricity_consumed_interval": 0.0, "electricity_produced": 0.0, "electricity_produced_interval": 0.0, "relay": true}
\ No newline at end of file
diff --git a/tests/testdata/adam_multiple_devices_per_zone/get_device_data/4a810418d5394b3f82727340b91ba740.pickle b/tests/testdata/adam_multiple_devices_per_zone/get_device_data/4a810418d5394b3f82727340b91ba740.pickle
deleted file mode 100644
index 68d7b4f0a21c1042678beab330a6f065e9d7cdb6..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 171
zcmZo*nYw@h0&1sd^oXS9q$ZaXWhQ5qRK_Rg=M|Ucrlw4BcTj{V>5;`IAD@|5l3G-j
om@~y4Y7_&iK?OzmDW%CEgW&Qg2EpX98N^zYnv+;LrK40207LLLuK)l5

diff --git a/tests/testdata/adam_multiple_devices_per_zone/get_device_data/675416a629f343c495449970e2ca37b5.json b/tests/testdata/adam_multiple_devices_per_zone/get_device_data/675416a629f343c495449970e2ca37b5.json
new file mode 100644
index 0000000..74d15fa
--- /dev/null
+++ b/tests/testdata/adam_multiple_devices_per_zone/get_device_data/675416a629f343c495449970e2ca37b5.json
@@ -0,0 +1 @@
+{"electricity_consumed": 12.2, "electricity_consumed_interval": 2.97, "electricity_produced": 0.0, "electricity_produced_interval": 0.0, "relay": true}
\ No newline at end of file
diff --git a/tests/testdata/adam_multiple_devices_per_zone/get_device_data/675416a629f343c495449970e2ca37b5.pickle b/tests/testdata/adam_multiple_devices_per_zone/get_device_data/675416a629f343c495449970e2ca37b5.pickle
deleted file mode 100644
index c88767e3e30c046e25f2d0b0abb4bd8455a05fc5..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 171
zcmZo*nYw@h0&1sd^oXS9q$ZaXWhQ5qRK_Rg=M|Ucrlw4BchE=!gC1FI^6{B@C8<Sa
wi8(-p?1%beG`=22HK?E{KczGoWDwLU22_J!@<;~36|xqk<|I~5=_u6$0LqCx?f?J)

diff --git a/tests/testdata/adam_multiple_devices_per_zone/get_device_data/680423ff840043738f42cc7f1ff97a36.json b/tests/testdata/adam_multiple_devices_per_zone/get_device_data/680423ff840043738f42cc7f1ff97a36.json
new file mode 100644
index 0000000..75bc62f
--- /dev/null
+++ b/tests/testdata/adam_multiple_devices_per_zone/get_device_data/680423ff840043738f42cc7f1ff97a36.json
@@ -0,0 +1 @@
+{"setpoint": 14.0, "temperature": 19.1, "battery": 0.51, "valve_position": 0.0, "temperature_difference": -0.4}
\ No newline at end of file
diff --git a/tests/testdata/adam_multiple_devices_per_zone/get_device_data/680423ff840043738f42cc7f1ff97a36.pickle b/tests/testdata/adam_multiple_devices_per_zone/get_device_data/680423ff840043738f42cc7f1ff97a36.pickle
deleted file mode 100644
index 7f2f00174aa888edb5523e41d054daa9d661100f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 138
zcmZo*nOe^P0ku;!dN_(xOA7Kc^Gc?;JLo`!d$>zda|=?75=%;pQh~z8k~4u|Ru6kp
zVo6DAQRNhO`v-xqTjh2H_3)J?=9Hzz7vvXbmSpDVO>u{s%+Mo-WJY{SW?EWmQEFZ?
P(763KL8i@|RjLO7W6m-R

diff --git a/tests/testdata/adam_multiple_devices_per_zone/get_device_data/6a3bf693d05e48e0b460c815a4fdd09d.json b/tests/testdata/adam_multiple_devices_per_zone/get_device_data/6a3bf693d05e48e0b460c815a4fdd09d.json
new file mode 100644
index 0000000..41333f3
--- /dev/null
+++ b/tests/testdata/adam_multiple_devices_per_zone/get_device_data/6a3bf693d05e48e0b460c815a4fdd09d.json
@@ -0,0 +1 @@
+{"setpoint": 15.0, "temperature": 17.2, "battery": 0.37, "active_preset": "asleep", "presets": {"home": [20.0, 22.0], "no_frost": [10.0, 30.0], "away": [12.0, 25.0], "vacation": [11.0, 28.0], "asleep": [16.0, 24.0]}, "schedule_temperature": 15.0, "available_schedules": ["CV Jessie"], "selected_schedule": "CV Jessie", "last_used": "CV Jessie"}
\ No newline at end of file
diff --git a/tests/testdata/adam_multiple_devices_per_zone/get_device_data/6a3bf693d05e48e0b460c815a4fdd09d.pickle b/tests/testdata/adam_multiple_devices_per_zone/get_device_data/6a3bf693d05e48e0b460c815a4fdd09d.pickle
deleted file mode 100644
index 6fb5b50f83fd764deaca7c048fd8b6688a45d918..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 387
zcmY+<!AiqG5C&j{U{j<AvEDt1<Wwq(D2N6;1bhH*5~j&W0^1~HW}_8^KENEu*XZkb
z_Dzggx6nB)^MCBWyAHnI_xFbR)JQ@?ZtAjPP2!nb%OT^k!4}xI*sm`xhmp|&n6X`H
z^6<Txe*7dGnLx&6hiTJde~-!mkU?xzMs7p;*AW!;67@x+B))PLNqp@NC}CBnuWe22
zz?ld49t7|PD;GvSy!Bz&K?Ypbl>_G<+<D+%G_=oseDfb$nNn6@ZVjfppPsJ=BFE4{
pX<*R<FRAa6@#FL96B3oEAV-7-Gsb*tv^bHm0pipW<~!WZegV_ubyWZW

diff --git a/tests/testdata/adam_multiple_devices_per_zone/get_device_data/78d1126fc4c743db81b61c20e88342a7.json b/tests/testdata/adam_multiple_devices_per_zone/get_device_data/78d1126fc4c743db81b61c20e88342a7.json
new file mode 100644
index 0000000..7a9c3e9
--- /dev/null
+++ b/tests/testdata/adam_multiple_devices_per_zone/get_device_data/78d1126fc4c743db81b61c20e88342a7.json
@@ -0,0 +1 @@
+{"electricity_consumed": 35.6, "electricity_consumed_interval": 7.37, "electricity_produced": 0.0, "electricity_produced_interval": 0.0, "relay": true}
\ No newline at end of file
diff --git a/tests/testdata/adam_multiple_devices_per_zone/get_device_data/78d1126fc4c743db81b61c20e88342a7.pickle b/tests/testdata/adam_multiple_devices_per_zone/get_device_data/78d1126fc4c743db81b61c20e88342a7.pickle
deleted file mode 100644
index 007cda0997cd80019b3aa28a2bd96283faca912f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 171
zcmZo*nYw@h0&1sd^oXS9q$ZaXWhQ5qRK_Rg=M|Ucrlw4BcW^ud0%v<<vB}40=9Q!t
xl_ll?70OmUbYCY@jcQOqQGQBkGRPpPRSc*G!Q_z)f-7V#O3g{EoYGOM2LRawKGXmJ

diff --git a/tests/testdata/adam_multiple_devices_per_zone/get_device_data/90986d591dcd426cae3ec3e8111ff730.json b/tests/testdata/adam_multiple_devices_per_zone/get_device_data/90986d591dcd426cae3ec3e8111ff730.json
new file mode 100644
index 0000000..5e481d3
--- /dev/null
+++ b/tests/testdata/adam_multiple_devices_per_zone/get_device_data/90986d591dcd426cae3ec3e8111ff730.json
@@ -0,0 +1 @@
+{"water_temperature": 70.0, "intended_boiler_temperature": 70.0, "modulation_level": 0.01}
\ No newline at end of file
diff --git a/tests/testdata/adam_multiple_devices_per_zone/get_device_data/90986d591dcd426cae3ec3e8111ff730.pickle b/tests/testdata/adam_multiple_devices_per_zone/get_device_data/90986d591dcd426cae3ec3e8111ff730.pickle
deleted file mode 100644
index a277db63cd753db7530c04435f31f75daddc85fa..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 112
zcmZo*nVQM~0ku;!dIZZ8OHzyCOHy+SQi~ExN{dpbxH|+kfEDyeXXcfp=B1>j#3$uv
l=HOH&kei=Unv+<PnV%P*lUkOVGsWG$rRt&kI+5y9JplPmCZ_-Z

diff --git a/tests/testdata/adam_multiple_devices_per_zone/get_device_data/a28f588dc4a049a483fd03a30361ad3a.json b/tests/testdata/adam_multiple_devices_per_zone/get_device_data/a28f588dc4a049a483fd03a30361ad3a.json
new file mode 100644
index 0000000..0aeca4c
--- /dev/null
+++ b/tests/testdata/adam_multiple_devices_per_zone/get_device_data/a28f588dc4a049a483fd03a30361ad3a.json
@@ -0,0 +1 @@
+{"electricity_consumed": 12.5, "electricity_consumed_interval": 3.8, "electricity_produced": 0.0, "electricity_produced_interval": 0.0, "relay": true}
\ No newline at end of file
diff --git a/tests/testdata/adam_multiple_devices_per_zone/get_device_data/a28f588dc4a049a483fd03a30361ad3a.pickle b/tests/testdata/adam_multiple_devices_per_zone/get_device_data/a28f588dc4a049a483fd03a30361ad3a.pickle
deleted file mode 100644
index 17e17ca6592e6a892aa7a8dda82e3da8774ce823..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 171
zcmZo*nYw@h0&1sd^oXS9q$ZaXWhQ5qRK_Rg=M|Ucrlw4BchH0=>5;`IAD@|5l3G-j
rm;+SEmj(u?1{D<Lr<5jx41!w4fNBs-9?2lMLe`?xoW#m09i@5zHAgvV

diff --git a/tests/testdata/adam_multiple_devices_per_zone/get_device_data/a2c3583e0a6349358998b760cea82d2a.json b/tests/testdata/adam_multiple_devices_per_zone/get_device_data/a2c3583e0a6349358998b760cea82d2a.json
new file mode 100644
index 0000000..eef83a6
--- /dev/null
+++ b/tests/testdata/adam_multiple_devices_per_zone/get_device_data/a2c3583e0a6349358998b760cea82d2a.json
@@ -0,0 +1 @@
+{"setpoint": 13.0, "temperature": 17.2, "battery": 0.62, "valve_position": 0.0, "temperature_difference": -0.2}
\ No newline at end of file
diff --git a/tests/testdata/adam_multiple_devices_per_zone/get_device_data/a2c3583e0a6349358998b760cea82d2a.pickle b/tests/testdata/adam_multiple_devices_per_zone/get_device_data/a2c3583e0a6349358998b760cea82d2a.pickle
deleted file mode 100644
index c9f29ffb6c835ce89b1d2c49c15b42e52f3e994e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 138
zcmZo*nOe^P0ku;!dN_(xOA7Kc^Gc?;J7__Kd$>zda|=?75=%;pQh~yT#$eFHo|ITp
zl3G+b#ohk#buQb2#n*fI$`W(RQsWEqi!)0y^Yf;-LrrGr5koQ~J|#0PEwv~$FBxdu
M{*yC7U{<Lf0Ll(9H2?qr

diff --git a/tests/testdata/adam_multiple_devices_per_zone/get_device_data/b310b72a0e354bfab43089919b9a88bf.json b/tests/testdata/adam_multiple_devices_per_zone/get_device_data/b310b72a0e354bfab43089919b9a88bf.json
new file mode 100644
index 0000000..16da5f4
--- /dev/null
+++ b/tests/testdata/adam_multiple_devices_per_zone/get_device_data/b310b72a0e354bfab43089919b9a88bf.json
@@ -0,0 +1 @@
+{"setpoint": 21.5, "temperature": 26.0, "valve_position": 1.0, "temperature_difference": 3.5}
\ No newline at end of file
diff --git a/tests/testdata/adam_multiple_devices_per_zone/get_device_data/b310b72a0e354bfab43089919b9a88bf.pickle b/tests/testdata/adam_multiple_devices_per_zone/get_device_data/b310b72a0e354bfab43089919b9a88bf.pickle
deleted file mode 100644
index 9011d8d63a4e7edad852301aa9a8f15c9a322f90..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 119
zcmZo*nVQ1@0ku;!dN_(xOA7Kc^Gc?;JD4_r#e29*QgaJZixNvpi&BBYRuI)ad}WC_
qWvTH6`Nf$fnfZBB-0eR=WyFv)#HVDYrKJ|7<|Tvl@<3FS>Hz>M%_B_!

diff --git a/tests/testdata/adam_multiple_devices_per_zone/get_device_data/b59bcebaf94b499ea7d46e4a66fb62d8.json b/tests/testdata/adam_multiple_devices_per_zone/get_device_data/b59bcebaf94b499ea7d46e4a66fb62d8.json
new file mode 100644
index 0000000..65fa0dd
--- /dev/null
+++ b/tests/testdata/adam_multiple_devices_per_zone/get_device_data/b59bcebaf94b499ea7d46e4a66fb62d8.json
@@ -0,0 +1 @@
+{"setpoint": 21.5, "temperature": 20.9, "battery": 0.34, "active_preset": "home", "presets": {"vacation": [15.0, 28.0], "asleep": [18.0, 24.0], "no_frost": [12.0, 30.0], "away": [17.0, 25.0], "home": [21.5, 22.0]}, "schedule_temperature": 21.5, "available_schedules": ["GF7  Woonkamer"], "selected_schedule": "GF7  Woonkamer", "last_used": "GF7  Woonkamer"}
\ No newline at end of file
diff --git a/tests/testdata/adam_multiple_devices_per_zone/get_device_data/b59bcebaf94b499ea7d46e4a66fb62d8.pickle b/tests/testdata/adam_multiple_devices_per_zone/get_device_data/b59bcebaf94b499ea7d46e4a66fb62d8.pickle
deleted file mode 100644
index 750f3455d94a7fe4bbed2f4d2f132265bc51b571..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 395
zcmZXQ&q~BF5Qi0tyCMpr-uKwk!is-Ev?ucjUX(K1&eCGrlw?xbgU|;U@Dg80pTSq~
z4ZK^E&4TQllKH;mmq{PJ_uE^pUTw@{jnvArAuE#e-nDs;ux?QS8HGdp?0fN7JemU$
zs-+coUmtIe@y{pkLq=tXX{&I!$8uE28ZD3fUR#&YK?YRH#y;6tBvYR)k{iE3-T_@9
zwjQ4bd=>Dxk?BH7O<stDa2tdOUSR3rEWqnEbT4wrtMNo~v4Vz=byi?*Dop>69Dd>m
wIw&ic4?-~Yki-Y#{&F&Tkg|D(8kGe;)L3Cgn6E`!obYZ1no^@N-#lZczl(%>8~^|S

diff --git a/tests/testdata/adam_multiple_devices_per_zone/get_device_data/cd0ddb54ef694e11ac18ed1cbce5dbbd.json b/tests/testdata/adam_multiple_devices_per_zone/get_device_data/cd0ddb54ef694e11ac18ed1cbce5dbbd.json
new file mode 100644
index 0000000..fbefc5b
--- /dev/null
+++ b/tests/testdata/adam_multiple_devices_per_zone/get_device_data/cd0ddb54ef694e11ac18ed1cbce5dbbd.json
@@ -0,0 +1 @@
+{"electricity_consumed": 16.5, "electricity_consumed_interval": 0.5, "electricity_produced": 0.0, "electricity_produced_interval": 0.0, "relay": true}
\ No newline at end of file
diff --git a/tests/testdata/adam_multiple_devices_per_zone/get_device_data/cd0ddb54ef694e11ac18ed1cbce5dbbd.pickle b/tests/testdata/adam_multiple_devices_per_zone/get_device_data/cd0ddb54ef694e11ac18ed1cbce5dbbd.pickle
deleted file mode 100644
index 7870e36cb4608e6c8e72861b5e591c5954890478..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 171
zcmZo*nYw@h0&1sd^oXS9q$ZaXWhQ5qRK_Rg=M|Ucrlw4BcQ9xGtLc%&CLf=fSCU#(
umY6fe-Tnc@EL4LEit<xRlR*YSWEmJx4T8xd83b3zT9lfTSUIJmR1X02a5!B6

diff --git a/tests/testdata/adam_multiple_devices_per_zone/get_device_data/d3da73bde12a47d5a6b8f9dad971f2ec.json b/tests/testdata/adam_multiple_devices_per_zone/get_device_data/d3da73bde12a47d5a6b8f9dad971f2ec.json
new file mode 100644
index 0000000..fd202e0
--- /dev/null
+++ b/tests/testdata/adam_multiple_devices_per_zone/get_device_data/d3da73bde12a47d5a6b8f9dad971f2ec.json
@@ -0,0 +1 @@
+{"setpoint": 15.0, "temperature": 17.1, "battery": 0.62, "valve_position": 0.0, "temperature_difference": 0.1}
\ No newline at end of file
diff --git a/tests/testdata/adam_multiple_devices_per_zone/get_device_data/d3da73bde12a47d5a6b8f9dad971f2ec.pickle b/tests/testdata/adam_multiple_devices_per_zone/get_device_data/d3da73bde12a47d5a6b8f9dad971f2ec.pickle
deleted file mode 100644
index be9f930b0fb0b40ccd744aa92ad80dd9d54cffe7..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 138
zcmZo*nOe^P0ku;!dN_(xOA7Kc^Gc?;JLo}#d$>zda|=?75=%;pQh~yTk~4u|Ru6kp
zVo6DAQRNhO`^VS0Yzr1&@8K&;%qdHaFUT*>EXmBzo8k^NnW0Av$&C1v%(S%BqSU-(
PpmFv)L8i@|RjLO7WgRh&

diff --git a/tests/testdata/adam_multiple_devices_per_zone/get_device_data/df4a4a8169904cdb9c03d61a21f42140.json b/tests/testdata/adam_multiple_devices_per_zone/get_device_data/df4a4a8169904cdb9c03d61a21f42140.json
new file mode 100644
index 0000000..12947c4
--- /dev/null
+++ b/tests/testdata/adam_multiple_devices_per_zone/get_device_data/df4a4a8169904cdb9c03d61a21f42140.json
@@ -0,0 +1 @@
+{"setpoint": 13.0, "temperature": 16.5, "battery": 0.67, "active_preset": "away", "presets": {"home": [20.0, 22.0], "away": [12.0, 25.0], "vacation": [12.0, 28.0], "no_frost": [8.0, 30.0], "asleep": [15.0, 24.0]}, "schedule_temperature": null, "available_schedules": [], "selected_schedule": null, "last_used": null}
\ No newline at end of file
diff --git a/tests/testdata/adam_multiple_devices_per_zone/get_device_data/df4a4a8169904cdb9c03d61a21f42140.pickle b/tests/testdata/adam_multiple_devices_per_zone/get_device_data/df4a4a8169904cdb9c03d61a21f42140.pickle
deleted file mode 100644
index e4650e1556a6b707ba61bb82f1746f39f9e521e7..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 352
zcmYk1u};G<5QagDXaO-G`T&d(L&bm)NI<h?%f^VJYjUWO+}POXR2?ey0d72=fQRA<
zcn?BcM|iUT@4Nrxee(Hwd^DV$q&#&<MmH@<p526)&k5HCEs(d^$G7_-=gAU?&~7DP
z{Ftxrv*!=KfQp(9OJlL`5l&zOTj5D~JNes?tn?b?P0~EO3k&k>K3woHFu*jz#|Wn#
zR6vbx!}KUTjY6x-cdH!*;W{?FMBxOSLNo!-BYrqw&ofu8u=Wbe|6eZn3OZ;MEPD_Q
Z*O&06LxmM#J;qY-sRBo(cUVi|=f7~-X_f#0

diff --git a/tests/testdata/adam_multiple_devices_per_zone/get_device_data/e7693eb9582644e5b865dba8d4447cf1.json b/tests/testdata/adam_multiple_devices_per_zone/get_device_data/e7693eb9582644e5b865dba8d4447cf1.json
new file mode 100644
index 0000000..151b4b4
--- /dev/null
+++ b/tests/testdata/adam_multiple_devices_per_zone/get_device_data/e7693eb9582644e5b865dba8d4447cf1.json
@@ -0,0 +1 @@
+{"setpoint": 5.5, "temperature": 15.6, "battery": 0.68, "valve_position": 0.0, "temperature_difference": 0.0, "active_preset": "no_frost", "presets": {"home": [20.0, 22.0], "asleep": [17.0, 24.0], "away": [15.0, 25.0], "vacation": [15.0, 28.0], "no_frost": [10.0, 30.0]}, "schedule_temperature": null, "available_schedules": [], "selected_schedule": null, "last_used": null}
\ No newline at end of file
diff --git a/tests/testdata/adam_multiple_devices_per_zone/get_device_data/e7693eb9582644e5b865dba8d4447cf1.pickle b/tests/testdata/adam_multiple_devices_per_zone/get_device_data/e7693eb9582644e5b865dba8d4447cf1.pickle
deleted file mode 100644
index e20667850739adc89db2555c669b288c4b621884..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 416
zcmYk1!AiqG5QZZJ8xaLj`UD<wYAK2+h~}1CpFmlrn+aXmX2b3z(u3dwEO^<zkUoo#
z;N5N34V}~Q|KI%l^O5d$N69enF1MLMYL#fnmBlp3_LOkbq6X?TdU<{`jGe522=&&L
z&p%(EFZu7cJ?}yG$XaCt3DvkVBqWKQ9%Qge)HP~sxQ`o&GvFll#~OVHXR}7JS}Wt%
zNzjbjH%!-RgYMPkWpNvh%i=C9Xpg~2#5UNAXx~RWg*Vs+a~92qXl6Zd7-|pUBk(u^
zW1|7MjtNiyKxeNEUt`rtWC!oMrM-k6goKqhB4K<Ddtp!_C#*)<!zU69vCd%Smfh?R
Dptyf2

diff --git a/tests/testdata/adam_multiple_devices_per_zone/get_device_data/f1fee6043d3642a9b0a65297455f008e.json b/tests/testdata/adam_multiple_devices_per_zone/get_device_data/f1fee6043d3642a9b0a65297455f008e.json
new file mode 100644
index 0000000..9934e10
--- /dev/null
+++ b/tests/testdata/adam_multiple_devices_per_zone/get_device_data/f1fee6043d3642a9b0a65297455f008e.json
@@ -0,0 +1 @@
+{"setpoint": 14.0, "temperature": 18.9, "battery": 0.92, "active_preset": "away", "presets": {"asleep": [17.0, 24.0], "no_frost": [10.0, 30.0], "away": [14.0, 25.0], "home": [21.0, 22.0], "vacation": [12.0, 28.0]}, "schedule_temperature": 14.0, "available_schedules": ["Badkamer Schema"], "selected_schedule": "Badkamer Schema", "last_used": "Badkamer Schema"}
\ No newline at end of file
diff --git a/tests/testdata/adam_multiple_devices_per_zone/get_device_data/f1fee6043d3642a9b0a65297455f008e.pickle b/tests/testdata/adam_multiple_devices_per_zone/get_device_data/f1fee6043d3642a9b0a65297455f008e.pickle
deleted file mode 100644
index 8159525692e9f2e0347d052e1cc22abfd38224b3..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 397
zcmZvY&q~BF5XKc2x2}kYdiSu09z;-36#P^6k_YfCWwxEA#k8r(q_PJ=JkK#cfe+;y
zc=H|1ZZ->obDGTjzHesoHu!ko+*rn|OF1z}ovK@MB0C9X-XUx{)Ie6FFQ0$U7Qw?Q
z5TTwsasShOevNLQc^3+*d(1nH-pBC(USRHc7~aM$CTxL`h@E?MsmRX42$5Zd1UYF{
zKGVuj0LBrxi$L&Ps#gn&?0Vg-RD(fz5tWy*ne<Qq)v66Z8iAV?VEND#6_!?F{`chg
y69>>kEn(_`NE&a(dlM+1ph127;0+pZ!21Rz7KG)Rbkz}WOE8pMgXKRWd-@9<L3&gG

diff --git a/tests/testdata/adam_multiple_devices_per_zone/get_device_data/fe799307f1624099878210aa0b9f1475.json b/tests/testdata/adam_multiple_devices_per_zone/get_device_data/fe799307f1624099878210aa0b9f1475.json
new file mode 100644
index 0000000..ef325af
--- /dev/null
+++ b/tests/testdata/adam_multiple_devices_per_zone/get_device_data/fe799307f1624099878210aa0b9f1475.json
@@ -0,0 +1 @@
+{"outdoor_temperature": 7.81}
\ No newline at end of file
diff --git a/tests/testdata/adam_multiple_devices_per_zone/get_device_data/fe799307f1624099878210aa0b9f1475.pickle b/tests/testdata/adam_multiple_devices_per_zone/get_device_data/fe799307f1624099878210aa0b9f1475.pickle
deleted file mode 100644
index cfdd66f7c694687aab6e80f8b7140a43abb59d37..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 46
tcmZo*nX1eH0ku<lg!4;FQu6bQ;!9F<3sQ>`OG=AUr?@-F8-qcy9soE?4if+X

diff --git a/tests/testdata/adam_plus_anna/get_all_devices.json b/tests/testdata/adam_plus_anna/get_all_devices.json
new file mode 100644
index 0000000..8f7bb9d
--- /dev/null
+++ b/tests/testdata/adam_plus_anna/get_all_devices.json
@@ -0,0 +1 @@
+{"2743216f626f43948deec1f7ab3b3d70": {"name": "Adam", "types": {"py/set": ["temperature", "thermostat", "home"]}, "class": "heater_central", "location": "07d618f0bb80412687f065b8698ce3e7"}, "aa6b0002df0a46e1b1eb94beb61eddfe": {"name": "MediaCenter", "types": {"py/set": ["plug", "power"]}, "class": "hometheater", "location": "45d410adf8fd461e85cebf16d5ead542"}, "b128b4bbbd1f47e9bf4d756e8fb5ee94": {"name": "Adam", "types": {"py/set": ["temperature", "thermostat", "home"]}, "class": "gateway", "location": "07d618f0bb80412687f065b8698ce3e7"}, "ee62cad889f94e8ca3d09021f03a660b": {"name": "Anna", "types": {"py/set": ["thermostat"]}, "class": "thermostat", "location": "009490cc2f674ce6b576863fbb64f867"}, "f2be121e4a9345ac83c6e99ed89a98be": {"name": "Work-PC", "types": {"py/set": ["plug", "power"]}, "class": "computer_desktop", "location": "5ccb6c41a7d9403988d261ceee04239f"}}
\ No newline at end of file
diff --git a/tests/testdata/adam_plus_anna/get_all_devices.pickle b/tests/testdata/adam_plus_anna/get_all_devices.pickle
deleted file mode 100644
index 85186211c345432da7e109d3f78418654bec20a7..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 605
zcmYk(&u-K(5C(7r39Y(-5WK)1xq$pH6Z=^8jD)ywL^JlduDZL4vWco5kaz$~^x(cP
z@wQ0#X4#(ar_aBe$L}v+oYt@MDQ{J8w2}}(K{VPK8<@R}J(4CJdQs}F=74)Hxw#Cu
zFS(uXM?RK6^&k!P;9^cZ?T6!xbIF^T_ajd@FB6xC-1;3Jk0rlLj5AL^Js;)?cO{?i
z29NX2a42~z`T){KL1cxI3Tz(*bY#I<&zk$P<SinQ5JH70&;U!4OwJG!NDd)#m8MsD
z^OeI5UacuSmDE;cI}Ug2CO6}5xh@asB5$gDMORTtZ}Qf3!AOB2+8E3_&~~0FN(dce
z=!~iWlFE`Hq9CK`*-<p1?|^Njj@g+fKx$H(UauKv*X#5<ykF<1x9f9eP#%M|E;_^3
zqYlCeC8N*?An4iOTpkYi1W)JH`hU5VDugpmc&{S##xqdYg9ROlz(fnDuA(BAO0q$x
zO^4oU59}NV>(E*H*VWmNVY>bN?dm!1L;6?)-}_-dF7>YhA8+SjJT=sLPvDKjJ~$(^
Svo<J@o|%PF+QqUgU;YAnM#pgg

diff --git a/tests/testdata/adam_plus_anna/get_device_data/2743216f626f43948deec1f7ab3b3d70.json b/tests/testdata/adam_plus_anna/get_device_data/2743216f626f43948deec1f7ab3b3d70.json
new file mode 100644
index 0000000..fe42b6d
--- /dev/null
+++ b/tests/testdata/adam_plus_anna/get_device_data/2743216f626f43948deec1f7ab3b3d70.json
@@ -0,0 +1 @@
+{"heating_state": false, "dhw_state": false, "water_temperature": 47.0, "intended_boiler_temperature": 0.0, "flame_state": false}
\ No newline at end of file
diff --git a/tests/testdata/adam_plus_anna/get_device_data/2743216f626f43948deec1f7ab3b3d70.pickle b/tests/testdata/adam_plus_anna/get_device_data/2743216f626f43948deec1f7ab3b3d70.pickle
deleted file mode 100644
index 507a982ce75ee90eb2dfc62907228899bf34fb2d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 129
zcmZo*nOepG0ku;!dU!KZ6H7Al(&LLu5=&C2boOwjWR$}>g5^NLqWF^3+=A4i#FEmY
s)G6)`?hRn=J<^$ZC8>ESsVVVE`I$NB%Aj^I^l+!;B<7~Vj4agy07bwol>h($

diff --git a/tests/testdata/adam_plus_anna/get_device_data/aa6b0002df0a46e1b1eb94beb61eddfe.json b/tests/testdata/adam_plus_anna/get_device_data/aa6b0002df0a46e1b1eb94beb61eddfe.json
new file mode 100644
index 0000000..018b0f3
--- /dev/null
+++ b/tests/testdata/adam_plus_anna/get_device_data/aa6b0002df0a46e1b1eb94beb61eddfe.json
@@ -0,0 +1 @@
+{"electricity_consumed": 10.3, "electricity_consumed_interval": 0.0, "electricity_produced": 0.0, "electricity_produced_interval": 0.0, "relay": true}
\ No newline at end of file
diff --git a/tests/testdata/adam_plus_anna/get_device_data/aa6b0002df0a46e1b1eb94beb61eddfe.pickle b/tests/testdata/adam_plus_anna/get_device_data/aa6b0002df0a46e1b1eb94beb61eddfe.pickle
deleted file mode 100644
index b086244b7ba5aa976a4c76ae68d7fb033c57c9c6..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 171
zcmZo*nYw@h0&1sd^oXS9q$ZaXWhQ5qRK_Rg=M|Ucrlw4BcTkxL0<(H#vB}40=9Q!t
ql_lm(afcekfND@dQGQBkGRPpfJc>aud29x;7NzDSR!-?C)dK($<2p$I

diff --git a/tests/testdata/adam_plus_anna/get_device_data/b128b4bbbd1f47e9bf4d756e8fb5ee94.json b/tests/testdata/adam_plus_anna/get_device_data/b128b4bbbd1f47e9bf4d756e8fb5ee94.json
new file mode 100644
index 0000000..b019e9e
--- /dev/null
+++ b/tests/testdata/adam_plus_anna/get_device_data/b128b4bbbd1f47e9bf4d756e8fb5ee94.json
@@ -0,0 +1 @@
+{"outdoor_temperature": 11.9}
\ No newline at end of file
diff --git a/tests/testdata/adam_plus_anna/get_device_data/b128b4bbbd1f47e9bf4d756e8fb5ee94.pickle b/tests/testdata/adam_plus_anna/get_device_data/b128b4bbbd1f47e9bf4d756e8fb5ee94.pickle
deleted file mode 100644
index fbfe374d3d5ff205704b93768ab6494255fb87d7..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 46
ucmZo*nX1eH0ku<lg!4;FQu6bQ;!9F<3sQ>`OG=AUr?@+)p8<ih#d-itPZ6>J

diff --git a/tests/testdata/adam_plus_anna/get_device_data/ee62cad889f94e8ca3d09021f03a660b.json b/tests/testdata/adam_plus_anna/get_device_data/ee62cad889f94e8ca3d09021f03a660b.json
new file mode 100644
index 0000000..45f2984
--- /dev/null
+++ b/tests/testdata/adam_plus_anna/get_device_data/ee62cad889f94e8ca3d09021f03a660b.json
@@ -0,0 +1 @@
+{"setpoint": 20.5, "temperature": 20.5, "active_preset": "home", "presets": {"home": [20.0, 22.0], "asleep": [17.0, 24.0], "away": [15.0, 25.0], "vacation": [15.0, 28.0], "no_frost": [10.0, 30.0]}, "schedule_temperature": 20.0, "available_schedules": ["Weekschema"], "selected_schedule": "Weekschema", "last_used": "Weekschema"}
\ No newline at end of file
diff --git a/tests/testdata/adam_plus_anna/get_device_data/ee62cad889f94e8ca3d09021f03a660b.pickle b/tests/testdata/adam_plus_anna/get_device_data/ee62cad889f94e8ca3d09021f03a660b.pickle
deleted file mode 100644
index 56bb434608da3bbffdc3e24994d03dde9d784eae..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 368
zcmZvX!AiqG5QY_kR>gzZNAS>7K@d?8>8+38Ny3=?lHevAGP4m6LLXp`<NKOs-J-=k
z&Hmpv|FWCx3x@~O`Lu=37}EK=6<e=vHdCx;f~G@H5_<fK&#91lK;HEjmrS$DH!wYp
zceZU^%${vAw#7%*tJ^q0kBA-6*@UkXzDqcxclwBMnc#hbvw;ed+P8bc!%k>@{@Qz%
zC|sq6#~&f+oQn!&aLE7v-z5!HJ9-&~Wb#<1r%%A!HfhL6FBlGmpxjAT&Gp0)OCA{I
IUq39r0c!zmivR!s

diff --git a/tests/testdata/adam_plus_anna/get_device_data/f2be121e4a9345ac83c6e99ed89a98be.json b/tests/testdata/adam_plus_anna/get_device_data/f2be121e4a9345ac83c6e99ed89a98be.json
new file mode 100644
index 0000000..212ffaf
--- /dev/null
+++ b/tests/testdata/adam_plus_anna/get_device_data/f2be121e4a9345ac83c6e99ed89a98be.json
@@ -0,0 +1 @@
+{"electricity_consumed": 79.8, "electricity_consumed_interval": 7.03, "electricity_produced": 0.0, "electricity_produced_interval": 0.0, "relay": true}
\ No newline at end of file
diff --git a/tests/testdata/adam_plus_anna/get_device_data/f2be121e4a9345ac83c6e99ed89a98be.pickle b/tests/testdata/adam_plus_anna/get_device_data/f2be121e4a9345ac83c6e99ed89a98be.pickle
deleted file mode 100644
index dd6764f279593f5fce5e54a3c21efabed17eff9e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 171
zcmZo*nYw@h0&1sd^oXS9q$ZaXWhQ5qRK_Rg=M|Ucrlw4BcL@G$3<5o}*yQ6g^GZ^S
x$`W&c3T5PW1io&SM>VLRC_kk%8DtRDDh5=8VDd-?!4<L=rRF47PU$Gs0{~~$JLLcX

diff --git a/tests/testdata/adam_zone_per_device/get_all_devices.json b/tests/testdata/adam_zone_per_device/get_all_devices.json
new file mode 100644
index 0000000..c9aea1e
--- /dev/null
+++ b/tests/testdata/adam_zone_per_device/get_all_devices.json
@@ -0,0 +1 @@
+{"df4a4a8169904cdb9c03d61a21f42140": {"name": "Zone Lisa Bios", "types": {"py/set": ["thermostat"]}, "class": "zone_thermostat", "location": "12493538af164a409c6a1c79e38afe1c"}, "b310b72a0e354bfab43089919b9a88bf": {"name": "Floor kraan", "types": {"py/set": ["thermostat"]}, "class": "thermo_sensor", "location": "c50f167537524366a5af7aa3942feb1e"}, "a2c3583e0a6349358998b760cea82d2a": {"name": "Bios Cv Thermostatic Radiator ", "types": {"py/set": ["thermostat"]}, "class": "thermo_sensor", "location": "12493538af164a409c6a1c79e38afe1c"}, "b59bcebaf94b499ea7d46e4a66fb62d8": {"name": "Zone Lisa WK", "types": {"py/set": ["thermostat"]}, "class": "zone_thermostat", "location": "c50f167537524366a5af7aa3942feb1e"}, "fe799307f1624099878210aa0b9f1475": {"name": "Adam", "types": {"py/set": ["temperature", "thermostat", "home"]}, "class": "gateway", "location": "1f9dcf83fd4e4b66b72ff787957bfe5d"}, "d3da73bde12a47d5a6b8f9dad971f2ec": {"name": "Thermostatic Radiator Jessie", "types": {"py/set": ["thermostat"]}, "class": "thermo_sensor", "location": "82fa13f017d240daa0d0ea1775420f24"}, "21f2b542c49845e6bb416884c55778d6": {"name": "Playstation Smart Plug", "types": {"py/set": ["plug", "power"]}, "class": "game_console", "location": "4efbab4c8bb84fbab26c8decf670eb96"}, "78d1126fc4c743db81b61c20e88342a7": {"name": "CV Pomp", "types": {"py/set": ["plug", "power"]}, "class": "central_heating_pump", "location": "c50f167537524366a5af7aa3942feb1e"}, "90986d591dcd426cae3ec3e8111ff730": {"name": "Adam", "types": {"py/set": ["temperature", "thermostat", "home"]}, "class": "heater_central", "location": "1f9dcf83fd4e4b66b72ff787957bfe5d"}, "cd0ddb54ef694e11ac18ed1cbce5dbbd": {"name": "NAS", "types": {"py/set": ["plug", "power"]}, "class": "vcr", "location": "e704bae65654496f9cade9c855decdfe"}, "4a810418d5394b3f82727340b91ba740": {"name": "USG Smart Plug", "types": {"py/set": ["plug", "power"]}, "class": "router", "location": "0217e9743c174eef9d6e9f680d403ce2"}, "02cf28bfec924855854c544690a609ef": {"name": "NVR", "types": {"py/set": ["plug", "power"]}, "class": "vcr", "location": "c4d2bda6df8146caa2e5c2b5dc65660e"}, "a28f588dc4a049a483fd03a30361ad3a": {"name": "Fibaro HC2", "types": {"py/set": ["plug", "power"]}, "class": "settop", "location": "cd143c07248f491493cea0533bc3d669"}, "6a3bf693d05e48e0b460c815a4fdd09d": {"name": "Zone Thermostat Jessie", "types": {"py/set": ["thermostat"]}, "class": "zone_thermostat", "location": "82fa13f017d240daa0d0ea1775420f24"}, "680423ff840043738f42cc7f1ff97a36": {"name": "Thermostatic Radiator Badkamer", "types": {"py/set": ["thermostat"]}, "class": "thermo_sensor", "location": "08963fec7c53423ca5680aa4cb502c63"}, "f1fee6043d3642a9b0a65297455f008e": {"name": "Zone Thermostat Badkamer", "types": {"py/set": ["thermostat"]}, "class": "zone_thermostat", "location": "08963fec7c53423ca5680aa4cb502c63"}, "675416a629f343c495449970e2ca37b5": {"name": "Ziggo Modem", "types": {"py/set": ["plug", "power"]}, "class": "router", "location": "2b1591ecf6344d4d93b03dece9747648"}, "e7693eb9582644e5b865dba8d4447cf1": {"name": "CV Kraan Garage", "types": {"py/set": ["thermostat"]}, "class": "thermostatic_radiator_valve", "location": "446ac08dd04d4eff8ac57489757b7314"}}
\ No newline at end of file
diff --git a/tests/testdata/adam_zone_per_device/get_all_devices.pickle b/tests/testdata/adam_zone_per_device/get_all_devices.pickle
deleted file mode 100644
index e444c25f1f71728ace1babb93a8c61db5661134c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2187
zcma)7O>Y!O6pUmWBSRpE2t`Un=8!{9q(5GN9l;VrAwdWdB5_&0?tZ<qVt2=y9UBoT
z5<g(1aM=9cytc<+z>&PC-Ps;h)vJ2dZ+HKFd;N>k&)?f0$0ip*Krd|w0#c4437xG(
zB?~ACVp~t`u5m@%@z%?3P0g>14K@!J-DW%P4R4NUv;BvU91Jb>t8O#kuzfe~r6q3o
z!0o^IjoF32#_P*2;jrk|+p&=ff;QS?k(ODAkSxmN0@X(()Ao35qLv~$g@Uw!STKSX
zJ_H$JK<{Iz{Mw!I#=~XT_06jualLK#m{Gg`uDw2fd4@gP(0bGL+xB2=k`avOjCMwW
zwiXQ*ho}RnLQzshMU}Mingm*1IWnS;&Wc3nRaQ8m-mPP34o{lj--}<Q<{9P%4$S5P
zk@l+!eI>yr#6%HGfCwQFx(t>8tu4{2>?i1(AH4YU@dcpIM}Ae!g<J?)I3A8-FM@Yo
zNr5P0C=#5RfOqd_T%7@qyKTq0X!pk(1Fepz$KklAZJqo690z)hZ%!vJOUS8sT`~|v
zYuV3IoOi*vSjgl$@vJjC9WzOV;Ics*J->!II9U{>3H`gvC;ba;HVbC*-uSb5dsR^C
zBBaYKDYKR=2&Hodlqd=+Fb7>l{+%FrFl1u{X}yPJjB`HQ3HZ*_CBCWY=IA!hSJ)5D
z)8+Ae8pPgF_nP|cxO-He)dAd`^UBOp$FW;7F*YBlM2>IrF?y(9l}$cVD%J^#!B#R1
zD5bI`L2{sT^fFqRlpyalD0CB<{lgc{({6P%3BK3<R3X1kv>tj~&RSxc>-p^HxE{G;
z<bw#_W)oyi8JHT9rliSBDcLN2S_JJ*`+d9DHVk&Ff>1x3Fd3%(fd!;2a^`VTu>nX*
zOwv=9i6d=tjCm5U^W^^XkIC<xq_g!TCm<qOV+}yCB_zxgk~fBDmCNaR*1{4XeKx$c
zQ5UbAavC_PGNL;xEiQ#ye>{KmnOE&Jt!sUE%mPm5Bb0O$c;ZPqAmZFv3dMSnLFh!P
zS|d~{iVKHQP{3@w;fMg(z#Sn1ofpy0lNZnaM_GcbVn&;bm%sx?MJ93fa$>PoOvU4i
z@jfR&0Rf>djnJrt=1$J~ym$^CE+Y0_^Yfwl80^}HhM}8W&yp1h$8-w>$vwvPC5+ZF
zamCwERaw-Lt<qT-0#70Wmz<Xdq2w&WxnFlq+vdaWHJ>fq<-K#21>`Y<(xrG10<_ai
zR;9!>R7!BD&lm9S2lR^_`vCJR-Zb{{lilZA!fJNQCBv(u6B-6WgcJ>1X?0c47(|v)
zv$nimA+nc7aS)6tLU@|e`pu{6F9E$=|5ZrvRm6>hR)wP3F9<dFfjdDZ)GnU)?v0m=
z`Mhg>>oQICds&iIl)S>VR5U<_9CYOSoKj7<v*4?0a%?y^j`7L@kcr;%Zlccs;8Ky3
z>f2m0kL!KfJi;F57u$9GcDQii&HCxWo1NhDWGXwbn1tsHF$-dIF&PIwIIeuBB{%Q!
Gz5f8NjJqcQ

diff --git a/tests/testdata/adam_zone_per_device/get_device_data/02cf28bfec924855854c544690a609ef.json b/tests/testdata/adam_zone_per_device/get_device_data/02cf28bfec924855854c544690a609ef.json
new file mode 100644
index 0000000..c65d293
--- /dev/null
+++ b/tests/testdata/adam_zone_per_device/get_device_data/02cf28bfec924855854c544690a609ef.json
@@ -0,0 +1 @@
+{"electricity_consumed": 34.0, "electricity_consumed_interval": 8.65, "electricity_produced": 0.0, "electricity_produced_interval": 0.0, "relay": true}
\ No newline at end of file
diff --git a/tests/testdata/adam_zone_per_device/get_device_data/02cf28bfec924855854c544690a609ef.pickle b/tests/testdata/adam_zone_per_device/get_device_data/02cf28bfec924855854c544690a609ef.pickle
deleted file mode 100644
index faa5c7d93f564bb9012a9abee8a703d94500b5a7..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 171
zcmZo*nYw@h0&1sd^oXS9q$ZaXWhQ5qRK_Rg=M|Ucrlw4BcW{I#>5;`IAD@|5l3G-j
um;+R(=yL`L&Y~JrP?VoinhY`sY83;jK`?nFgWw8Ti&AqEE2ngn>Hz@k>pOV>

diff --git a/tests/testdata/adam_zone_per_device/get_device_data/21f2b542c49845e6bb416884c55778d6.json b/tests/testdata/adam_zone_per_device/get_device_data/21f2b542c49845e6bb416884c55778d6.json
new file mode 100644
index 0000000..39f9396
--- /dev/null
+++ b/tests/testdata/adam_zone_per_device/get_device_data/21f2b542c49845e6bb416884c55778d6.json
@@ -0,0 +1 @@
+{"electricity_consumed": 81.2, "electricity_consumed_interval": 12.7, "electricity_produced": 0.0, "electricity_produced_interval": 0.0, "relay": true}
\ No newline at end of file
diff --git a/tests/testdata/adam_zone_per_device/get_device_data/21f2b542c49845e6bb416884c55778d6.pickle b/tests/testdata/adam_zone_per_device/get_device_data/21f2b542c49845e6bb416884c55778d6.pickle
deleted file mode 100644
index 4d23cd622b10b3b6ae6b7bb197cf351c83d5b805..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 171
zcmZo*nYw@h0&1sd^oXS9q$ZaXWhQ5qRK_Rg=M|Ucrlw4BcL?!00|aM#WU<M|XXcfp
u7L_ID02OMcfdQ&P1x5KOrO6<JpjI)U8U&L^G6=4awJ0?wv2sdBsU84&j6L`O

diff --git a/tests/testdata/adam_zone_per_device/get_device_data/4a810418d5394b3f82727340b91ba740.json b/tests/testdata/adam_zone_per_device/get_device_data/4a810418d5394b3f82727340b91ba740.json
new file mode 100644
index 0000000..feb6290
--- /dev/null
+++ b/tests/testdata/adam_zone_per_device/get_device_data/4a810418d5394b3f82727340b91ba740.json
@@ -0,0 +1 @@
+{"electricity_consumed": 8.5, "electricity_consumed_interval": 0.0, "electricity_produced": 0.0, "electricity_produced_interval": 0.0, "relay": true}
\ No newline at end of file
diff --git a/tests/testdata/adam_zone_per_device/get_device_data/4a810418d5394b3f82727340b91ba740.pickle b/tests/testdata/adam_zone_per_device/get_device_data/4a810418d5394b3f82727340b91ba740.pickle
deleted file mode 100644
index 68d7b4f0a21c1042678beab330a6f065e9d7cdb6..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 171
zcmZo*nYw@h0&1sd^oXS9q$ZaXWhQ5qRK_Rg=M|Ucrlw4BcTj{V>5;`IAD@|5l3G-j
om@~y4Y7_&iK?OzmDW%CEgW&Qg2EpX98N^zYnv+;LrK40207LLLuK)l5

diff --git a/tests/testdata/adam_zone_per_device/get_device_data/675416a629f343c495449970e2ca37b5.json b/tests/testdata/adam_zone_per_device/get_device_data/675416a629f343c495449970e2ca37b5.json
new file mode 100644
index 0000000..e423baf
--- /dev/null
+++ b/tests/testdata/adam_zone_per_device/get_device_data/675416a629f343c495449970e2ca37b5.json
@@ -0,0 +1 @@
+{"electricity_consumed": 12.2, "electricity_consumed_interval": 2.8, "electricity_produced": 0.0, "electricity_produced_interval": 0.0, "relay": true}
\ No newline at end of file
diff --git a/tests/testdata/adam_zone_per_device/get_device_data/675416a629f343c495449970e2ca37b5.pickle b/tests/testdata/adam_zone_per_device/get_device_data/675416a629f343c495449970e2ca37b5.pickle
deleted file mode 100644
index 80dd7e1789d1384ee7497c2a2f3d455f834b095e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 171
zcmZo*nYw@h0&1sd^oXS9q$ZaXWhQ5qRK_Rg=M|Ucrlw4BchE=!gC1FI^6{B@C8<Sa
ri8(-pY*2+L1{D<Lr<5jx41!w4fNBs-9?2lMLe`?xoW#m09i@5zWh^_y

diff --git a/tests/testdata/adam_zone_per_device/get_device_data/680423ff840043738f42cc7f1ff97a36.json b/tests/testdata/adam_zone_per_device/get_device_data/680423ff840043738f42cc7f1ff97a36.json
new file mode 100644
index 0000000..25afa45
--- /dev/null
+++ b/tests/testdata/adam_zone_per_device/get_device_data/680423ff840043738f42cc7f1ff97a36.json
@@ -0,0 +1 @@
+{"setpoint": 14.0, "temperature": 19.1, "battery": 0.51, "valve_position": 0.0, "temperature_difference": -0.3}
\ No newline at end of file
diff --git a/tests/testdata/adam_zone_per_device/get_device_data/680423ff840043738f42cc7f1ff97a36.pickle b/tests/testdata/adam_zone_per_device/get_device_data/680423ff840043738f42cc7f1ff97a36.pickle
deleted file mode 100644
index ba34db3cbdd8018df15f8cb77d962252cdd12a1b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 138
zcmZo*nOe^P0ku;!dN_(xOA7Kc^Gc?;JLo`!d$>zda|=?75=%;pQh~z8k~4u|Ru6kp
zVo6DAQRNhO`v-xqTjh2H_3)J?=9Hzz7vvXbmSpDVO>u{s%+Mo-WJY{SW?EWmQEFZ?
N(764VjlrN)4**tgFQEVc

diff --git a/tests/testdata/adam_zone_per_device/get_device_data/6a3bf693d05e48e0b460c815a4fdd09d.json b/tests/testdata/adam_zone_per_device/get_device_data/6a3bf693d05e48e0b460c815a4fdd09d.json
new file mode 100644
index 0000000..808a3d7
--- /dev/null
+++ b/tests/testdata/adam_zone_per_device/get_device_data/6a3bf693d05e48e0b460c815a4fdd09d.json
@@ -0,0 +1 @@
+{"setpoint": 16.0, "temperature": 17.1, "battery": 0.37, "active_preset": "asleep", "presets": {"home": [20.0, 22.0], "no_frost": [10.0, 30.0], "away": [12.0, 25.0], "vacation": [11.0, 28.0], "asleep": [16.0, 24.0]}, "schedule_temperature": 15.0, "available_schedules": ["CV Jessie"], "selected_schedule": "CV Jessie", "last_used": "CV Jessie"}
\ No newline at end of file
diff --git a/tests/testdata/adam_zone_per_device/get_device_data/6a3bf693d05e48e0b460c815a4fdd09d.pickle b/tests/testdata/adam_zone_per_device/get_device_data/6a3bf693d05e48e0b460c815a4fdd09d.pickle
deleted file mode 100644
index d7457d57d581a9ed2c5be9b8bc4391521b0f4938..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 387
zcmY+<u}Z{15C&j{;N=ht@ht2tL{iBKA_}4biv=IRPQqL=l7+o&$V{Rq2=@R}u7y6t
zy^ghSV$9wOx79NL$NoFZ=;L*JYdG&Nk(iKct1EUYo%*rtGR|vkfZGQ9@%hnbf4*ci
z17>U%PThU4CT~A#C3}#w?l7wx?B8*+17r|uCnG;0_tz1Xc8>1JB`Uq}6)L^-7nHcN
z*>huwJva&AHh>6TVBy0ggx4XAJIH~xtvoml;3k0ZqoIAhph~aSaVrzbODtN0+2+#I
v<v`>BI?x7YJqVKeE*alH9zP(FMhCJ_XfS6i{*5aSWo&>rYYB@D-k$veO>%cU

diff --git a/tests/testdata/adam_zone_per_device/get_device_data/78d1126fc4c743db81b61c20e88342a7.json b/tests/testdata/adam_zone_per_device/get_device_data/78d1126fc4c743db81b61c20e88342a7.json
new file mode 100644
index 0000000..dcf0686
--- /dev/null
+++ b/tests/testdata/adam_zone_per_device/get_device_data/78d1126fc4c743db81b61c20e88342a7.json
@@ -0,0 +1 @@
+{"electricity_consumed": 35.8, "electricity_consumed_interval": 5.85, "electricity_produced": 0.0, "electricity_produced_interval": 0.0, "relay": true}
\ No newline at end of file
diff --git a/tests/testdata/adam_zone_per_device/get_device_data/78d1126fc4c743db81b61c20e88342a7.pickle b/tests/testdata/adam_zone_per_device/get_device_data/78d1126fc4c743db81b61c20e88342a7.pickle
deleted file mode 100644
index a1ba907669c468499f9539fc3d6ea28c62896e88..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 171
zcmZo*nYw@h0&1sd^oXS9q$ZaXWhQ5qRK_Rg=M|Ucrlw4BcW```1_C{@*yQ6g^GZ^S
t$`W&c3dO<d(ohX5D9TSMO$HeRwTc1NAecOoL2!kvMX5Q7l~X!O^#Hk>JZ=C0

diff --git a/tests/testdata/adam_zone_per_device/get_device_data/90986d591dcd426cae3ec3e8111ff730.json b/tests/testdata/adam_zone_per_device/get_device_data/90986d591dcd426cae3ec3e8111ff730.json
new file mode 100644
index 0000000..5e481d3
--- /dev/null
+++ b/tests/testdata/adam_zone_per_device/get_device_data/90986d591dcd426cae3ec3e8111ff730.json
@@ -0,0 +1 @@
+{"water_temperature": 70.0, "intended_boiler_temperature": 70.0, "modulation_level": 0.01}
\ No newline at end of file
diff --git a/tests/testdata/adam_zone_per_device/get_device_data/90986d591dcd426cae3ec3e8111ff730.pickle b/tests/testdata/adam_zone_per_device/get_device_data/90986d591dcd426cae3ec3e8111ff730.pickle
deleted file mode 100644
index a277db63cd753db7530c04435f31f75daddc85fa..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 112
zcmZo*nVQM~0ku;!dIZZ8OHzyCOHy+SQi~ExN{dpbxH|+kfEDyeXXcfp=B1>j#3$uv
l=HOH&kei=Unv+<PnV%P*lUkOVGsWG$rRt&kI+5y9JplPmCZ_-Z

diff --git a/tests/testdata/adam_zone_per_device/get_device_data/a28f588dc4a049a483fd03a30361ad3a.json b/tests/testdata/adam_zone_per_device/get_device_data/a28f588dc4a049a483fd03a30361ad3a.json
new file mode 100644
index 0000000..b2e0f36
--- /dev/null
+++ b/tests/testdata/adam_zone_per_device/get_device_data/a28f588dc4a049a483fd03a30361ad3a.json
@@ -0,0 +1 @@
+{"electricity_consumed": 12.5, "electricity_consumed_interval": 0.0, "electricity_produced": 0.0, "electricity_produced_interval": 0.0, "relay": true}
\ No newline at end of file
diff --git a/tests/testdata/adam_zone_per_device/get_device_data/a28f588dc4a049a483fd03a30361ad3a.pickle b/tests/testdata/adam_zone_per_device/get_device_data/a28f588dc4a049a483fd03a30361ad3a.pickle
deleted file mode 100644
index 4f3a71e640437269374f08a0ca2e507ecb227572..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 171
zcmZo*nYw@h0&1sd^oXS9q$ZaXWhQ5qRK_Rg=M|Ucrlw4BchH0=>5;`IAD@|5l3G-j
om@~y4Y7_&iK?OzmDW%CEgW&Qg2EpX98N^zYnv+;LrK40207wuvw*UYD

diff --git a/tests/testdata/adam_zone_per_device/get_device_data/a2c3583e0a6349358998b760cea82d2a.json b/tests/testdata/adam_zone_per_device/get_device_data/a2c3583e0a6349358998b760cea82d2a.json
new file mode 100644
index 0000000..09bf215
--- /dev/null
+++ b/tests/testdata/adam_zone_per_device/get_device_data/a2c3583e0a6349358998b760cea82d2a.json
@@ -0,0 +1 @@
+{"setpoint": 13.0, "temperature": 17.1, "battery": 0.62, "valve_position": 0.0, "temperature_difference": -0.1}
\ No newline at end of file
diff --git a/tests/testdata/adam_zone_per_device/get_device_data/a2c3583e0a6349358998b760cea82d2a.pickle b/tests/testdata/adam_zone_per_device/get_device_data/a2c3583e0a6349358998b760cea82d2a.pickle
deleted file mode 100644
index 755242d47ad25e4fc6159bbaab5e69d34d67c36d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 138
zcmZo*nOe^P0ku;!dN_(xOA7Kc^Gc?;J7__Kd$>zda|=?75=%;pQh~yTk~4u|Ru6kp
zVo6DAQRNhO`^VS0Yzr1&@8K&;%qdHaFUT*>EXmBzo8k^NnW0Av$&C1v%(S%BqSU-(
PpmF<mf=rt^t5gpFXkju6

diff --git a/tests/testdata/adam_zone_per_device/get_device_data/b310b72a0e354bfab43089919b9a88bf.json b/tests/testdata/adam_zone_per_device/get_device_data/b310b72a0e354bfab43089919b9a88bf.json
new file mode 100644
index 0000000..31f707d
--- /dev/null
+++ b/tests/testdata/adam_zone_per_device/get_device_data/b310b72a0e354bfab43089919b9a88bf.json
@@ -0,0 +1 @@
+{"setpoint": 21.5, "temperature": 26.2, "valve_position": 1.0, "temperature_difference": 3.7}
\ No newline at end of file
diff --git a/tests/testdata/adam_zone_per_device/get_device_data/b310b72a0e354bfab43089919b9a88bf.pickle b/tests/testdata/adam_zone_per_device/get_device_data/b310b72a0e354bfab43089919b9a88bf.pickle
deleted file mode 100644
index 34baa0f12e05947e6237e3e5aa17011a499103df..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 119
zcmZo*nVQ1@0ku;!dN_(xOA7Kc^Gc?;JD4_r#e29*QgaJZixNvpi&BBYR>ok^!&jD=
tQ<fTEkYAixl9``3#ohh`#GD>6Bn|N?nQ3XMMX7noAicaZL10#?9srEpC>H<#

diff --git a/tests/testdata/adam_zone_per_device/get_device_data/b59bcebaf94b499ea7d46e4a66fb62d8.json b/tests/testdata/adam_zone_per_device/get_device_data/b59bcebaf94b499ea7d46e4a66fb62d8.json
new file mode 100644
index 0000000..8c76cd6
--- /dev/null
+++ b/tests/testdata/adam_zone_per_device/get_device_data/b59bcebaf94b499ea7d46e4a66fb62d8.json
@@ -0,0 +1 @@
+{"setpoint": 21.5, "temperature": 21.1, "battery": 0.34, "active_preset": "home", "presets": {"vacation": [15.0, 28.0], "asleep": [18.0, 24.0], "no_frost": [12.0, 30.0], "away": [17.0, 25.0], "home": [21.5, 22.0]}, "schedule_temperature": 21.5, "available_schedules": ["GF7  Woonkamer"], "selected_schedule": "GF7  Woonkamer", "last_used": "GF7  Woonkamer"}
\ No newline at end of file
diff --git a/tests/testdata/adam_zone_per_device/get_device_data/b59bcebaf94b499ea7d46e4a66fb62d8.pickle b/tests/testdata/adam_zone_per_device/get_device_data/b59bcebaf94b499ea7d46e4a66fb62d8.pickle
deleted file mode 100644
index 4528930cc443335e80d13f5327419174acd9f602..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 395
zcmZXP&q~BF5Qi0tyCMpr9=z?brv(N7foM<W5xgj6wjF7)ZAvn!>_O-Q40wqLeH?uT
zAH};h+3aC=PRV><=9lTC_kMH3)vJwptdUw-He^L|*1I<E5Y{a!AfxcVef%-hCy!=8
zglcZZ?a$ZSL;U;AyO2@YVcIGj=2(sjS)=8VziaCfI>>-Z+1N)Li)8AvMRM&A$XlQ*
z#Ma}}fG-0cH!^)vQj-_rAlw8Yf)|*3coN{%61pF`<i&a-IbT4-hdL`THx;HUEB8*}
y1L&ZvU^WQB)I$>QiMxx*<X+0=8ERA(cwb|M8DYK@ZE?ig6=+J0#(e#anf?LJV|!2l

diff --git a/tests/testdata/adam_zone_per_device/get_device_data/cd0ddb54ef694e11ac18ed1cbce5dbbd.json b/tests/testdata/adam_zone_per_device/get_device_data/cd0ddb54ef694e11ac18ed1cbce5dbbd.json
new file mode 100644
index 0000000..8b420a3
--- /dev/null
+++ b/tests/testdata/adam_zone_per_device/get_device_data/cd0ddb54ef694e11ac18ed1cbce5dbbd.json
@@ -0,0 +1 @@
+{"electricity_consumed": 16.5, "electricity_consumed_interval": 0.29, "electricity_produced": 0.0, "electricity_produced_interval": 0.0, "relay": true}
\ No newline at end of file
diff --git a/tests/testdata/adam_zone_per_device/get_device_data/cd0ddb54ef694e11ac18ed1cbce5dbbd.pickle b/tests/testdata/adam_zone_per_device/get_device_data/cd0ddb54ef694e11ac18ed1cbce5dbbd.pickle
deleted file mode 100644
index 7ba46a53ad3012e5f36c5f55a31dae0c81bb6a7a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 171
zcmZo*nYw@h0&1sd^oXS9q$ZaXWhQ5qRK_Rg=M|Ucrlw4BcQ9xGtLc%&CLf=fSCU#(
xmY6fe-TqR4jK<eP{ip^N6y>LsCW8!uTE&2B5KJD)Ah<%-qSTzk$|)VCdH@oDJE#Bv

diff --git a/tests/testdata/adam_zone_per_device/get_device_data/d3da73bde12a47d5a6b8f9dad971f2ec.json b/tests/testdata/adam_zone_per_device/get_device_data/d3da73bde12a47d5a6b8f9dad971f2ec.json
new file mode 100644
index 0000000..85dbd38
--- /dev/null
+++ b/tests/testdata/adam_zone_per_device/get_device_data/d3da73bde12a47d5a6b8f9dad971f2ec.json
@@ -0,0 +1 @@
+{"setpoint": 16.0, "temperature": 16.9, "battery": 0.62, "valve_position": 0.0, "temperature_difference": 0.1}
\ No newline at end of file
diff --git a/tests/testdata/adam_zone_per_device/get_device_data/d3da73bde12a47d5a6b8f9dad971f2ec.pickle b/tests/testdata/adam_zone_per_device/get_device_data/d3da73bde12a47d5a6b8f9dad971f2ec.pickle
deleted file mode 100644
index a3667e741b6dab8b74fba3aea4435b36380f72f6..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 138
zcmZo*nOe^P0ku;!dN_(xOA7Kc^Gc?;I~YKOd$>zda|=?75=%;pQbEGc(m<exJt?uI
zB(<n=io5;e>s+=4i?8?al_lnsrN$TJ7iX4a=I2duhnmdLBZg!~d`f0oT53^hUNX=)
M`<*jEU{<Lf09Q~kTmS$7

diff --git a/tests/testdata/adam_zone_per_device/get_device_data/df4a4a8169904cdb9c03d61a21f42140.json b/tests/testdata/adam_zone_per_device/get_device_data/df4a4a8169904cdb9c03d61a21f42140.json
new file mode 100644
index 0000000..12947c4
--- /dev/null
+++ b/tests/testdata/adam_zone_per_device/get_device_data/df4a4a8169904cdb9c03d61a21f42140.json
@@ -0,0 +1 @@
+{"setpoint": 13.0, "temperature": 16.5, "battery": 0.67, "active_preset": "away", "presets": {"home": [20.0, 22.0], "away": [12.0, 25.0], "vacation": [12.0, 28.0], "no_frost": [8.0, 30.0], "asleep": [15.0, 24.0]}, "schedule_temperature": null, "available_schedules": [], "selected_schedule": null, "last_used": null}
\ No newline at end of file
diff --git a/tests/testdata/adam_zone_per_device/get_device_data/df4a4a8169904cdb9c03d61a21f42140.pickle b/tests/testdata/adam_zone_per_device/get_device_data/df4a4a8169904cdb9c03d61a21f42140.pickle
deleted file mode 100644
index e4650e1556a6b707ba61bb82f1746f39f9e521e7..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 352
zcmYk1u};G<5QagDXaO-G`T&d(L&bm)NI<h?%f^VJYjUWO+}POXR2?ey0d72=fQRA<
zcn?BcM|iUT@4Nrxee(Hwd^DV$q&#&<MmH@<p526)&k5HCEs(d^$G7_-=gAU?&~7DP
z{Ftxrv*!=KfQp(9OJlL`5l&zOTj5D~JNes?tn?b?P0~EO3k&k>K3woHFu*jz#|Wn#
zR6vbx!}KUTjY6x-cdH!*;W{?FMBxOSLNo!-BYrqw&ofu8u=Wbe|6eZn3OZ;MEPD_Q
Z*O&06LxmM#J;qY-sRBo(cUVi|=f7~-X_f#0

diff --git a/tests/testdata/adam_zone_per_device/get_device_data/e7693eb9582644e5b865dba8d4447cf1.json b/tests/testdata/adam_zone_per_device/get_device_data/e7693eb9582644e5b865dba8d4447cf1.json
new file mode 100644
index 0000000..cd5bfa3
--- /dev/null
+++ b/tests/testdata/adam_zone_per_device/get_device_data/e7693eb9582644e5b865dba8d4447cf1.json
@@ -0,0 +1 @@
+{"setpoint": 5.5, "temperature": 15.6, "battery": 0.68, "valve_position": 0.0, "temperature_difference": 0.1, "active_preset": "no_frost", "presets": {"home": [20.0, 22.0], "asleep": [17.0, 24.0], "away": [15.0, 25.0], "vacation": [15.0, 28.0], "no_frost": [10.0, 30.0]}, "schedule_temperature": null, "available_schedules": [], "selected_schedule": null, "last_used": null}
\ No newline at end of file
diff --git a/tests/testdata/adam_zone_per_device/get_device_data/e7693eb9582644e5b865dba8d4447cf1.pickle b/tests/testdata/adam_zone_per_device/get_device_data/e7693eb9582644e5b865dba8d4447cf1.pickle
deleted file mode 100644
index 2fe233a02760d0545614b457616e2acdee819ed9..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 416
zcmYk1K}y6h7=<eory>fX%n4j{H6n^Ah|^tna{{IOlm2A_nWiLZWfp=5_`ywPp*L}>
zXYmN`O&e3@t$yD3@_2cTx7)pF(2Gqe(P$dUYh&|l>TNnSxNcB^X%#yA;%X30mS7C3
zjm_sjUvH1;?>8NHAUZ4>skz~@wz+SJBAV`W6eX`JR9G`tH~)O^^+89#4DTN+bQ>%s
zwJa(nwL2%?)3#q2ujCr-lTGvN+SljVjX#j~K?}sj<I8|=1CHStHXhCbybCbtfWa_(
zC?5m&V_;k~1kOXl!+)TqGtE|5wgQWt@7e{OLI+&H(t(iBZU&ub6vzygqwT^60<<Yw
Jjip_*vp=x_gSY?y

diff --git a/tests/testdata/adam_zone_per_device/get_device_data/f1fee6043d3642a9b0a65297455f008e.json b/tests/testdata/adam_zone_per_device/get_device_data/f1fee6043d3642a9b0a65297455f008e.json
new file mode 100644
index 0000000..caf4e5e
--- /dev/null
+++ b/tests/testdata/adam_zone_per_device/get_device_data/f1fee6043d3642a9b0a65297455f008e.json
@@ -0,0 +1 @@
+{"setpoint": 14.0, "temperature": 18.8, "battery": 0.92, "active_preset": "away", "presets": {"asleep": [17.0, 24.0], "no_frost": [10.0, 30.0], "away": [14.0, 25.0], "home": [21.0, 22.0], "vacation": [12.0, 28.0]}, "schedule_temperature": 14.0, "available_schedules": ["Badkamer Schema"], "selected_schedule": "Badkamer Schema", "last_used": "Badkamer Schema"}
\ No newline at end of file
diff --git a/tests/testdata/adam_zone_per_device/get_device_data/f1fee6043d3642a9b0a65297455f008e.pickle b/tests/testdata/adam_zone_per_device/get_device_data/f1fee6043d3642a9b0a65297455f008e.pickle
deleted file mode 100644
index ac7206f2f1747e23b0a45c383a6040cd05baaf47..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 397
zcmZvY&q~BF5XKc2x2}kYdiSu09z;-36#P^6k_YfCWwsq@F>Puxsq8@z&vT4V;Opqw
zr|=!jZZ->obDGTjzHesoI(UCuUt7eBOF1z}ovK@MB0CCY-Xd%|)Ie6FFQ0zS<BNw=
zAVNKJ;`XQe_#Rz9@ir7x_n3DYy^rGoJj2ZKFuaYMPuKt>5j%J9Qjwj65hA+?33Ae^
z{6Q;20T@T%CIZ28p<XU1vddMoQVj;>SyZ0KX3|3eRI4@sX#}p8faQHtR9ISx`QMY{
yPwYVtwS=h$B5AxC?@XY4ga-BDoi}K}0q+`=SP+&g(p3k%DZx-~4VM3i?C~$A;(R#(

diff --git a/tests/testdata/adam_zone_per_device/get_device_data/fe799307f1624099878210aa0b9f1475.json b/tests/testdata/adam_zone_per_device/get_device_data/fe799307f1624099878210aa0b9f1475.json
new file mode 100644
index 0000000..a6c7ff3
--- /dev/null
+++ b/tests/testdata/adam_zone_per_device/get_device_data/fe799307f1624099878210aa0b9f1475.json
@@ -0,0 +1 @@
+{"outdoor_temperature": 7.69}
\ No newline at end of file
diff --git a/tests/testdata/adam_zone_per_device/get_device_data/fe799307f1624099878210aa0b9f1475.pickle b/tests/testdata/adam_zone_per_device/get_device_data/fe799307f1624099878210aa0b9f1475.pickle
deleted file mode 100644
index ad35d67493957435de019694bcaee2138acaa088..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 46
ucmZo*nX1eH0ku<lg!4;FQu6bQ;!9F<3sQ>`OG=AUr?@-FodJQf#d-is{t>AF

diff --git a/tests/testdata/anna_heatpump/get_all_devices.json b/tests/testdata/anna_heatpump/get_all_devices.json
new file mode 100644
index 0000000..4992a17
--- /dev/null
+++ b/tests/testdata/anna_heatpump/get_all_devices.json
@@ -0,0 +1 @@
+{"1cbf783bb11e4a7c8a6843dee3a86927": {"name": "Anna", "types": {"py/set": ["temperature", "thermostat", "home"]}, "class": "heater_central", "location": "a57efe5f145f498c9be62a9b63626fbf"}, "015ae9ea3f964e668e490fa39da3870b": {"name": "Anna", "types": {"py/set": ["temperature", "thermostat", "home"]}, "class": "gateway", "location": "a57efe5f145f498c9be62a9b63626fbf"}, "3cb70739631c4d17a86b8b12e8a5161b": {"name": "Anna", "types": {"py/set": ["thermostat"]}, "class": "thermostat", "location": "c784ee9fdab44e1395b8dee7d7a497d5"}}
\ No newline at end of file
diff --git a/tests/testdata/anna_heatpump/get_all_devices.pickle b/tests/testdata/anna_heatpump/get_all_devices.pickle
deleted file mode 100644
index b96be95e36bac89227dd0593fd2795d3f0c9e121..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 357
zcmYk2O-{ow5QRY`P?f?NvSd}o@&A%*ut8&I%pj#nl{i9OAaMXobYbpGg1TU~Z{EE3
z%~$dBa((qTpZO_O%)6iscaAX>puGWQ1aA>J7-bus*R7(51Ljmb_dVoP#?uj}{Jjb^
ztim=Dj)!525OcbZcsSw+aUL<BQ|UXHrkoxLA>#Pzv5zBkIc>VZLwq0loGOqS1IoaJ
z48j_39jXSbQ(QGFxRB>m)l33f1RksssFXor>j2!gz>Tim+LUgnpptHBo9^D0xDPmG
z+R?*e=icdBbE`P>qGfu)bH=d-4M?Wg#eQL=a-pNmdAakSjdrQ>+6Y7&T5v)j<5oJe
Pyi2zlgw?Ig^Su8BjHGr6

diff --git a/tests/testdata/anna_heatpump/get_device_data/015ae9ea3f964e668e490fa39da3870b.json b/tests/testdata/anna_heatpump/get_device_data/015ae9ea3f964e668e490fa39da3870b.json
new file mode 100644
index 0000000..750aa8b
--- /dev/null
+++ b/tests/testdata/anna_heatpump/get_device_data/015ae9ea3f964e668e490fa39da3870b.json
@@ -0,0 +1 @@
+{"outdoor_temperature": 20.2}
\ No newline at end of file
diff --git a/tests/testdata/anna_heatpump/get_device_data/015ae9ea3f964e668e490fa39da3870b.pickle b/tests/testdata/anna_heatpump/get_device_data/015ae9ea3f964e668e490fa39da3870b.pickle
deleted file mode 100644
index 1c1ea0d028632b0e6143408048a8bc38ebf51ebd..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 46
tcmZo*nX1eH0ku<lg!4;FQu6bQ;!9F<3sQ>`OG=AUr?@+q7=uBv9soHA4k!Qs

diff --git a/tests/testdata/anna_heatpump/get_device_data/1cbf783bb11e4a7c8a6843dee3a86927.json b/tests/testdata/anna_heatpump/get_device_data/1cbf783bb11e4a7c8a6843dee3a86927.json
new file mode 100644
index 0000000..a8aea8e
--- /dev/null
+++ b/tests/testdata/anna_heatpump/get_device_data/1cbf783bb11e4a7c8a6843dee3a86927.json
@@ -0,0 +1 @@
+{"outdoor_temperature": 18.0, "heating_state": false, "dhw_state": false, "water_temperature": 29.1, "return_temperature": 25.1, "water_pressure": 1.57, "intended_boiler_temperature": 0.0, "modulation_level": 0.52, "cooling_state": false, "slave_boiler_state": false, "compressor_state": true, "flame_state": false}
\ No newline at end of file
diff --git a/tests/testdata/anna_heatpump/get_device_data/1cbf783bb11e4a7c8a6843dee3a86927.pickle b/tests/testdata/anna_heatpump/get_device_data/1cbf783bb11e4a7c8a6843dee3a86927.pickle
deleted file mode 100644
index 40865d2140084f3c635f7db20705924f45e2f2d8..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 272
zcmZo*naaw@00y;FG<tY5QWHxu^U~vsOA<>`r*!skreu`EIfCUt!J_z*)ZBv9qQsKY
zqSPtw4z`jrfnZjTP*EySBo9s25-Q6F(OOWHT3ig)Xa7@fN8syL`5x)aypq(sl+={?
zr2NbrbmJjTV_@hJ$jwhF%>g<tKQBHfwJbGfio5-T#n-uP3zqcoCg<npAiG+qI47|z
g6=opJF9ON=xnKw67eT$$(ZijVlbD+d^I@qT0Pb09yZ`_I

diff --git a/tests/testdata/anna_heatpump/get_device_data/3cb70739631c4d17a86b8b12e8a5161b.json b/tests/testdata/anna_heatpump/get_device_data/3cb70739631c4d17a86b8b12e8a5161b.json
new file mode 100644
index 0000000..2a092e7
--- /dev/null
+++ b/tests/testdata/anna_heatpump/get_device_data/3cb70739631c4d17a86b8b12e8a5161b.json
@@ -0,0 +1 @@
+{"setpoint": 21.0, "temperature": 23.3, "active_preset": "home", "presets": {"no_frost": [10.0, 30.0], "home": [21.0, 22.0], "away": [20.0, 25.0], "asleep": [20.5, 24.0], "vacation": [17.0, 28.0]}, "schedule_temperature": null, "available_schedules": ["standaard"], "selected_schedule": "standaard", "last_used": "standaard", "illuminance": 86.0}
\ No newline at end of file
diff --git a/tests/testdata/anna_heatpump/get_device_data/3cb70739631c4d17a86b8b12e8a5161b.pickle b/tests/testdata/anna_heatpump/get_device_data/3cb70739631c4d17a86b8b12e8a5161b.pickle
deleted file mode 100644
index 77bc86661cb64940333e1bc9ced73ececa0297c3..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 381
zcmY+Ay-EZz6onNQ-DR;5_Yo|%5(IxiBwZS@vy|bQT$w;78S*n?A<P5ZGQO3*lQEfD
z^j69F&N=xR7oTo_ugpi<($Zt-tui5Tc3EXw2kd%u5Te5@Uq5{1`KBWfK@HgS4s$5c
zqO~0+I;?x2N}aLItFu0&=d|VQv^H{fUl%xq3Y?DP>}m($4c=?=Vou)9@Bq9<>?b@H
znX{W2F9#41lr`0GUUkmyCPSo+7cI)DvHAPHM>>H4l!liKW{1xuwDJLr1aL9|9edO$
j0?M5ywHsP#@S%ww<v%;EmDaIS28{Uq!KblYBA)#K?74RZ

diff --git a/tests/testdata/anna_heatpump_cooling/get_all_devices.json b/tests/testdata/anna_heatpump_cooling/get_all_devices.json
new file mode 100644
index 0000000..19d0580
--- /dev/null
+++ b/tests/testdata/anna_heatpump_cooling/get_all_devices.json
@@ -0,0 +1 @@
+{"015ae9ea3f964e668e490fa39da3870b": {"name": "Anna", "types": {"py/set": ["temperature", "thermostat", "home"]}, "class": "gateway", "location": "a57efe5f145f498c9be62a9b63626fbf"}, "1cbf783bb11e4a7c8a6843dee3a86927": {"name": "Anna", "types": {"py/set": ["temperature", "thermostat", "home"]}, "class": "heater_central", "location": "a57efe5f145f498c9be62a9b63626fbf"}, "3cb70739631c4d17a86b8b12e8a5161b": {"name": "Anna", "types": {"py/set": ["thermostat"]}, "class": "thermostat", "location": "c784ee9fdab44e1395b8dee7d7a497d5"}}
\ No newline at end of file
diff --git a/tests/testdata/anna_heatpump_cooling/get_all_devices.pickle b/tests/testdata/anna_heatpump_cooling/get_all_devices.pickle
deleted file mode 100644
index addb766bb9ef211b8d1e44a75c40b84c5e1e7348..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 357
zcmYk1y-veG5QIUoAqs(Ka7l%HzW<Wfph0`*Jr>EaBl|3r0*MDWi4@2CVn-BAJF~O%
zeHA}1*H;&P=EqdkOafX29;_0mltE$Z0Nl2~jjml@Q$-I4%&B<pd&sGbrz1}Jdo^fS
zja?)h55p88=5!bFaKsVfJYqhl(swXTIo-ZN#1A;-wCx5D@qOrXsz7QCC<7BR2y47`
zs2Z?Nan-2cLY`B_ybIcJ=NLl)+8a<t@D`DSQMS?RMA}e6CEd_2JrFLR##fJh9HGm!
zr~9Rad#7v7t>Vm!mg(iz8OItlAemwpP}=-4Qn}F4_Po^nXQO?pyfy;Sh8CO<$heix
PEL(J|L0H|&JkL+RF2!~U

diff --git a/tests/testdata/anna_heatpump_cooling/get_device_data/015ae9ea3f964e668e490fa39da3870b.json b/tests/testdata/anna_heatpump_cooling/get_device_data/015ae9ea3f964e668e490fa39da3870b.json
new file mode 100644
index 0000000..d42fb47
--- /dev/null
+++ b/tests/testdata/anna_heatpump_cooling/get_device_data/015ae9ea3f964e668e490fa39da3870b.json
@@ -0,0 +1 @@
+{"outdoor_temperature": 22.0}
\ No newline at end of file
diff --git a/tests/testdata/anna_heatpump_cooling/get_device_data/015ae9ea3f964e668e490fa39da3870b.pickle b/tests/testdata/anna_heatpump_cooling/get_device_data/015ae9ea3f964e668e490fa39da3870b.pickle
deleted file mode 100644
index 9875c7c85122165df65b81d69c1ab83a87ffa4aa..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 46
tcmZo*nX1eH0ku<lg!4;FQu6bQ;!9F<3sQ>`OG=AUr?@+qK@=400RS?G4EO*5

diff --git a/tests/testdata/anna_heatpump_cooling/get_device_data/1cbf783bb11e4a7c8a6843dee3a86927.json b/tests/testdata/anna_heatpump_cooling/get_device_data/1cbf783bb11e4a7c8a6843dee3a86927.json
new file mode 100644
index 0000000..59e1a24
--- /dev/null
+++ b/tests/testdata/anna_heatpump_cooling/get_device_data/1cbf783bb11e4a7c8a6843dee3a86927.json
@@ -0,0 +1 @@
+{"outdoor_temperature": 21.0, "heating_state": false, "dhw_state": false, "water_temperature": 24.7, "return_temperature": 23.8, "water_pressure": 1.61, "intended_boiler_temperature": 0.0, "modulation_level": 0.35, "cooling_state": true, "slave_boiler_state": false, "compressor_state": true, "flame_state": false}
\ No newline at end of file
diff --git a/tests/testdata/anna_heatpump_cooling/get_device_data/1cbf783bb11e4a7c8a6843dee3a86927.pickle b/tests/testdata/anna_heatpump_cooling/get_device_data/1cbf783bb11e4a7c8a6843dee3a86927.pickle
deleted file mode 100644
index 0025351e576a426060f26023e86674c609e1b90a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 272
zcmZo*naaw@00y;FG<tY5QWHxu^U~vsOA<>`r*!skreu`EIfCUt!J_z*)ZBv9qQsKY
zqSPtw4i=k@L7+#dC>1D@hbC)&1_aLb@IkZ|6r~mygZ0_}Jk%ef@%3<zbY@;jYF<ie
zN_<j&W)8aX5T`LP^a$kUr<CRZ9haXMpOadanlr`S{#qIs^zbI<=jR|?-O(ddoRe6V
g3NsMq7lGvbT(AT3i=bZW=;2PwNz6@!`LI+E07^`3T>t<8

diff --git a/tests/testdata/anna_heatpump_cooling/get_device_data/3cb70739631c4d17a86b8b12e8a5161b.json b/tests/testdata/anna_heatpump_cooling/get_device_data/3cb70739631c4d17a86b8b12e8a5161b.json
new file mode 100644
index 0000000..90901de
--- /dev/null
+++ b/tests/testdata/anna_heatpump_cooling/get_device_data/3cb70739631c4d17a86b8b12e8a5161b.json
@@ -0,0 +1 @@
+{"setpoint": 22.0, "temperature": 22.3, "active_preset": "home", "presets": {"no_frost": [10.0, 30.0], "home": [21.0, 22.0], "away": [20.0, 25.0], "asleep": [20.5, 24.0], "vacation": [17.0, 28.0]}, "schedule_temperature": null, "available_schedules": ["standaard"], "selected_schedule": null, "last_used": "standaard", "illuminance": 24.5}
\ No newline at end of file
diff --git a/tests/testdata/anna_heatpump_cooling/get_device_data/3cb70739631c4d17a86b8b12e8a5161b.pickle b/tests/testdata/anna_heatpump_cooling/get_device_data/3cb70739631c4d17a86b8b12e8a5161b.pickle
deleted file mode 100644
index b7ed06479b1385de882739134e579e0c67dc2f30..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 380
zcmY+A%}N6?6onOvwv;YJAHhXef}o{>NOsvs-#~_Ia;1SxX3Wos3t=AMF5_G2JDDaE
z(Ys2{ch1SrIQx7(KFaeE*EDzN`%W1jIolMOmLA(4E%;#ZAU}Sk`KA>JuLf*-izyUo
zw(nYubXxW<<~q|gFSc_&KE*X>m!*-jhqAyal;LfK)42)48@!j~O@((gc>+!&_7fhn
z%-Oc$`2YgE>P#_Q7oD^F$q?wmi9O1ovHAPH9i77fO2cyk)!|YJEu04<0j!KbXAU(A
ikMh?OceK#pd=nhXe{NbTtwXB}7;*T(?U?Tnu6_V}=ytgP

diff --git a/tests/testdata/anna_v4/get_all_devices.json b/tests/testdata/anna_v4/get_all_devices.json
new file mode 100644
index 0000000..64393df
--- /dev/null
+++ b/tests/testdata/anna_v4/get_all_devices.json
@@ -0,0 +1 @@
+{"cd0e6156b1f04d5f952349ffbe397481": {"name": "Anna", "types": {"py/set": ["temperature", "thermostat", "home"]}, "class": "heater_central", "location": "94c107dc6ac84ed98e9f68c0dd06bf71"}, "01b85360fdd243d0aaad4d6ac2a5ba7e": {"name": "Anna", "types": {"py/set": ["thermostat"]}, "class": "thermostat", "location": "eb5309212bf5407bb143e5bfa3b18aee"}, "0466eae8520144c78afb29628384edeb": {"name": "Anna", "types": {"py/set": ["temperature", "thermostat", "home"]}, "class": "gateway", "location": "94c107dc6ac84ed98e9f68c0dd06bf71"}}
\ No newline at end of file
diff --git a/tests/testdata/anna_v4/get_all_devices.pickle b/tests/testdata/anna_v4/get_all_devices.pickle
deleted file mode 100644
index 29b7262916168f7ff3034abdc6eeff1546c07d42..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 357
zcmY+9Jx;_h5QRY`uv!+*kdg}dKX%DAXwcXmW29`dN*tjrkT`%PwlMc4S!kH{y{GS+
z&+7a6^5T3S<smoD6I4_xO9K&J1|u04CIpMzv_jLewyGZXSaS8$_fT@3jt88|*BZoO
z4Yn!bxF4njspQ*)`vZ=U<`K&&*RF$UD)~MlBphEH_GyH!<V`m?NN+=5a$|&}r1egL
z(*nKGXoAv?cu$lKEiH3y2(?;rMS}NCa8Cfh3%@KFNDD2lrt#`eGS-V;+??X}pIqGK
z2Cd}8Fv@I@g0$9B!BN@(+)@pQXO>V30kvd=3gKD}!7`(m=BpmsUskMQ9j_O}&Fk{o
NI~+^g#k+Za`~lqjb{hZy

diff --git a/tests/testdata/anna_v4/get_device_data/01b85360fdd243d0aaad4d6ac2a5ba7e.json b/tests/testdata/anna_v4/get_device_data/01b85360fdd243d0aaad4d6ac2a5ba7e.json
new file mode 100644
index 0000000..67bca0d
--- /dev/null
+++ b/tests/testdata/anna_v4/get_device_data/01b85360fdd243d0aaad4d6ac2a5ba7e.json
@@ -0,0 +1 @@
+{"setpoint": 20.5, "temperature": 20.5, "active_preset": "home", "presets": {"vacation": [15.0, 28.0], "no_frost": [10.0, 30.0], "away": [17.5, 25.0], "asleep": [17.0, 24.0], "home": [20.5, 22.0]}, "schedule_temperature": 17.5, "available_schedules": ["Standaard", "Thuiswerken"], "selected_schedule": null, "last_used": "Standaard", "illuminance": 60.0}
\ No newline at end of file
diff --git a/tests/testdata/anna_v4/get_device_data/01b85360fdd243d0aaad4d6ac2a5ba7e.pickle b/tests/testdata/anna_v4/get_device_data/01b85360fdd243d0aaad4d6ac2a5ba7e.pickle
deleted file mode 100644
index 69edb89860f7acacf1f2005a20c26c43c51f3aef..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 403
zcmZvYKT8BL5XBW1z2mSD{RkFU9S9-{BI(jyqpd7sc4ULuWXYdBEQBpBQjXu(y<{UN
zm@0YiH}hsPR^MO8N9lahIxZag-bn3<vzsx=apke=(Si>a59BitUJh9I7N;VLRckt=
zc$(jiQo8{Jcxg1f(3-PN4&v+~UobATso$(|J_A<;cq~8#JNU@v^_WD??u&T>P9gTQ
zomI~6ik&A)$@4Cp-Ogr+mrk_U1cmkg`(3~QQo-v46w>XJ;_}IZZUAgUarN8=>2_$}
nQ4_{<hYE$q=C_2lajC%hIyjv8KebY+&`Awi?EiI}CkvY&-rjmF

diff --git a/tests/testdata/anna_v4/get_device_data/0466eae8520144c78afb29628384edeb.json b/tests/testdata/anna_v4/get_device_data/0466eae8520144c78afb29628384edeb.json
new file mode 100644
index 0000000..a0c7b67
--- /dev/null
+++ b/tests/testdata/anna_v4/get_device_data/0466eae8520144c78afb29628384edeb.json
@@ -0,0 +1 @@
+{"outdoor_temperature": 7.44}
\ No newline at end of file
diff --git a/tests/testdata/anna_v4/get_device_data/0466eae8520144c78afb29628384edeb.pickle b/tests/testdata/anna_v4/get_device_data/0466eae8520144c78afb29628384edeb.pickle
deleted file mode 100644
index 06d01c8d0c125cdca87e2f338e8c16cabebd334c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 46
ucmZo*nX1eH0ku<lg!4;FQu6bQ;!9F<3sQ>`OG=AUr?@-F&IEy3#d-imVi0x!

diff --git a/tests/testdata/anna_v4/get_device_data/cd0e6156b1f04d5f952349ffbe397481.json b/tests/testdata/anna_v4/get_device_data/cd0e6156b1f04d5f952349ffbe397481.json
new file mode 100644
index 0000000..1be9cca
--- /dev/null
+++ b/tests/testdata/anna_v4/get_device_data/cd0e6156b1f04d5f952349ffbe397481.json
@@ -0,0 +1 @@
+{"heating_state": true, "dhw_state": false, "water_temperature": 52.0, "return_temperature": 42.0, "water_pressure": 2.1, "intended_boiler_temperature": 48.6, "modulation_level": 0.0, "flame_state": false}
\ No newline at end of file
diff --git a/tests/testdata/anna_v4/get_device_data/cd0e6156b1f04d5f952349ffbe397481.pickle b/tests/testdata/anna_v4/get_device_data/cd0e6156b1f04d5f952349ffbe397481.pickle
deleted file mode 100644
index e74af4fd5beab7fe5157aca8c8161ebe5a57d701..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 213
zcmZo*nR<!=0&1sd^zde+CYEI8rN<YSB$lL3>FD81$tZ_%I(r1mfr3TxC8@ausYQt;
zrA4Vz+#S3ix_g9*Qh_3QXtJ(QSw4u?f}+&oVu(J5GazubM>;dFBsDK3H6=bNKQjlz
qcn=?lGJ)Lul+qla<MQ+3b5hGvbEddM-ObR$otBfBn+kJgsU84sK~IVR

diff --git a/tests/testdata/anna_without_boiler_fw3/get_all_devices.json b/tests/testdata/anna_without_boiler_fw3/get_all_devices.json
new file mode 100644
index 0000000..88f1bfd
--- /dev/null
+++ b/tests/testdata/anna_without_boiler_fw3/get_all_devices.json
@@ -0,0 +1 @@
+{"7ffbb3ab4b6c4ab2915d7510f7bf8fe9": {"name": "Anna", "types": {"py/set": ["thermostat"]}, "class": "thermostat", "location": "c34c6864216446528e95d88985e714cc"}, "a270735e4ccd45239424badc0578a2b1": {"name": "Anna", "types": {"py/set": ["temperature", "home"]}, "class": "gateway", "location": "0f4f2ada20734a339fe353348fe87b96"}, "c46b4794d28149699eacf053deedd003": {"name": "Anna", "types": {"py/set": ["temperature", "home"]}, "class": "heater_central", "location": "0f4f2ada20734a339fe353348fe87b96"}}
\ No newline at end of file
diff --git a/tests/testdata/anna_without_boiler_fw3/get_all_devices.pickle b/tests/testdata/anna_without_boiler_fw3/get_all_devices.pickle
deleted file mode 100644
index c76d81b184061e0c0435ec7c4d3cd7bc0531c609..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 355
zcmY+9J5Izf5Qae{Vzo$1!39!Mp~N1)N^U`i#`YK^?Ix?l5!wQY16X1Ub6*mmVY+$f
z|GxRCzMd{Ge(Js4=SGEKEk_GhIzY=zC%h6}8<Y(?kSXg`)#HImt{(dyORm%DNK^S-
z7TXkQJPcF9RL;3}dz_~7Z<;sz!C`tG`jQ*R!AUKFbrL`drpXAewb6o92hNo_H^@}0
zxS*x=AQ(5mz@m4pP#T%-R-t(H=MwAHqKd<+ca!LFq!H6RQaQ&>zJ9?(Z+I$ko0~R3
zVCa!8>42P@KwNMR%adAJBUiQqX+atAOm|?UF@!F(f_ozG+m`>b<1W_mcFEsGS^(p-
PqdtweUoi1*o*%veWQlY;

diff --git a/tests/testdata/anna_without_boiler_fw3/get_device_data/7ffbb3ab4b6c4ab2915d7510f7bf8fe9.json b/tests/testdata/anna_without_boiler_fw3/get_device_data/7ffbb3ab4b6c4ab2915d7510f7bf8fe9.json
new file mode 100644
index 0000000..10e7d6b
--- /dev/null
+++ b/tests/testdata/anna_without_boiler_fw3/get_device_data/7ffbb3ab4b6c4ab2915d7510f7bf8fe9.json
@@ -0,0 +1 @@
+{"setpoint": 16.0, "temperature": 20.6, "schedule_temperature": 21.0, "active_preset": "away", "presets": {"vacation": [15.0, 0], "no_frost": [10.0, 0], "asleep": [16.0, 0], "away": [16.0, 0], "home": [21.0, 0]}, "available_schedules": ["Test", "Normal"], "selected_schedule": "Normal", "last_used": "Normal", "illuminance": 35.0}
\ No newline at end of file
diff --git a/tests/testdata/anna_without_boiler_fw3/get_device_data/7ffbb3ab4b6c4ab2915d7510f7bf8fe9.pickle b/tests/testdata/anna_without_boiler_fw3/get_device_data/7ffbb3ab4b6c4ab2915d7510f7bf8fe9.pickle
deleted file mode 100644
index 2605612f9d2af0be2fdc98154151614365272f9e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 356
zcmY*Vy-ve05N@TY6jclecmsw`6$9*L>VU+=!hoW~xhj?%JF?F~9gz9}Hy#5#ElwP0
zdz-(%`_B8~>vcLA=2MnD4@j-kmSnTO%P=npn-)D#^qAoL?|y#xI;a|}Xs|rxA4b~+
zDAFC4t;ZB9T)+qHgwOIj$gr*h1*DyoH(74ht89ImAkVEUx84QH%<X}hK`@AI#>bAm
zBj*n}$7t;u%-XS7(nh|54zz*y)c)^`(5tw3!L*ZS&(1es1o<+cK}A^o3#Go{a|40O
Y7_d5Md7+JojkaJ_|51<op>$mR0>bZf761SM

diff --git a/tests/testdata/anna_without_boiler_fw3/get_device_data/a270735e4ccd45239424badc0578a2b1.json b/tests/testdata/anna_without_boiler_fw3/get_device_data/a270735e4ccd45239424badc0578a2b1.json
new file mode 100644
index 0000000..dbf797d
--- /dev/null
+++ b/tests/testdata/anna_without_boiler_fw3/get_device_data/a270735e4ccd45239424badc0578a2b1.json
@@ -0,0 +1 @@
+{"outdoor_temperature": 10.8}
\ No newline at end of file
diff --git a/tests/testdata/anna_without_boiler_fw3/get_device_data/a270735e4ccd45239424badc0578a2b1.pickle b/tests/testdata/anna_without_boiler_fw3/get_device_data/a270735e4ccd45239424badc0578a2b1.pickle
deleted file mode 100644
index d9e86f035c5e9966a9c09abc4fd7eebddf676a9a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 46
ucmZo*nX1eH0ku<lg!4;FQu6bQ;!9F<3sQ>`OG=AUr?@+)&IEy3#d-imst|qv

diff --git a/tests/testdata/anna_without_boiler_fw3/get_device_data/c46b4794d28149699eacf053deedd003.json b/tests/testdata/anna_without_boiler_fw3/get_device_data/c46b4794d28149699eacf053deedd003.json
new file mode 100644
index 0000000..4fc54a1
--- /dev/null
+++ b/tests/testdata/anna_without_boiler_fw3/get_device_data/c46b4794d28149699eacf053deedd003.json
@@ -0,0 +1 @@
+{"heating_state": false}
\ No newline at end of file
diff --git a/tests/testdata/anna_without_boiler_fw3/get_device_data/c46b4794d28149699eacf053deedd003.pickle b/tests/testdata/anna_without_boiler_fw3/get_device_data/c46b4794d28149699eacf053deedd003.pickle
deleted file mode 100644
index 13881135da8492f9bd1f3cbd21e173d01a8d9528..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 32
jcmZo*nJUTv0ku<lcr#KHOEUA)<BLlYOH!wF7V7~3g>wn_

diff --git a/tests/testdata/anna_without_boiler_fw4/get_all_devices.json b/tests/testdata/anna_without_boiler_fw4/get_all_devices.json
new file mode 100644
index 0000000..66bfe74
--- /dev/null
+++ b/tests/testdata/anna_without_boiler_fw4/get_all_devices.json
@@ -0,0 +1 @@
+{"a270735e4ccd45239424badc0578a2b1": {"name": "Anna", "types": {"py/set": ["temperature", "home"]}, "class": "gateway", "location": "0f4f2ada20734a339fe353348fe87b96"}, "7ffbb3ab4b6c4ab2915d7510f7bf8fe9": {"name": "Anna", "types": {"py/set": ["thermostat"]}, "class": "thermostat", "location": "c34c6864216446528e95d88985e714cc"}, "c46b4794d28149699eacf053deedd003": {"name": "Anna", "types": {"py/set": ["temperature", "home"]}, "class": "heater_central", "location": "0f4f2ada20734a339fe353348fe87b96"}}
\ No newline at end of file
diff --git a/tests/testdata/anna_without_boiler_fw4/get_all_devices.pickle b/tests/testdata/anna_without_boiler_fw4/get_all_devices.pickle
deleted file mode 100644
index 5d329895447d5523eea7c939c7561adb8b0ddd46..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 355
zcmY+9yH3O~5Jf>GycY2dDXCV8J${w^1sxjOV~n($tP)3P3nV_k5?h%6B>@_y8{I3N
zb3dxDr}ML)doK^UL8e;81%Y!O1mgx6SoE$HN+YvfSzA?)dn&nl?0YP^PR9dH<#P?<
zum+n%`vZ-b=8?)N*KUW?RPxmeCVInT$=AEVVR{|<lAAU_VCa!8TtLoEATBru9Y`x{
zWSMiLLa>&j1uGq(Wu_BeiLMRGhNWj#t9bDz6zf&xHbolu!;~<UQ@r{2$4zb=2Pd@z
z)=2;<m?k5<)<z3b-LihgI*=BW0nc;?MjAutLMyl@^1f~PFE&=Oj+YDKKGHI9e0J2Q
N5qBkS;@v!NzX2~bbR_@)

diff --git a/tests/testdata/anna_without_boiler_fw4/get_device_data/7ffbb3ab4b6c4ab2915d7510f7bf8fe9.json b/tests/testdata/anna_without_boiler_fw4/get_device_data/7ffbb3ab4b6c4ab2915d7510f7bf8fe9.json
new file mode 100644
index 0000000..9063046
--- /dev/null
+++ b/tests/testdata/anna_without_boiler_fw4/get_device_data/7ffbb3ab4b6c4ab2915d7510f7bf8fe9.json
@@ -0,0 +1 @@
+{"setpoint": 21.0, "temperature": 20.4, "active_preset": "home", "presets": {"vacation": [15.0, 28.0], "no_frost": [10.0, 30.0], "asleep": [16.0, 24.0], "away": [16.0, 25.0], "home": [21.0, 22.0]}, "schedule_temperature": 21.0, "available_schedules": ["Test", "Normal"], "selected_schedule": "Normal", "last_used": "Normal", "illuminance": 44.8}
\ No newline at end of file
diff --git a/tests/testdata/anna_without_boiler_fw4/get_device_data/7ffbb3ab4b6c4ab2915d7510f7bf8fe9.pickle b/tests/testdata/anna_without_boiler_fw4/get_device_data/7ffbb3ab4b6c4ab2915d7510f7bf8fe9.pickle
deleted file mode 100644
index 8395c5059e49d032e2d7a8d2237126f28e9eada3..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 391
zcmZ9I&q@P948|3fS}8q<`UW0)Dm}EKAhIX-=E<upaW-WKW@nc9vmz+?06E6@bvx6k
z)SNQ;ev{<Ock%OidJ^M{7c_O~dn2{ys@$Y9%{+EJTJXW*SYB^q&>V!91J=F8@e@<g
znhu%H(%W%tH-G>yjpkQgROK>ttjdR!AWgNYx7IkHfSU|FW?%wNA@)gLW%(}41-!$@
zKk@z`#*O0Sy_c%I-HU;)oM^EL3hQHk+4dz2AQilgKqlR85*05v?n{$rV>?icbm35;
i@YozcZm;QFf%A26*!;0HlS+k7YS3bL%cpe9u>1w%Rd+Z5

diff --git a/tests/testdata/anna_without_boiler_fw4/get_device_data/a270735e4ccd45239424badc0578a2b1.json b/tests/testdata/anna_without_boiler_fw4/get_device_data/a270735e4ccd45239424badc0578a2b1.json
new file mode 100644
index 0000000..70d2dec
--- /dev/null
+++ b/tests/testdata/anna_without_boiler_fw4/get_device_data/a270735e4ccd45239424badc0578a2b1.json
@@ -0,0 +1 @@
+{"outdoor_temperature": 16.6}
\ No newline at end of file
diff --git a/tests/testdata/anna_without_boiler_fw4/get_device_data/a270735e4ccd45239424badc0578a2b1.pickle b/tests/testdata/anna_without_boiler_fw4/get_device_data/a270735e4ccd45239424badc0578a2b1.pickle
deleted file mode 100644
index 9a04e00270152421a97aecbd4a5db35969da24f9..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 46
ucmZo*nX1eH0ku<lg!4;FQu6bQ;!9F<3sQ>`OG=AUr?@*9%mjg1#d-in4G@U{

diff --git a/tests/testdata/anna_without_boiler_fw4/get_device_data/c46b4794d28149699eacf053deedd003.json b/tests/testdata/anna_without_boiler_fw4/get_device_data/c46b4794d28149699eacf053deedd003.json
new file mode 100644
index 0000000..8ef5459
--- /dev/null
+++ b/tests/testdata/anna_without_boiler_fw4/get_device_data/c46b4794d28149699eacf053deedd003.json
@@ -0,0 +1 @@
+{"heating_state": true}
\ No newline at end of file
diff --git a/tests/testdata/anna_without_boiler_fw4/get_device_data/c46b4794d28149699eacf053deedd003.pickle b/tests/testdata/anna_without_boiler_fw4/get_device_data/c46b4794d28149699eacf053deedd003.pickle
deleted file mode 100644
index f97d4582e6bf2c6a4b4d33b47cd89ca9e96dfb1c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 32
jcmZo*nJUTv0ku<lcr#KHOEUA)<BLlYOH!wF6zc&1g>VV>

diff --git a/tests/testdata/legacy_anna/get_all_devices.json b/tests/testdata/legacy_anna/get_all_devices.json
new file mode 100644
index 0000000..64bf0b4
--- /dev/null
+++ b/tests/testdata/legacy_anna/get_all_devices.json
@@ -0,0 +1 @@
+{"0d266432d64443e283b5d708ae98b455": {"name": "Anna", "types": {"py/set": ["temperature", "thermostat"]}, "class": "thermostat", "location": 0}, "04e4cbfe7f4340f090f85ec3b9e6a950": {"name": "Anna", "types": {"py/set": ["temperature", "thermostat"]}, "class": "heater_central", "location": 0}}
\ No newline at end of file
diff --git a/tests/testdata/legacy_anna/get_all_devices.pickle b/tests/testdata/legacy_anna/get_all_devices.pickle
deleted file mode 100644
index 874c193000c1e9e51f75095a20a69f421eef6019..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 217
zcmY+7J!->15Jm-&LL7n5kTO+Rw6pptQ~MBRv>LGiX(d*p!bKnlSV)TTwS1;XB#poJ
zd%X9RUT?|YKIJvOsIDkW&_!1QfTp6>t?4RNBQ<pk#>h^k9!HXxzI%@nGrr8U$oF<U
zv!gIh3nNR+nZ}s{@)}5fVrB<i7P)7hhRGs-OkPgOy48WewmnrnXi&XsR9_pix^1Y$
f#;CpS9{$5FbC2#2kB*QjoGp0{IEc$P)%x}evvf)d

diff --git a/tests/testdata/legacy_anna/get_device_data/04e4cbfe7f4340f090f85ec3b9e6a950.json b/tests/testdata/legacy_anna/get_device_data/04e4cbfe7f4340f090f85ec3b9e6a950.json
new file mode 100644
index 0000000..0a607ba
--- /dev/null
+++ b/tests/testdata/legacy_anna/get_device_data/04e4cbfe7f4340f090f85ec3b9e6a950.json
@@ -0,0 +1 @@
+{"water_temperature": 23.6, "return_temperature": 21.7, "water_pressure": 1.2, "intended_boiler_temperature": 17.0, "modulation_level": 0.0, "heating_state": true}
\ No newline at end of file
diff --git a/tests/testdata/legacy_anna/get_device_data/04e4cbfe7f4340f090f85ec3b9e6a950.pickle b/tests/testdata/legacy_anna/get_device_data/04e4cbfe7f4340f090f85ec3b9e6a950.pickle
deleted file mode 100644
index 5cc6e32d2c2fc6036c9494ef4c6edd77e806e435..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 185
zcmZo*nYxYv0&1sd^az$GmZTQNm!#$vq!uNXloq8<ad$AE2?Dcvgo;vuB6(=CrkjmH
zpob5lwV)`qxEQR@{xev@xJNoOuOu}uB{d~JDL*p@!+1l8^*sW)`6;D2i6xo&dGR@^
eWvMw++@UUG=;6&s1xn<l#}}6X9XO?<R1W}n=0V{A

diff --git a/tests/testdata/legacy_anna/get_device_data/0d266432d64443e283b5d708ae98b455.json b/tests/testdata/legacy_anna/get_device_data/0d266432d64443e283b5d708ae98b455.json
new file mode 100644
index 0000000..8afca69
--- /dev/null
+++ b/tests/testdata/legacy_anna/get_device_data/0d266432d64443e283b5d708ae98b455.json
@@ -0,0 +1 @@
+{"setpoint": 20.5, "temperature": 20.4, "schedule_temperature": 20.0, "active_preset": "home", "presets": {"away": [19.0, 0], "vacation": [15.0, 0], "asleep": [19.0, 0], "home": [20.0, 0], "no_frost": [10.0, 0]}, "available_schedules": ["Thermostat schedule"], "selected_schedule": "Thermostat schedule", "last_used": "Thermostat schedule", "illuminance": 151}
\ No newline at end of file
diff --git a/tests/testdata/legacy_anna/get_device_data/0d266432d64443e283b5d708ae98b455.pickle b/tests/testdata/legacy_anna/get_device_data/0d266432d64443e283b5d708ae98b455.pickle
deleted file mode 100644
index b000abf29bf4b9711d9976f0fa4f580d2c009740..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 354
zcmZXQJx&8L5QT%Z3X7r?C^-NHMXEHUCtV6!Br3ETyc4Y@uf4LziztwCfGLLpZpbb0
zu9ZY0ubcVad;U2TUoTgaQJ=EnG9YzMTaw*&a~Rh=BWyeLK+)r{-jCvCPz~16VD*pZ
zHlBkb-DA~xOr^p_<60EH&U29AxB}kcLtbUI+dkyj(*(KfK>=xJGg+U>6oNtQE)uzW
z?Ae^%rFGTbyFl50e<G0=(1SMcmTrH1Mo2DRJU8gu6al(B0s+1aXiyQ>C$}_9zA+G}
ZiUI3knrUNVt1VcSzUlGzd(cl@{{i;9c2)oY

diff --git a/tests/testdata/legacy_anna_2/get_all_devices.json b/tests/testdata/legacy_anna_2/get_all_devices.json
new file mode 100644
index 0000000..f1a0b64
--- /dev/null
+++ b/tests/testdata/legacy_anna_2/get_all_devices.json
@@ -0,0 +1 @@
+{"9e7377867dc24e51b8098a5ba02bd89d": {"name": "Anna", "types": {"py/set": ["temperature", "thermostat", "home"]}, "class": "thermostat", "location": "be81e3f8275b4129852c4d8d550ae2eb"}, "ea5d8a7177e541b0a4b52da815166de4": {"name": "Anna", "types": {"py/set": ["temperature", "thermostat", "home"]}, "class": "heater_central", "location": "be81e3f8275b4129852c4d8d550ae2eb"}}
\ No newline at end of file
diff --git a/tests/testdata/legacy_anna_2/get_all_devices.pickle b/tests/testdata/legacy_anna_2/get_all_devices.pickle
deleted file mode 100644
index 70eaac9714597c32870e04cc375ea792d12d3342..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 257
zcmZ9GJ5I$g5CD-#5PE#hkdg|;e%^RfauT$*_sK|!^W-=M1ri6a1jTYyY7{}mv@^xL
zH(%cuzr4vq?MAjoYjLo_Yr~)%_9GHF>a`0v2HC47(achtr<6!)TVBt+%EvC^vWr8B
zoabdNRHWV%p3j`AY?<Y=wtk{@{nuPii>LCkB&nTaRD3+4w&0A?BZBrOU;yZeH9OgA
y#{>b%Dr*^xay=ObIuI&Q!w}f)m+|s%Ft+h39_oE$Dx9A^r;=%scpLAw?ePcMv{yv{

diff --git a/tests/testdata/legacy_anna_2/get_device_data/9e7377867dc24e51b8098a5ba02bd89d.json b/tests/testdata/legacy_anna_2/get_device_data/9e7377867dc24e51b8098a5ba02bd89d.json
new file mode 100644
index 0000000..097fc36
--- /dev/null
+++ b/tests/testdata/legacy_anna_2/get_device_data/9e7377867dc24e51b8098a5ba02bd89d.json
@@ -0,0 +1 @@
+{"setpoint": 15.0, "temperature": 21.4, "schedule_temperature": 15.0, "active_preset": null, "presets": {"vacation": [15.0, 0], "away": [15.0, 0], "no_frost": [10.0, 0], "home": [18.0, 0], "asleep": [15.0, 0]}, "available_schedules": ["Thermostat schedule"], "selected_schedule": "Thermostat schedule", "last_used": "Thermostat schedule", "illuminance": 19.5}
\ No newline at end of file
diff --git a/tests/testdata/legacy_anna_2/get_device_data/9e7377867dc24e51b8098a5ba02bd89d.pickle b/tests/testdata/legacy_anna_2/get_device_data/9e7377867dc24e51b8098a5ba02bd89d.pickle
deleted file mode 100644
index 39517202dd99dd11c9a650705d667307ff9a9da1..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 348
zcmZWlv1$V`3{4=kDWOBTen5u~nKC3~@7AGED0D4{>Qgv_&ps^qLWV#-K%@J=b!;xB
zttR=sXT2w#W?yg9Nv>mD%AAmUr!B|lr&WPv!PxcafrG~cZ+E%mo>YrXFj)WQ$8Wcw
zSPxkD9@EhHD%Yi>n2iQdz}ngP5tkRQmkG)Y_Hg)z&aJC=-Vqn(v1H5o)^%9W^$&Ul
zWDxtmbAnVbfHv@%a*qp8Qc3mRqVJLc@WV(%kUK(yim|z<V_V6M0pdCkHs{wu8xuNh
O!K(9tHm4jTtiAydZ*Ob>

diff --git a/tests/testdata/legacy_anna_2/get_device_data/ea5d8a7177e541b0a4b52da815166de4.json b/tests/testdata/legacy_anna_2/get_device_data/ea5d8a7177e541b0a4b52da815166de4.json
new file mode 100644
index 0000000..74be8d2
--- /dev/null
+++ b/tests/testdata/legacy_anna_2/get_device_data/ea5d8a7177e541b0a4b52da815166de4.json
@@ -0,0 +1 @@
+{"water_temperature": 54.0, "return_temperature": 0.0, "water_pressure": 1.7, "intended_boiler_temperature": 0.0, "modulation_level": 0.0, "heating_state": false, "outdoor_temperature": 21.0}
\ No newline at end of file
diff --git a/tests/testdata/legacy_anna_2/get_device_data/ea5d8a7177e541b0a4b52da815166de4.pickle b/tests/testdata/legacy_anna_2/get_device_data/ea5d8a7177e541b0a4b52da815166de4.pickle
deleted file mode 100644
index 25de4cb8a00d8c563b4dec779ad8e4f9947bef1d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 216
zcmZo*nR=E10&1sd^az$GmZTQNm!#$vq!uNXloq8<ad+^B$oB{pr2<9rP-UT-8G862
zS__I&i;Kbf?0*}BL63B1UP)?RN@_}cQhsI*y76!W1ak9JN^=rRGV}A|b5hGvbEde%
j<#;nvff9M?@x>)T2Ttki5za3yNy*Pgcd98wN2wkFg9JtP

diff --git a/tests/testdata/p1v3/get_all_devices.json b/tests/testdata/p1v3/get_all_devices.json
new file mode 100644
index 0000000..657faaf
--- /dev/null
+++ b/tests/testdata/p1v3/get_all_devices.json
@@ -0,0 +1 @@
+{"ba4de7613517478da82dd9b6abea36af": {"name": "P1", "types": {"py/set": ["power", "home"]}, "class": "gateway", "location": "a455b61e52394b2db5081ce025a430f3"}}
\ No newline at end of file
diff --git a/tests/testdata/p1v3/get_all_devices.pickle b/tests/testdata/p1v3/get_all_devices.pickle
deleted file mode 100644
index 8a891eb267d9e57d382416229d2d6ec51da5ef8a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 157
zcmXBNPYQxS6oByvrH;|ERXG3k7G2?u^Q^!eX$)~8bbtp%yzX1lxBP9sNA`KI{>@A~
z4?3W;LK)$-D+81=gvwj+2+BgkGw&(u;EGJ^qhQL1smH|6h0k%}ypJQ^_(gf$LP|`V
p6AU=Q#I$W=4Z|gNzY}O<ycKAqs<fBEo1zpo7Se!LMWgth4qx1<G`j!*

diff --git a/tests/testdata/p1v3/get_device_data/ba4de7613517478da82dd9b6abea36af.json b/tests/testdata/p1v3/get_device_data/ba4de7613517478da82dd9b6abea36af.json
new file mode 100644
index 0000000..a4a2fd4
--- /dev/null
+++ b/tests/testdata/p1v3/get_device_data/ba4de7613517478da82dd9b6abea36af.json
@@ -0,0 +1 @@
+{"net_electricity_point": 650.0, "electricity_consumed_peak_point": 650.0, "electricity_consumed_off_peak_point": 0.0, "net_electricity_cumulative": 17965326.0, "electricity_consumed_peak_cumulative": 7702167.0, "electricity_consumed_off_peak_cumulative": 10263159.0, "net_electricity_interval": 179.0, "electricity_consumed_peak_interval": 179.0, "electricity_produced_peak_point": 0.0, "electricity_produced_off_peak_point": 0.0, "electricity_produced_peak_cumulative": 0.0, "electricity_produced_off_peak_cumulative": 0.0, "electricity_produced_peak_interval": 0.0, "electricity_produced_off_peak_interval": 0.0}
\ No newline at end of file
diff --git a/tests/testdata/p1v3/get_device_data/ba4de7613517478da82dd9b6abea36af.pickle b/tests/testdata/p1v3/get_device_data/ba4de7613517478da82dd9b6abea36af.pickle
deleted file mode 100644
index f7f5a9316b1e336bc49c91503a54961fbc4e0240..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 645
zcmZo*nOeof00y;FG<rnyQcL1fb5fH_iZYWkODf|F@-y>Frnoz_1c24_$RkT8=jRod
z=BB2^7o;X;V<=U|sx&_>4MjP`ZU%-PDRiroOLI$e5=%16Qm42(7Agrm04nWK!D=Yj
zeiZewiAxWF)N5c>4|fELp5)1XU^^txT>=b()S|M)9AG%4B>+tYnyZA>T(CQ^s7493
zf};GC(qyzy1Dgsm7$wx;O5qNM#s^$EN_fDPV}u7>JxX}M)x(WP4iC5<6u-jtp!pT9
TS`9g5;Hu#^AVLSGqf`$76^!F1

diff --git a/tests/testdata/p1v3_full_option/get_all_devices.json b/tests/testdata/p1v3_full_option/get_all_devices.json
new file mode 100644
index 0000000..e25fcb9
--- /dev/null
+++ b/tests/testdata/p1v3_full_option/get_all_devices.json
@@ -0,0 +1 @@
+{"e950c7d5e1ee407a858e2a8b5016c8b3": {"name": "P1", "types": {"py/set": ["power", "home"]}, "class": "gateway", "location": "cd3e822288064775a7c4afcdd70bdda2"}}
\ No newline at end of file
diff --git a/tests/testdata/p1v3_full_option/get_all_devices.pickle b/tests/testdata/p1v3_full_option/get_all_devices.pickle
deleted file mode 100644
index 892bf4b9eec78efc64096796a46ca03d8fae44d0..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 157
zcmXBNO$x#=5I|v(20eyLSCXbp6K~-arjzjpYEw+5bW!jC1B#6I)#6)zoA<~*@5R4K
zctd-u(FIF6QK=nx>&bwxt<Ed-bs>{%Icwoc!plQ0topH|B+r@8ac0%Ufo}3*g$<-6
qygETo1B}A!CL;8g*#1r!3i8Gn?{!r=XTf0!M-0K~Is`CsPrEOtr!@fp

diff --git a/tests/testdata/p1v3_full_option/get_device_data/e950c7d5e1ee407a858e2a8b5016c8b3.json b/tests/testdata/p1v3_full_option/get_device_data/e950c7d5e1ee407a858e2a8b5016c8b3.json
new file mode 100644
index 0000000..36cb66c
--- /dev/null
+++ b/tests/testdata/p1v3_full_option/get_device_data/e950c7d5e1ee407a858e2a8b5016c8b3.json
@@ -0,0 +1 @@
+{"net_electricity_point": -2761.0, "electricity_consumed_peak_point": 0.0, "electricity_consumed_off_peak_point": 0.0, "net_electricity_cumulative": 442972.0, "electricity_consumed_peak_cumulative": 442932.0, "electricity_consumed_off_peak_cumulative": 551090.0, "net_electricity_interval": 0.0, "electricity_consumed_peak_interval": 0.0, "electricity_consumed_off_peak_interval": 0.0, "electricity_produced_peak_point": 2761.0, "electricity_produced_off_peak_point": 0.0, "electricity_produced_peak_cumulative": 396559.0, "electricity_produced_off_peak_cumulative": 154491.0, "electricity_produced_peak_interval": 0.0, "electricity_produced_off_peak_interval": 0.0, "gas_consumed_cumulative": 584.9, "gas_consumed_interval": 0.0}
\ No newline at end of file
diff --git a/tests/testdata/p1v3_full_option/get_device_data/e950c7d5e1ee407a858e2a8b5016c8b3.pickle b/tests/testdata/p1v3_full_option/get_device_data/e950c7d5e1ee407a858e2a8b5016c8b3.pickle
deleted file mode 100644
index 937c7ab657a99cdac7281b60c636ee7bf00a177f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 763
zcmZo*nfif=0Ss!VX!MBYrIy5}=A<T<6lEr7mQ=<U<Y(rUOmRQ3bP`xik36zua(-TM
zX>Mvtd_ihrHcTnRFb0MmWvoi`)6%djmqNEXxiq&lC$S{6EOm;zqcmp$$lx9otcHT^
zM^(>p0jypFt9rO2Q1mEVOabeWKz9i+2vUp65_6`wgXBS=M+vLBV0U0qt%g-K+!a`K
zpoDWlQGQBkGFmu0z@h{toZ(90hC^cz;%@X1ge%7kK?xHZuuoA!5Uw6>JW2>M-M)bt
qI&eKig$`Ub+y*S6Bc7gE91l-@$WCx*aytVAXM03Zlwg`sss{k3U=C0K

diff --git a/tests/testdata/p1v3solarfake/get_all_devices.json b/tests/testdata/p1v3solarfake/get_all_devices.json
new file mode 100644
index 0000000..657faaf
--- /dev/null
+++ b/tests/testdata/p1v3solarfake/get_all_devices.json
@@ -0,0 +1 @@
+{"ba4de7613517478da82dd9b6abea36af": {"name": "P1", "types": {"py/set": ["power", "home"]}, "class": "gateway", "location": "a455b61e52394b2db5081ce025a430f3"}}
\ No newline at end of file
diff --git a/tests/testdata/p1v3solarfake/get_all_devices.pickle b/tests/testdata/p1v3solarfake/get_all_devices.pickle
deleted file mode 100644
index 8a891eb267d9e57d382416229d2d6ec51da5ef8a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 157
zcmXBNPYQxS6oByvrH;|ERXG3k7G2?u^Q^!eX$)~8bbtp%yzX1lxBP9sNA`KI{>@A~
z4?3W;LK)$-D+81=gvwj+2+BgkGw&(u;EGJ^qhQL1smH|6h0k%}ypJQ^_(gf$LP|`V
p6AU=Q#I$W=4Z|gNzY}O<ycKAqs<fBEo1zpo7Se!LMWgth4qx1<G`j!*

diff --git a/tests/testdata/p1v3solarfake/get_device_data/ba4de7613517478da82dd9b6abea36af.json b/tests/testdata/p1v3solarfake/get_device_data/ba4de7613517478da82dd9b6abea36af.json
new file mode 100644
index 0000000..2c3c1ff
--- /dev/null
+++ b/tests/testdata/p1v3solarfake/get_device_data/ba4de7613517478da82dd9b6abea36af.json
@@ -0,0 +1 @@
+{"net_electricity_point": 244.0, "electricity_consumed_peak_point": 644.0, "electricity_consumed_off_peak_point": 0.0, "net_electricity_cumulative": 17945026.0, "electricity_consumed_peak_cumulative": 7702167.0, "electricity_consumed_off_peak_cumulative": 10263159.0, "net_electricity_interval": -841.0, "electricity_consumed_peak_interval": 179.0, "electricity_produced_peak_point": 200.0, "electricity_produced_off_peak_point": 200.0, "electricity_produced_peak_cumulative": 20000.0, "electricity_produced_off_peak_cumulative": 300.0, "electricity_produced_peak_interval": 1000.0, "electricity_produced_off_peak_interval": 20.0}
\ No newline at end of file
diff --git a/tests/testdata/p1v3solarfake/get_device_data/ba4de7613517478da82dd9b6abea36af.pickle b/tests/testdata/p1v3solarfake/get_device_data/ba4de7613517478da82dd9b6abea36af.pickle
deleted file mode 100644
index b907f47140f9231f9e6889df4d5659a81656369f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 645
zcmZo*nOeof00y;FG<rnyQcL1fb5fH_iZYWkODf|F@-y>Frno!gHGtLh$RkT8=jRod
z=BB2^7o;X;!<DuuK$I$DRhplchN2v-7D)6+p<A6?np>KaSdv+mI>p_wP*w(HY>x_7
zL&5f=sE<utdH|$e1FL$tBT)1tPxgBN(j$TH5?~Od7L_IDOmRQZ<pERyRHKB|T(CP3
zsvXi2AgWP9t)M7Br8F5m)H1;;8G2Ac4XzaKU|4*>l%s?PTscN~I9%?4xCA9U;OgPV
nBZr4W(E*4a6u-jtp!>Do0is$BIb`6f;Wi+JjtN);L#ZABQcLK?

diff --git a/tests/testdata/smile_p1_v2/get_all_devices.json b/tests/testdata/smile_p1_v2/get_all_devices.json
new file mode 100644
index 0000000..33ce63f
--- /dev/null
+++ b/tests/testdata/smile_p1_v2/get_all_devices.json
@@ -0,0 +1 @@
+{"938696c4bcdb4b8a9a595cb38ed43913": {"name": "P1", "types": {"py/set": ["power", "home"]}, "class": "gateway", "location": "938696c4bcdb4b8a9a595cb38ed43913"}}
\ No newline at end of file
diff --git a/tests/testdata/smile_p1_v2/get_all_devices.pickle b/tests/testdata/smile_p1_v2/get_all_devices.pickle
deleted file mode 100644
index 1f4748103b3558a8213839513a58195ded86bb84..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 124
zcmZo*nOevI0ku<l6fBJ`%q-24O_GvRl1!2;5-k%=Elrb?j4e`AOpGlJji=O3(dc2x
zOUzB3(!&&BIHiZRq_QBjcuGG=I3ph<%vz9No?0|zLJw<lPGWKKlpgl<#FEtV#L6i>
T969;Pi6xo&c~deNON;dYbNVXz

diff --git a/tests/testdata/smile_p1_v2/get_device_data/938696c4bcdb4b8a9a595cb38ed43913.json b/tests/testdata/smile_p1_v2/get_device_data/938696c4bcdb4b8a9a595cb38ed43913.json
new file mode 100644
index 0000000..0bcbc76
--- /dev/null
+++ b/tests/testdata/smile_p1_v2/get_device_data/938696c4bcdb4b8a9a595cb38ed43913.json
@@ -0,0 +1 @@
+{"net_electricity_point": 458.0, "electricity_consumed_peak_point": 458.0, "net_electricity_cumulative": 1019201.0, "electricity_consumed_peak_cumulative": 1155195.0, "electricity_consumed_off_peak_cumulative": 1642740.0, "net_electricity_interval": 250.0, "electricity_consumed_peak_interval": 250.0, "electricity_consumed_off_peak_interval": 0.0, "electricity_produced_peak_point": 0.0, "electricity_produced_peak_cumulative": 1296136.0, "electricity_produced_off_peak_cumulative": 482598.0, "electricity_produced_peak_interval": 0.0, "electricity_produced_off_peak_interval": 0.0, "gas_consumed_cumulative": 584.4, "gas_consumed_interval": 0.0}
\ No newline at end of file
diff --git a/tests/testdata/smile_p1_v2/get_device_data/938696c4bcdb4b8a9a595cb38ed43913.pickle b/tests/testdata/smile_p1_v2/get_device_data/938696c4bcdb4b8a9a595cb38ed43913.pickle
deleted file mode 100644
index 33e5394042ef2706aa15d35f1c5b15be949d81cc..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 669
zcmZo*nL3Gy0Ss!VX!MBYrIy5}=A<T<6lEr7mQ=<U<Y(rUOmTOpSpZhkBabYZoS#=*
znwy#uUyz!ZjiFQu-K^x&+|r!HlFYKyDejK?QcWNedsJ{6h@#$bK{Z&t23Ga?X=xBg
zpy;s__yX1=f$kEZpHhp;5_5na%Xa`NVdzo9YA)DgSX8TFRSkCqLI>DzkohP9S5TCn
zQkskwaB!t4L4v9j#e2rbIY4@PP=W-m9_|<vJ+dV;z<N-;3)h3@UAT)-ybD(iw*iZH
n#nTgu<KgK8*$EC!&SfXISVr`Sq9{R_VLu_s_tM9ee@gWLzgP0i

diff --git a/tests/testdata/smile_p1_v2_2/get_all_devices.json b/tests/testdata/smile_p1_v2_2/get_all_devices.json
new file mode 100644
index 0000000..8469fbf
--- /dev/null
+++ b/tests/testdata/smile_p1_v2_2/get_all_devices.json
@@ -0,0 +1 @@
+{"199aa40f126840f392983d171374ab0b": {"name": "P1", "types": {"py/set": ["power", "home"]}, "class": "gateway", "location": "199aa40f126840f392983d171374ab0b"}}
\ No newline at end of file
diff --git a/tests/testdata/smile_p1_v2_2/get_all_devices.pickle b/tests/testdata/smile_p1_v2_2/get_all_devices.pickle
deleted file mode 100644
index 2f7d74e730728aeb84f4e97a6f645f8635b36a63..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 124
zcmZo*nOevI0ku<l6bvmb6BA7g(hQBvEP#};rIDqDaf+e2p|QD1Vv<49l-em8JuG>N
zxv5inm;wx^^stsx7NizW=?4jC<b#A+3-ZfTi>6HIVNK3SEH0kX!=9d4l3JcvIi-gq
SCqFr{Br`v6N(N(Tu^s>+{VE{<

diff --git a/tests/testdata/smile_p1_v2_2/get_device_data/199aa40f126840f392983d171374ab0b.json b/tests/testdata/smile_p1_v2_2/get_device_data/199aa40f126840f392983d171374ab0b.json
new file mode 100644
index 0000000..b646e84
--- /dev/null
+++ b/tests/testdata/smile_p1_v2_2/get_device_data/199aa40f126840f392983d171374ab0b.json
@@ -0,0 +1 @@
+{"net_electricity_point": 368.0, "electricity_consumed_peak_point": 368.0, "net_electricity_cumulative": 5054765.0, "electricity_consumed_peak_cumulative": 2693248.0, "electricity_consumed_off_peak_cumulative": 2361517.0, "net_electricity_interval": 422.0, "electricity_consumed_peak_interval": 422.0, "electricity_consumed_off_peak_interval": 0.0, "electricity_produced_peak_point": 0.0, "electricity_produced_peak_cumulative": 0.0, "electricity_produced_off_peak_cumulative": 0.0, "electricity_produced_peak_interval": 0.0, "electricity_produced_off_peak_interval": 0.0, "gas_consumed_cumulative": 2638.0, "gas_consumed_interval": 0.2}
\ No newline at end of file
diff --git a/tests/testdata/smile_p1_v2_2/get_device_data/199aa40f126840f392983d171374ab0b.pickle b/tests/testdata/smile_p1_v2_2/get_device_data/199aa40f126840f392983d171374ab0b.pickle
deleted file mode 100644
index 3f158f79cb4d5a3972febac26af7463fb4e95708..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 669
zcmZo*nL3Gy0Ss!VX!MBYrIy5}=A<T<6lEr7mQ=<U<Y(rUOmTN8hp6e1N0v;^&nqs?
zO-+d}NKMSfP%4FPR&r@>X-;BEW?AYKcgJ84ZwH{6Ju0{jL{ab315(b=qk&a@ep(vD
z5h!|`Si%}WdL+<Y0`yaAQCVUR&|_5zKovkWN?6SWdkl+eHLR-Pu0ZGj8xArbCEyB*
z@>5Ea(E<*x6eUPdl_Gl&t{x>w;OgOy!Kw$vyKp^d-i6zM;$66ExD8mmE1sTM91l+)
g$WCxrGW$<f-Ot-Sq9{rbX4s$Iq{|n^B3Y^j0B|erUH||9

diff --git a/tests/testdata/stretch_v31/get_all_devices.json b/tests/testdata/stretch_v31/get_all_devices.json
new file mode 100644
index 0000000..f40e902
--- /dev/null
+++ b/tests/testdata/stretch_v31/get_all_devices.json
@@ -0,0 +1 @@
+{"cfe95cf3de1948c0b8955125bf754614": {"name": "Droger (52559)", "types": {"py/set": ["plug", "power"]}, "class": "dryer", "location": 0}, "aac7b735042c4832ac9ff33aae4f453b": {"name": "Vaatwasser (2a1ab)", "types": {"py/set": ["plug", "power"]}, "class": "dishwasher", "location": 0}, "5871317346d045bc9f6b987ef25ee638": {"name": "Boiler (1EB31)", "types": {"py/set": ["plug", "power"]}, "class": "water_heater_vessel", "location": 0}, "059e4d03c7a34d278add5c7a4a781d19": {"name": "Wasmachine (52AC1)", "types": {"py/set": ["plug", "power"]}, "class": "washingmachine", "location": 0}, "e1c884e7dede431dadee09506ec4f859": {"name": "Koelkast (92C4A)", "types": {"py/set": ["plug", "power"]}, "class": "refrigerator", "location": 0}, "d950b314e9d8499f968e6db8d82ef78c": {"name": "Stroomvreters", "types": {"py/set": ["switch_group"]}, "class": "switching", "members": [], "location": null}}
\ No newline at end of file
diff --git a/tests/testdata/stretch_v31/get_all_devices.pickle b/tests/testdata/stretch_v31/get_all_devices.pickle
deleted file mode 100644
index 724e2c171e58a0b21774454028b15a0f16b0b7c3..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 484
zcmYL`O-{ow5QRash(A>bF3@G!pg8u#_Ob<5>|u!}_PCA+O_iinERZ-rBv_ckaT}bf
zh1pm$^Yp!^@yFo%XMb-~?_tu7jUx@laZ5}KWs+QJ0G2}TB#4ZO(5nUue4)^dZtH4J
z^>_j)fW8Xduzg!n6F#G4xUAMxhi<SeSM%`I4NZwn6D78O>*q&hWw0%(MY!Kvbz?*$
zbIBnQsS%2&XtZ;jBa(0ec;4IkgYM!1v0X<{@0udR{3`gNKlI1li7gr*S3c7H=>`f)
zGR`CynN0-b5t-#$NpdL=Wn68cqghpyJ&@haIQs)$uCb;1$<yX}rD$62$O&i?HsMAh
z7dDj&t%cYKl!{rVcX1!Fc|qfg1@%Xo-u%-?ebizx->!FHVn!)J(vl^?nMF&KXh<?L
k!YSB+&+jWLpRsAj6P@0O>0juxnp|DPPr<g@-eGn93l3MCzyJUM

diff --git a/tests/testdata/stretch_v31/get_device_data/059e4d03c7a34d278add5c7a4a781d19.json b/tests/testdata/stretch_v31/get_device_data/059e4d03c7a34d278add5c7a4a781d19.json
new file mode 100644
index 0000000..b08f6d6
--- /dev/null
+++ b/tests/testdata/stretch_v31/get_device_data/059e4d03c7a34d278add5c7a4a781d19.json
@@ -0,0 +1 @@
+{"electricity_consumed": 0.0, "electricity_consumed_interval": 0.0, "electricity_produced": 0.0, "relay": true}
\ No newline at end of file
diff --git a/tests/testdata/stretch_v31/get_device_data/059e4d03c7a34d278add5c7a4a781d19.pickle b/tests/testdata/stretch_v31/get_device_data/059e4d03c7a34d278add5c7a4a781d19.pickle
deleted file mode 100644
index 8b59b665eec6e456bd2404853baf5909e0cac93c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 130
zcmZo*nOe>O0ku;!dPGulQj<%HGLth)D&v#$^NLGzQ&Xn6Lsc;J$YPU^&&(@HEh<aQ
bK~jifP(e|CN@+5RL99ioIf<21I!g5bM$ssT

diff --git a/tests/testdata/stretch_v31/get_device_data/5871317346d045bc9f6b987ef25ee638.json b/tests/testdata/stretch_v31/get_device_data/5871317346d045bc9f6b987ef25ee638.json
new file mode 100644
index 0000000..529c8b7
--- /dev/null
+++ b/tests/testdata/stretch_v31/get_device_data/5871317346d045bc9f6b987ef25ee638.json
@@ -0,0 +1 @@
+{"electricity_consumed": 1.19, "electricity_produced": 0.0, "relay": true}
\ No newline at end of file
diff --git a/tests/testdata/stretch_v31/get_device_data/5871317346d045bc9f6b987ef25ee638.pickle b/tests/testdata/stretch_v31/get_device_data/5871317346d045bc9f6b987ef25ee638.pickle
deleted file mode 100644
index 0046e0ae2e4e0c883fee765f0e9254c87f951c3a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 89
zcmZo*nd-*?0ku;!dPGulQj<%HGLth)D&v#$^NLGzQ&Xn6+kfV=Em(Y=3st_LC_kk%
V86*!ifuV=BC^aXsa!N<39soFa9wh((

diff --git a/tests/testdata/stretch_v31/get_device_data/aac7b735042c4832ac9ff33aae4f453b.json b/tests/testdata/stretch_v31/get_device_data/aac7b735042c4832ac9ff33aae4f453b.json
new file mode 100644
index 0000000..35ce04f
--- /dev/null
+++ b/tests/testdata/stretch_v31/get_device_data/aac7b735042c4832ac9ff33aae4f453b.json
@@ -0,0 +1 @@
+{"electricity_consumed": 0.0, "electricity_produced": 0.0, "relay": true}
\ No newline at end of file
diff --git a/tests/testdata/stretch_v31/get_device_data/aac7b735042c4832ac9ff33aae4f453b.pickle b/tests/testdata/stretch_v31/get_device_data/aac7b735042c4832ac9ff33aae4f453b.pickle
deleted file mode 100644
index 41b90a9d7ff8665c0d166278cbb0901955a2d86b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 89
zcmZo*nd-*?0ku;!dPGulQj<%HGLth)D&v#$^NLGzQ&Xn6Lsc-K$`=&nr<5k6$g>uu
M<|I~5=_u6$0F|#AxBvhE

diff --git a/tests/testdata/stretch_v31/get_device_data/cfe95cf3de1948c0b8955125bf754614.json b/tests/testdata/stretch_v31/get_device_data/cfe95cf3de1948c0b8955125bf754614.json
new file mode 100644
index 0000000..42de4d3
--- /dev/null
+++ b/tests/testdata/stretch_v31/get_device_data/cfe95cf3de1948c0b8955125bf754614.json
@@ -0,0 +1 @@
+{"electricity_consumed": 0.0, "electricity_consumed_interval": 1.06, "electricity_produced": 0.0, "relay": true}
\ No newline at end of file
diff --git a/tests/testdata/stretch_v31/get_device_data/cfe95cf3de1948c0b8955125bf754614.pickle b/tests/testdata/stretch_v31/get_device_data/cfe95cf3de1948c0b8955125bf754614.pickle
deleted file mode 100644
index 849c8e20cfd5e6765eb56121e8ce00d946bbc4e9..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 130
zcmZo*nOe>O0ku;!dPGulQj<%HGLth)D&v#$^NLGzQ&Xn6Lsc;J$YPU^&&(@HEh<aQ
knc{B$;p?IP7>#eJ1{D<Lr<5k67{pqXnv+;LrK40205PjAb^rhX

diff --git a/tests/testdata/stretch_v31/get_device_data/d950b314e9d8499f968e6db8d82ef78c.json b/tests/testdata/stretch_v31/get_device_data/d950b314e9d8499f968e6db8d82ef78c.json
new file mode 100644
index 0000000..de5baf4
--- /dev/null
+++ b/tests/testdata/stretch_v31/get_device_data/d950b314e9d8499f968e6db8d82ef78c.json
@@ -0,0 +1 @@
+{"relay": false}
\ No newline at end of file
diff --git a/tests/testdata/stretch_v31/get_device_data/e1c884e7dede431dadee09506ec4f859.json b/tests/testdata/stretch_v31/get_device_data/e1c884e7dede431dadee09506ec4f859.json
new file mode 100644
index 0000000..1a7249b
--- /dev/null
+++ b/tests/testdata/stretch_v31/get_device_data/e1c884e7dede431dadee09506ec4f859.json
@@ -0,0 +1 @@
+{"electricity_consumed": 53.2, "electricity_produced": 0.0, "relay": true}
\ No newline at end of file
diff --git a/tests/testdata/stretch_v31/get_device_data/e1c884e7dede431dadee09506ec4f859.pickle b/tests/testdata/stretch_v31/get_device_data/e1c884e7dede431dadee09506ec4f859.pickle
deleted file mode 100644
index faf26b90866d66f0066299c8e79174e2ef0a14b2..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 89
zcmZo*nd-*?0ku;!dPGulQj<%HGLth)D&v#$^NLGzQ&Xn6J9y0mfmx{X1x5KOrO6<9
Ss0j=`tVO9giIr12O7#F&-5%Kh


From 92d029486b6e62f652e7d97861db3298bcb37c1d Mon Sep 17 00:00:00 2001
From: Tom Scholten <git@scholten.nu>
Date: Mon, 7 Sep 2020 16:25:21 +0200
Subject: [PATCH 2/2] Remove pickle

---
 tests/requirements.txt |  1 +
 tests/test_Smile.py    | 15 ---------------
 2 files changed, 1 insertion(+), 15 deletions(-)

diff --git a/tests/requirements.txt b/tests/requirements.txt
index 47a36f2..6383e3c 100644
--- a/tests/requirements.txt
+++ b/tests/requirements.txt
@@ -11,3 +11,4 @@ pytest-coverage
 pylint_strict_informational
 flake8-black
 black
+jsonpickle
diff --git a/tests/test_Smile.py b/tests/test_Smile.py
index 48edf7e..eb9b7c8 100644
--- a/tests/test_Smile.py
+++ b/tests/test_Smile.py
@@ -10,7 +10,6 @@
 
 # Fixture writing
 import io
-import pickle
 import os
 
 import jsonpickle as json
@@ -31,18 +30,6 @@
 class TestPlugwise:
     """Tests for Plugwise Smile."""
 
-    def _write_pickle(self, call, data):
-        """Store JSON data to per-setup files for HA component testing."""
-        path = os.path.join(os.path.dirname(__file__), "testdata/" + self.smile_setup)
-        datafile = os.path.join(path, call + ".pickle")
-        if not os.path.exists(path):
-            os.mkdir(path)
-        if not os.path.exists(os.path.dirname(datafile)):
-            os.mkdir(os.path.dirname(datafile))
-
-        with open(datafile, "wb") as fixture_file:
-            pickle.dump(data, fixture_file)
-
     def _write_json(self, call, data):
         """Store JSON data to per-setup files for HA component testing."""
         path = os.path.join(os.path.dirname(__file__), "testdata/" + self.smile_setup)
@@ -257,7 +244,6 @@ async def device_test(self, smile=Smile, testdata=None):
         """Perform basic device tests."""
         _LOGGER.info("Asserting testdata:")
         device_list = smile.get_all_devices()
-        self._write_pickle("get_all_devices", device_list)
         self._write_json("get_all_devices", device_list)
 
         location_list, dummy = smile.scan_thermostats()
@@ -270,7 +256,6 @@ async def device_test(self, smile=Smile, testdata=None):
         _LOGGER.debug("Device list:\n%s", pp4.pformat(device_list))
         for dev_id, details in device_list.items():
             data = smile.get_device_data(dev_id)
-            self._write_pickle("get_device_data/" + dev_id, data)
             self._write_json("get_device_data/" + dev_id, data)
             _LOGGER.debug(
                 "%s",