diff --git a/includes/definitions/discovery/edgeswitch.yaml b/includes/definitions/discovery/edgeswitch.yaml
index 75b805d787..2347c5c6bd 100644
--- a/includes/definitions/discovery/edgeswitch.yaml
+++ b/includes/definitions/discovery/edgeswitch.yaml
@@ -20,7 +20,7 @@ modules:
                 -
                     oid: boxServicesTempSensorsEntry
                     value: boxServicesTempSensorState
-                    num_oid: .1.3.6.1.4.1.4413.1.1.43.1.8.1.4.1.
+                    num_oid: .1.3.6.1.4.1.4413.1.1.43.1.8.1.4.
                     descr: 'Temp Sensor {{ $index }}'
                     index: 'boxServicesTempSensorState.{{ $index }}'
                     states:
@@ -35,7 +35,7 @@ modules:
                 -
                     oid: boxServicesFansEntry
                     value: boxServicesFanItemState
-                    num_oid: .1.3.6.1.4.1.4413.1.1.43.1.6.1.3.1.
+                    num_oid: .1.3.6.1.4.1.4413.1.1.43.1.6.1.3.
                     descr: 'Fan {{ $index }}'
                     index: 'boxServicesFanItemState.{{ $index }}'
                     states:
@@ -52,15 +52,15 @@ modules:
                 -
                     oid: boxServicesFansEntry
                     value: boxServicesFanSpeed
-                    num_oid: .1.3.6.1.4.1.4413.1.1.43.1.6.1.4.1.
+                    num_oid: .1.3.6.1.4.1.4413.1.1.43.1.6.1.4.
                     index: 'boxServicesFanSpeed.{{ $index }}'
                     descr: 'Fan {{ $index }}'
 
         temperature:
             data:
                 -
-                    oid: BoxServicesTempSensorsEntry
+                    oid: boxServicesTempSensorsEntry
                     value: boxServicesTempSensorTemperature
-                    num_oid: .1.3.6.1.4.1.4413.1.1.43.1.8.1.5.1.
+                    num_oid: .1.3.6.1.4.1.4413.1.1.43.1.8.1.5.
                     index: 'boxServicesTempSensorTemperature.{{ $index }}'
                     descr: 'Temperature {{ $index }}'
diff --git a/tests/data/edgeswitch.json b/tests/data/edgeswitch.json
index 4bb7fc19ea..4b88391f17 100644
--- a/tests/data/edgeswitch.json
+++ b/tests/data/edgeswitch.json
@@ -85,7 +85,7 @@
                     "sensor_deleted": 0,
                     "sensor_class": "temperature",
                     "poller_type": "snmp",
-                    "sensor_oid": ".1.3.6.1.4.1.4413.1.1.43.1.8.1.5.1.1.0",
+                    "sensor_oid": ".1.3.6.1.4.1.4413.1.1.43.1.8.1.5.1.0",
                     "sensor_index": "boxServicesTempSensorTemperature.1.0",
                     "sensor_type": "edgeswitch",
                     "sensor_descr": "Temperature 1.0",
@@ -108,7 +108,7 @@
                     "sensor_deleted": 0,
                     "sensor_class": "temperature",
                     "poller_type": "snmp",
-                    "sensor_oid": ".1.3.6.1.4.1.4413.1.1.43.1.8.1.5.1.1.1",
+                    "sensor_oid": ".1.3.6.1.4.1.4413.1.1.43.1.8.1.5.1.1",
                     "sensor_index": "boxServicesTempSensorTemperature.1.1",
                     "sensor_type": "edgeswitch",
                     "sensor_descr": "Temperature 1.1",
@@ -131,7 +131,7 @@
                     "sensor_deleted": 0,
                     "sensor_class": "temperature",
                     "poller_type": "snmp",
-                    "sensor_oid": ".1.3.6.1.4.1.4413.1.1.43.1.8.1.5.1.1.2",
+                    "sensor_oid": ".1.3.6.1.4.1.4413.1.1.43.1.8.1.5.1.2",
                     "sensor_index": "boxServicesTempSensorTemperature.1.2",
                     "sensor_type": "edgeswitch",
                     "sensor_descr": "Temperature 1.2",
@@ -154,7 +154,7 @@
                     "sensor_deleted": 0,
                     "sensor_class": "temperature",
                     "poller_type": "snmp",
-                    "sensor_oid": ".1.3.6.1.4.1.4413.1.1.43.1.8.1.5.1.1.3",
+                    "sensor_oid": ".1.3.6.1.4.1.4413.1.1.43.1.8.1.5.1.3",
                     "sensor_index": "boxServicesTempSensorTemperature.1.3",
                     "sensor_type": "edgeswitch",
                     "sensor_descr": "Temperature 1.3",
@@ -226,175 +226,6 @@
                 }
             ]
         },
