Revert back state-format, test timestamps

Author: bouwew

tests/test_smile.py

@@ -459,8 +459,9 @@ async def device_test(self, smile=pw_smile.Smile, testdata=None):
                                     if a_item["id"] != b_item["id"]:
                                         continue
 
-                                    if type(a_item["state"]) is list:
-                                        assert a_item["state"][0] == b_item["state"]
+                                    if type(b_item["state"]) is list:
+                                        assert a_item["state"] == b_item["state"][0]
+                                        assert a_item["last_reset"] == b_item["state"][1]
                                     else:
                                         assert a_item["state"] == b_item["state"]
                                     b_sensor = None
@@ -1517,9 +1518,8 @@ async def test_connect_p1v3(self):
                         "state": 10263.159,
                     },
                     {
-                        "id": "electricity_produced_peak_interval",
-                        "state": 179,
-                        "last_reset": dt.datetime(2020, 3, 12, 19, 45),
+                        "id": "electricity_consumed_peak_interval",
+                        "state": [179, dt.datetime(2020, 3, 12, 19, 45)],
                     },
                 ]
             }
@@ -1764,8 +1764,7 @@ async def test_connect_stretch_v31(self):
                 "sensors": [
                     {
                         "id": "electricity_consumed_interval",
-                        "state": 0.71,
-                        "last_reset": dt.datetime(2020, 9, 6, 12, 00),
+                        "state": [0.71, dt.datetime(2020, 9, 6, 12, 00)],
                     }
                 ]
             },
@@ -1809,8 +1808,7 @@ async def test_connect_stretch_v23(self):
                 "sensors": [
                     {
                         "id": "electricity_consumed_interval",
-                        "state": 0.21,
-                        "last_reset": dt.datetime(2020, 8, 3, 20, 00),
+                        "state": [0.21, dt.datetime(2020, 8, 3, 20, 00)],
                     }
                 ]
             },