diff --git a/tests/event_discovery.tests/from_bacnet.json b/tests/event_discovery.tests/from_bacnet.json
new file mode 100644
index 0000000000..3854b67bdf
--- /dev/null
+++ b/tests/event_discovery.tests/from_bacnet.json
@@ -0,0 +1,124 @@
+{
+  "generation": "2022-06-21T17:19:49.191023+00:00",
+  "points": {
+    "org_building_5005_analogInput_1094": {
+      "ref": "org/building/5005/analogInput/1094",
+      "units": "inchesOfWater",
+      "description": "Discharge Air Velocity Pressure",
+      "ancillary": {
+        "device_id": "5005",
+        "address": "2000:5",
+        "@prop_3407": "3",
+        "@prop_722": "True",
+        "@prop_3542": "False",
+        "@prop_3543": "0.009999999776482582",
+        "@prop_3422": "17",
+        "@prop_725": "0.019999999552965164",
+        "@prop_3164": "720.0",
+        "updateInterval": "100",
+        "@prop_3544": "0.0",
+        "@prop_2179": "0.0",
+        "('InputRangeHigh', 1294)": "1.5",
+        "('InputRangeLow', 1293)": "0.0",
+        "('Offset', 956)": "0.0",
+        "('OutputRangeHigh', 1296)": "1.5",
+        "('OutputRangeLow', 1295)": "-0.20000000298023224",
+        "@prop_2180": "58",
+        "@prop_1433": "0.0029752254486083984",
+        "@prop_518": "9",
+        "@prop_519": "4",
+        "presentValue": "0.0029752254486083984",
+        "outOfService": "False",
+        "reliability": "noFaultDetected",
+        "statusFlags": "[0, 0, 0, 0]",
+        "minPresValue": "-0.20000000298023224",
+        "maxPresValue": "1.5",
+        "('Offline', 913)": "False",
+        "@prop_661": "4",
+        "covIncrement": "0.009999999776482582",
+        "resolution": "0.009999999776482582",
+        "deviceType": "AI1-Int",
+        "eventState": "normal",
+        "@prop_3930": "True",
+        "@prop_32527": "8-1/0_1094",
+        "@prop_2390": "DA-VP",
+        "objectName": "DA-VP",
+        "@prop_512": "0",
+        "@prop_673": "True",
+        "@prop_2197": "0",
+        "@prop_908": "5",
+        "@prop_1006": "0",
+        "objectType": "analogInput",
+        "objectIdentifier": "('analogInput', 1094)",
+        "topic": "org/building/5005/analogInput/1094"
+      }
+    },
+    "org_building_5005_analogInput_1101": {
+      "ref": "org/building/5005/analogInput/1101",
+      "units": "partsPerMillion",
+      "description": "Zone Quality",
+      "ancillary": {
+        "device_id": "5005",
+        "address": "2000:5",
+        "@prop_3407": "0",
+        "@prop_722": "True",
+        "@prop_3542": "True",
+        "@prop_3543": "0.009999999776482582",
+        "@prop_3422": "17",
+        "@prop_725": "0.019999999552965164",
+        "@prop_3164": "900.0",
+        "updateInterval": "3000",
+        "@prop_3544": "0.0",
+        "@prop_2179": "0.0",
+        "('InputRangeHigh', 1294)": "10.0",
+        "('InputRangeLow', 1293)": "0.0",
+        "('Offset', 956)": "0.0",
+        "('OutputRangeHigh', 1296)": "2000.0",
+        "('OutputRangeLow', 1295)": "0.0",
+        "@prop_2180": "5",
+        "@prop_1433": "2.6906607151031494",
+        "@prop_518": "1",
+        "@prop_519": "1",
+        "presentValue": "538.4857788085938",
+        "outOfService": "False",
+        "reliability": "noFaultDetected",
+        "statusFlags": "[0, 0, 0, 0]",
+        "minPresValue": "0.0",
+        "maxPresValue": "2000.0",
+        "('Offline', 913)": "False",
+        "@prop_661": "6",
+        "covIncrement": "4.0",
+        "resolution": "1.0",
+        "deviceType": "UI IN1",
+        "eventState": "normal",
+        "@prop_3930": "False",
+        "@prop_32527": "8-1/0_1101",
+        "@prop_2390": "ZN-Q",
+        "objectName": "ZN-Q",
+        "@prop_512": "0",
+        "@prop_673": "True",
+        "@prop_2197": "0",
+        "@prop_908": "5",
+        "@prop_1006": "0",
+        "objectType": "analogInput",
+        "objectIdentifier": "('analogInput', 1101)",
+        "topic": "org/building/5005/analogInput/1101"
+      }
+    }
+  },
+  "families": {
+    "iot": {
+      "id": "5005"
+    }
+  },
+  "scan_family": "iot",
+  "version": 1,
+  "timestamp": "2022-06-21T17:19:49.191183+00:00",
+  "hardware": {
+    "make": "JCI",
+    "model": "MS-VMA1615-0"
+  },
+  "ancillary": {
+    "objectName": "VAV-CO2"
+  }
+}
diff --git a/tests/event_discovery.tests/from_bacnet.out b/tests/event_discovery.tests/from_bacnet.out
new file mode 100644
index 0000000000..e69de29bb2