-        "poller": {
-            "sensors": [
-                {
-                    "sensor_deleted": 0,
-                    "sensor_class": "state",
-                    "poller_type": "snmp",
-                    "sensor_oid": ".1.3.6.1.4.1.4413.1.1.43.1.15.1.2.1",
-                    "sensor_index": "boxServicesTempUnitState.1",
-                    "sensor_type": "boxServicesTempUnitEntry",
-                    "sensor_descr": "Chassis state",
-                    "sensor_divisor": 1,
-                    "sensor_multiplier": 1,
-                    "sensor_current": 1,
-                    "sensor_limit": null,
-                    "sensor_limit_warn": null,
-                    "sensor_limit_low": null,
-                    "sensor_limit_low_warn": null,
-                    "sensor_alert": 1,
-                    "sensor_custom": "No",
-                    "entPhysicalIndex": null,
-                    "entPhysicalIndex_measured": null,
-                    "sensor_prev": null,
-                    "user_func": null,
-                    "state_name": "boxServicesTempUnitEntry"
-                },
-                {
-                    "sensor_deleted": 0,
-                    "sensor_class": "temperature",
-                    "poller_type": "snmp",
-                    "sensor_oid": ".1.3.6.1.4.1.4413.1.1.43.1.8.1.5.1.1.0",
-                    "sensor_index": "boxServicesTempSensorTemperature.1.0",
-                    "sensor_type": "edgeswitch",
-                    "sensor_descr": "Temperature 1.0",
-                    "sensor_divisor": 1,
-                    "sensor_multiplier": 1,
-                    "sensor_current": 0,
-                    "sensor_limit": 90,
-                    "sensor_limit_warn": null,
-                    "sensor_limit_low": 60,
-                    "sensor_limit_low_warn": null,
-                    "sensor_alert": 1,
-                    "sensor_custom": "No",
-                    "entPhysicalIndex": null,
-                    "entPhysicalIndex_measured": null,
-                    "sensor_prev": 70,
-                    "user_func": null,
-                    "state_name": null
-                },
-                {
-                    "sensor_deleted": 0,
-                    "sensor_class": "temperature",
-                    "poller_type": "snmp",
-                    "sensor_oid": ".1.3.6.1.4.1.4413.1.1.43.1.8.1.5.1.1.1",
-                    "sensor_index": "boxServicesTempSensorTemperature.1.1",
-                    "sensor_type": "edgeswitch",
-                    "sensor_descr": "Temperature 1.1",
-                    "sensor_divisor": 1,
-                    "sensor_multiplier": 1,
-                    "sensor_current": 0,
-                    "sensor_limit": 79,
-                    "sensor_limit_warn": null,
-                    "sensor_limit_low": 49,
-                    "sensor_limit_low_warn": null,
-                    "sensor_alert": 1,
-                    "sensor_custom": "No",
-                    "entPhysicalIndex": null,
-                    "entPhysicalIndex_measured": null,
-                    "sensor_prev": 59,
-                    "user_func": null,
-                    "state_name": null
-                },
-                {
-                    "sensor_deleted": 0,
-                    "sensor_class": "temperature",
-                    "poller_type": "snmp",
-                    "sensor_oid": ".1.3.6.1.4.1.4413.1.1.43.1.8.1.5.1.1.2",
-                    "sensor_index": "boxServicesTempSensorTemperature.1.2",
-                    "sensor_type": "edgeswitch",
-                    "sensor_descr": "Temperature 1.2",
-                    "sensor_divisor": 1,
-                    "sensor_multiplier": 1,
-                    "sensor_current": 0,
-                    "sensor_limit": 86,
-                    "sensor_limit_warn": null,
-                    "sensor_limit_low": 56,
-                    "sensor_limit_low_warn": null,
-                    "sensor_alert": 1,
-                    "sensor_custom": "No",
-                    "entPhysicalIndex": null,
-                    "entPhysicalIndex_measured": null,
-                    "sensor_prev": 66,
-                    "user_func": null,
-                    "state_name": null
-                },
-                {
-                    "sensor_deleted": 0,
-                    "sensor_class": "temperature",
-                    "poller_type": "snmp",
-                    "sensor_oid": ".1.3.6.1.4.1.4413.1.1.43.1.8.1.5.1.1.3",
-                    "sensor_index": "boxServicesTempSensorTemperature.1.3",
-                    "sensor_type": "edgeswitch",
-                    "sensor_descr": "Temperature 1.3",
-                    "sensor_divisor": 1,
-                    "sensor_multiplier": 1,
-                    "sensor_current": 0,
-                    "sensor_limit": 86,
-                    "sensor_limit_warn": null,
-                    "sensor_limit_low": 56,
-                    "sensor_limit_low_warn": null,
-                    "sensor_alert": 1,
-                    "sensor_custom": "No",
-                    "entPhysicalIndex": null,
-                    "entPhysicalIndex_measured": null,
-                    "sensor_prev": 66,
-                    "user_func": null,
-                    "state_name": null
-                }
-            ],
-            "state_indexes": [
-                {
-                    "state_name": "boxServicesTempUnitEntry",
-                    "state_descr": "low",
-                    "state_draw_graph": 1,
-                    "state_value": 0,
-                    "state_generic_value": 1
-                },
-                {
-                    "state_name": "boxServicesTempUnitEntry",
-                    "state_descr": "normal",
-                    "state_draw_graph": 1,
-                    "state_value": 1,
-                    "state_generic_value": 0
-                },
-                {
-                    "state_name": "boxServicesTempUnitEntry",
-                    "state_descr": "warning",
-                    "state_draw_graph": 1,
-                    "state_value": 2,
-                    "state_generic_value": 1
-                },
-                {
-                    "state_name": "boxServicesTempUnitEntry",
-                    "state_descr": "critical",
-                    "state_draw_graph": 1,
-                    "state_value": 3,
-                    "state_generic_value": 2
-                },
-                {
-                    "state_name": "boxServicesTempUnitEntry",
-                    "state_descr": "shutdown",
-                    "state_draw_graph": 1,
-                    "state_value": 4,
-                    "state_generic_value": 2
-                },
-                {
-                    "state_name": "boxServicesTempUnitEntry",
-                    "state_descr": "notpresent",
-                    "state_draw_graph": 1,
-                    "state_value": 5,
-                    "state_generic_value": 2
-                },
-                {
-                    "state_name": "boxServicesTempUnitEntry",
-                    "state_descr": "notoperational",
-                    "state_draw_graph": 1,
-                    "state_value": 6,
-                    "state_generic_value": 3
-                }
-            ]
-        }
+        "poller": "matches discovery"
     }
 }