diff --git a/tests/data/routeros.json b/tests/data/routeros.json
index 0840e9483..1b15ed3c3 100644
--- a/tests/data/routeros.json
+++ b/tests/data/routeros.json
@@ -2550,10 +2550,10 @@
                     "sensor_deleted": "0",
                     "sensor_class": "signal",
                     "poller_type": "snmp",
-                    "sensor_oid": ".1.3.6.1.4.1.14988.1.1.1.2.1.3.156.92.142.164.164.119.9",
-                    "sensor_index": "9",
+                    "sensor_oid": ".1.3.6.1.4.1.14988.1.1.14.1.1.2.'.'.2.`'.9",
+                    "sensor_index": "'.'.2.`'.9",
                     "sensor_type": "routeros",
-                    "sensor_descr": "wlan4 Signal",
+                    "sensor_descr": "{{ $mtxrInterfaceStatsName }} Signal",
                     "sensor_divisor": "1",
                     "sensor_multiplier": "1",
                     "sensor_current": "-63",
@@ -2563,20 +2563,20 @@
                     "sensor_limit_low_warn": null,
                     "sensor_alert": "1",
                     "sensor_custom": "No",
-                    "entPhysicalIndex": "",
-                    "entPhysicalIndex_measured": "",
+                    "entPhysicalIndex": null,
+                    "entPhysicalIndex_measured": null,
                     "sensor_prev": null,
-                    "user_func": "",
+                    "user_func": null,
                     "state_name": null
                 },
                 {
                     "sensor_deleted": "0",
                     "sensor_class": "signal",
                     "poller_type": "snmp",
-                    "sensor_oid": ".1.3.6.1.4.1.14988.1.1.1.2.1.3.244.14.34.43.52.123.1",
-                    "sensor_index": "1",
+                    "sensor_oid": ".1.3.6.1.4.1.14988.1.1.14.1.1.2.'.fe-..'.1",
+                    "sensor_index": "'.fe-..'.1",
                     "sensor_type": "routeros",
-                    "sensor_descr": "wlan1 Signal",
+                    "sensor_descr": "{{ $mtxrInterfaceStatsName }} Signal",
                     "sensor_divisor": "1",
                     "sensor_multiplier": "1",
                     "sensor_current": "-82",
@@ -2586,10 +2586,217 @@
                     "sensor_limit_low_warn": null,
                     "sensor_alert": "1",
                     "sensor_custom": "No",
-                    "entPhysicalIndex": "",
-                    "entPhysicalIndex_measured": "",
+                    "entPhysicalIndex": null,
+                    "entPhysicalIndex_measured": null,
+                    "sensor_prev": null,
+                    "user_func": null,
+                    "state_name": null
+                },
+                {
+                    "sensor_deleted": "0",
+                    "sensor_class": "signal",
+                    "poller_type": "snmp",
+                    "sensor_oid": ".1.3.6.1.4.1.14988.1.1.14.1.1.2.'..,.n.'.9",
+                    "sensor_index": "'..,.n.'.9",
+                    "sensor_type": "routeros",
+                    "sensor_descr": "{{ $mtxrInterfaceStatsName }} Signal",
+                    "sensor_divisor": "1",
+                    "sensor_multiplier": "1",
+                    "sensor_current": "-49",
+                    "sensor_limit": "-30",
+                    "sensor_limit_warn": null,
+                    "sensor_limit_low": "-80",
+                    "sensor_limit_low_warn": null,
+                    "sensor_alert": "1",
+                    "sensor_custom": "No",
+                    "entPhysicalIndex": null,
+                    "entPhysicalIndex_measured": null,
+                    "sensor_prev": null,
+                    "user_func": null,
+                    "state_name": null
+                },
+                {
+                    "sensor_deleted": "0",
+                    "sensor_class": "signal",
+                    "poller_type": "snmp",
+                    "sensor_oid": ".1.3.6.1.4.1.14988.1.1.14.1.1.2.'0Z:",
+                    "sensor_index": "'0Z:",
+                    "sensor_type": "routeros",
+                    "sensor_descr": "{{ $mtxrInterfaceStatsName }} Signal",
+                    "sensor_divisor": "1",
+                    "sensor_multiplier": "1",
+                    "sensor_current": "0.1",
+                    "sensor_limit": "-30",
+                    "sensor_limit_warn": null,
+                    "sensor_limit_low": "-80",
+                    "sensor_limit_low_warn": null,
+                    "sensor_alert": "1",
+                    "sensor_custom": "No",
+                    "entPhysicalIndex": null,
+                    "entPhysicalIndex_measured": null,
+                    "sensor_prev": null,
+                    "user_func": null,
+                    "state_name": null
+                },
+                {
+                    "sensor_deleted": "0",
+                    "sensor_class": "signal",
+                    "poller_type": "snmp",
+                    "sensor_oid": ".1.3.6.1.4.1.14988.1.1.14.1.1.2.'P.L..H'.1",
+                    "sensor_index": "'P.L..H'.1",
+                    "sensor_type": "routeros",
+                    "sensor_descr": "{{ $mtxrInterfaceStatsName }} Signal",
+                    "sensor_divisor": "1",
+                    "sensor_multiplier": "1",
+                    "sensor_current": "-75",
+                    "sensor_limit": "-30",
+                    "sensor_limit_warn": null,
+                    "sensor_limit_low": "-80",
+                    "sensor_limit_low_warn": null,
+                    "sensor_alert": "1",
+                    "sensor_custom": "No",
+                    "entPhysicalIndex": null,
+                    "entPhysicalIndex_measured": null,
+                    "sensor_prev": null,
+                    "user_func": null,
+                    "state_name": null
+                },
+                {
+                    "sensor_deleted": "0",
+                    "sensor_class": "signal",
+                    "poller_type": "snmp",
+                    "sensor_oid": ".1.3.6.1.4.1.14988.1.1.14.1.1.2.'t#D.@.'.9",
+                    "sensor_index": "'t#D.@.'.9",
+                    "sensor_type": "routeros",
+                    "sensor_descr": "{{ $mtxrInterfaceStatsName }} Signal",
+                    "sensor_divisor": "1",
+                    "sensor_multiplier": "1",
+                    "sensor_current": "-66",
+                    "sensor_limit": "-30",
+                    "sensor_limit_warn": null,
+                    "sensor_limit_low": "-80",
+                    "sensor_limit_low_warn": null,
+                    "sensor_alert": "1",
+                    "sensor_custom": "No",
+                    "entPhysicalIndex": null,
+                    "entPhysicalIndex_measured": null,
                     "sensor_prev": null,
-                    "user_func": "",
+                    "user_func": null,
+                    "state_name": null
+                },
+                {
+                    "sensor_deleted": "0",
+                    "sensor_class": "signal",
+                    "poller_type": "snmp",
+                    "sensor_oid": ".1.3.6.1.4.1.14988.1.1.14.1.1.2.'.\\...w'.9",
+                    "sensor_index": "'.\\...w'.9",
+                    "sensor_type": "routeros",
+                    "sensor_descr": "{{ $mtxrInterfaceStatsName }} Signal",
+                    "sensor_divisor": "1",
+                    "sensor_multiplier": "1",
+                    "sensor_current": "-77",
+                    "sensor_limit": "-30",
+                    "sensor_limit_warn": null,
+                    "sensor_limit_low": "-80",
+                    "sensor_limit_low_warn": null,
+                    "sensor_alert": "1",
+                    "sensor_custom": "No",
+                    "entPhysicalIndex": null,
+                    "entPhysicalIndex_measured": null,
+                    "sensor_prev": null,
+                    "user_func": null,
+                    "state_name": null
+                },
+                {
+                    "sensor_deleted": "0",
+                    "sensor_class": "signal",
+                    "poller_type": "snmp",
+                    "sensor_oid": ".1.3.6.1.4.1.14988.1.1.14.1.1.2.'...J..'.1",
+                    "sensor_index": "'...J..'.1",
+                    "sensor_type": "routeros",
+                    "sensor_descr": "{{ $mtxrInterfaceStatsName }} Signal",
+                    "sensor_divisor": "1",
+                    "sensor_multiplier": "1",
+                    "sensor_current": "-43",
+                    "sensor_limit": "-30",
+                    "sensor_limit_warn": null,
+                    "sensor_limit_low": "-80",
+                    "sensor_limit_low_warn": null,
+                    "sensor_alert": "1",
+                    "sensor_custom": "No",
+                    "entPhysicalIndex": null,
+                    "entPhysicalIndex_measured": null,
+                    "sensor_prev": null,
+                    "user_func": null,
+                    "state_name": null
+                },
+                {
+                    "sensor_deleted": "0",
+                    "sensor_class": "signal",
+                    "poller_type": "snmp",
+                    "sensor_oid": ".1.3.6.1.4.1.14988.1.1.14.1.1.2.'...6..'.1",
+                    "sensor_index": "'...6..'.1",
+                    "sensor_type": "routeros",
+                    "sensor_descr": "{{ $mtxrInterfaceStatsName }} Signal",
+                    "sensor_divisor": "1",
+                    "sensor_multiplier": "1",
+                    "sensor_current": "-87",
+                    "sensor_limit": "-30",
+                    "sensor_limit_warn": null,
+                    "sensor_limit_low": "-80",
+                    "sensor_limit_low_warn": null,
+                    "sensor_alert": "1",
+                    "sensor_custom": "No",
+                    "entPhysicalIndex": null,
+                    "entPhysicalIndex_measured": null,
+                    "sensor_prev": null,
+                    "user_func": null,
+                    "state_name": null
+                },
+                {
+                    "sensor_deleted": "0",
+                    "sensor_class": "signal",
+                    "poller_type": "snmp",
+                    "sensor_oid": ".1.3.6.1.4.1.14988.1.1.14.1.1.2.'..y.F%'.1",
+                    "sensor_index": "'..y.F%'.1",
+                    "sensor_type": "routeros",
+                    "sensor_descr": "{{ $mtxrInterfaceStatsName }} Signal",
+                    "sensor_divisor": "1",
+                    "sensor_multiplier": "1",
+                    "sensor_current": "-91",
+                    "sensor_limit": "-30",
+                    "sensor_limit_warn": null,
+                    "sensor_limit_low": "-80",
+                    "sensor_limit_low_warn": null,
+                    "sensor_alert": "1",
+                    "sensor_custom": "No",
+                    "entPhysicalIndex": null,
+                    "entPhysicalIndex_measured": null,
+                    "sensor_prev": null,
+                    "user_func": null,
+                    "state_name": null
+                },
+                {
+                    "sensor_deleted": "0",
+                    "sensor_class": "signal",
+                    "poller_type": "snmp",
+                    "sensor_oid": ".1.3.6.1.4.1.14988.1.1.14.1.1.2.'..+4{'.1",
+                    "sensor_index": "'..+4{'.1",
+                    "sensor_type": "routeros",
+                    "sensor_descr": "{{ $mtxrInterfaceStatsName }} Signal",
+                    "sensor_divisor": "1",
+                    "sensor_multiplier": "1",
+                    "sensor_current": "-82",
+                    "sensor_limit": "-30",
+                    "sensor_limit_warn": null,
+                    "sensor_limit_low": "-80",
+                    "sensor_limit_low_warn": null,
+                    "sensor_alert": "1",
+                    "sensor_custom": "No",
+                    "entPhysicalIndex": null,
+                    "entPhysicalIndex_measured": null,
+                    "sensor_prev": null,
+                    "user_func": null,
                     "state_name": null
                 },
                 {
@@ -2670,46 +2877,253 @@
                     "sensor_deleted": "0",
                     "sensor_class": "signal",
                     "poller_type": "snmp",
-                    "sensor_oid": ".1.3.6.1.4.1.14988.1.1.1.2.1.3.156.92.142.164.164.119.9",
-                    "sensor_index": "9",
+                    "sensor_oid": ".1.3.6.1.4.1.14988.1.1.14.1.1.2.'.'.2.`'.9",
+                    "sensor_index": "'.'.2.`'.9",
                     "sensor_type": "routeros",
-                    "sensor_descr": "wlan4 Signal",
+                    "sensor_descr": "{{ $mtxrInterfaceStatsName }} Signal",
                     "sensor_divisor": "1",
                     "sensor_multiplier": "1",
-                    "sensor_current": "-77",
+                    "sensor_current": "0",
                     "sensor_limit": "-30",
                     "sensor_limit_warn": null,
                     "sensor_limit_low": "-80",
                     "sensor_limit_low_warn": null,
                     "sensor_alert": "1",
                     "sensor_custom": "No",
-                    "entPhysicalIndex": "",
-                    "entPhysicalIndex_measured": "",
+                    "entPhysicalIndex": null,
+                    "entPhysicalIndex_measured": null,
                     "sensor_prev": "-63",
-                    "user_func": "",
+                    "user_func": null,
                     "state_name": null
                 },
                 {
                     "sensor_deleted": "0",
                     "sensor_class": "signal",
                     "poller_type": "snmp",
-                    "sensor_oid": ".1.3.6.1.4.1.14988.1.1.1.2.1.3.244.14.34.43.52.123.1",
-                    "sensor_index": "1",
+                    "sensor_oid": ".1.3.6.1.4.1.14988.1.1.14.1.1.2.'.fe-..'.1",
+                    "sensor_index": "'.fe-..'.1",
                     "sensor_type": "routeros",
-                    "sensor_descr": "wlan1 Signal",
+                    "sensor_descr": "{{ $mtxrInterfaceStatsName }} Signal",
                     "sensor_divisor": "1",
                     "sensor_multiplier": "1",
-                    "sensor_current": "-82",
+                    "sensor_current": "0",
                     "sensor_limit": "-30",
                     "sensor_limit_warn": null,
                     "sensor_limit_low": "-80",
                     "sensor_limit_low_warn": null,
                     "sensor_alert": "1",
                     "sensor_custom": "No",
-                    "entPhysicalIndex": "",
-                    "entPhysicalIndex_measured": "",
-                    "sensor_prev": null,
-                    "user_func": "",
+                    "entPhysicalIndex": null,
+                    "entPhysicalIndex_measured": null,
+                    "sensor_prev": "-82",
+                    "user_func": null,
+                    "state_name": null
+                },
+                {
+                    "sensor_deleted": "0",
+                    "sensor_class": "signal",
+                    "poller_type": "snmp",
+                    "sensor_oid": ".1.3.6.1.4.1.14988.1.1.14.1.1.2.'..,.n.'.9",
+                    "sensor_index": "'..,.n.'.9",
+                    "sensor_type": "routeros",
+                    "sensor_descr": "{{ $mtxrInterfaceStatsName }} Signal",
+                    "sensor_divisor": "1",
+                    "sensor_multiplier": "1",
+                    "sensor_current": "0",
+                    "sensor_limit": "-30",
+                    "sensor_limit_warn": null,
+                    "sensor_limit_low": "-80",
+                    "sensor_limit_low_warn": null,
+                    "sensor_alert": "1",
+                    "sensor_custom": "No",
+                    "entPhysicalIndex": null,
+                    "entPhysicalIndex_measured": null,
+                    "sensor_prev": "-49",
+                    "user_func": null,
+                    "state_name": null
+                },
+                {
+                    "sensor_deleted": "0",
+                    "sensor_class": "signal",
+                    "poller_type": "snmp",
+                    "sensor_oid": ".1.3.6.1.4.1.14988.1.1.14.1.1.2.'0Z:",
+                    "sensor_index": "'0Z:",
+                    "sensor_type": "routeros",
+                    "sensor_descr": "{{ $mtxrInterfaceStatsName }} Signal",
+                    "sensor_divisor": "1",
+                    "sensor_multiplier": "1",
+                    "sensor_current": "0",
+                    "sensor_limit": "-30",
+                    "sensor_limit_warn": null,
+                    "sensor_limit_low": "-80",
+                    "sensor_limit_low_warn": null,
+                    "sensor_alert": "1",
+                    "sensor_custom": "No",
+                    "entPhysicalIndex": null,
+                    "entPhysicalIndex_measured": null,
+                    "sensor_prev": "0.1",
+                    "user_func": null,
+                    "state_name": null
+                },
+                {
+                    "sensor_deleted": "0",
+                    "sensor_class": "signal",
+                    "poller_type": "snmp",
+                    "sensor_oid": ".1.3.6.1.4.1.14988.1.1.14.1.1.2.'P.L..H'.1",
+                    "sensor_index": "'P.L..H'.1",
+                    "sensor_type": "routeros",
+                    "sensor_descr": "{{ $mtxrInterfaceStatsName }} Signal",
+                    "sensor_divisor": "1",
+                    "sensor_multiplier": "1",
+                    "sensor_current": "0",
+                    "sensor_limit": "-30",
+                    "sensor_limit_warn": null,
+                    "sensor_limit_low": "-80",
+                    "sensor_limit_low_warn": null,
+                    "sensor_alert": "1",
+                    "sensor_custom": "No",
+                    "entPhysicalIndex": null,
+                    "entPhysicalIndex_measured": null,
+                    "sensor_prev": "-75",
+                    "user_func": null,
+                    "state_name": null
+                },
+                {
+                    "sensor_deleted": "0",
+                    "sensor_class": "signal",
+                    "poller_type": "snmp",
+                    "sensor_oid": ".1.3.6.1.4.1.14988.1.1.14.1.1.2.'t#D.@.'.9",
+                    "sensor_index": "'t#D.@.'.9",
+                    "sensor_type": "routeros",
+                    "sensor_descr": "{{ $mtxrInterfaceStatsName }} Signal",
+                    "sensor_divisor": "1",
+                    "sensor_multiplier": "1",
+                    "sensor_current": "0",
+                    "sensor_limit": "-30",
+                    "sensor_limit_warn": null,
+                    "sensor_limit_low": "-80",
+                    "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": "signal",
+                    "poller_type": "snmp",
+                    "sensor_oid": ".1.3.6.1.4.1.14988.1.1.14.1.1.2.'.\\...w'.9",
+                    "sensor_index": "'.\\...w'.9",
+                    "sensor_type": "routeros",
+                    "sensor_descr": "{{ $mtxrInterfaceStatsName }} Signal",
+                    "sensor_divisor": "1",
+                    "sensor_multiplier": "1",
+                    "sensor_current": "0",
+                    "sensor_limit": "-30",
+                    "sensor_limit_warn": null,
+                    "sensor_limit_low": "-80",
+                    "sensor_limit_low_warn": null,
+                    "sensor_alert": "1",
+                    "sensor_custom": "No",
+                    "entPhysicalIndex": null,
+                    "entPhysicalIndex_measured": null,
+                    "sensor_prev": "-77",
+                    "user_func": null,
+                    "state_name": null
+                },
+                {
+                    "sensor_deleted": "0",
+                    "sensor_class": "signal",
+                    "poller_type": "snmp",
+                    "sensor_oid": ".1.3.6.1.4.1.14988.1.1.14.1.1.2.'...J..'.1",
+                    "sensor_index": "'...J..'.1",
+                    "sensor_type": "routeros",
+                    "sensor_descr": "{{ $mtxrInterfaceStatsName }} Signal",
+                    "sensor_divisor": "1",
+                    "sensor_multiplier": "1",
+                    "sensor_current": "0",
+                    "sensor_limit": "-30",
+                    "sensor_limit_warn": null,
+                    "sensor_limit_low": "-80",
+                    "sensor_limit_low_warn": null,
+                    "sensor_alert": "1",
+                    "sensor_custom": "No",
+                    "entPhysicalIndex": null,
+                    "entPhysicalIndex_measured": null,
+                    "sensor_prev": "-43",
+                    "user_func": null,
+                    "state_name": null
+                },
+                {
+                    "sensor_deleted": "0",
+                    "sensor_class": "signal",
+                    "poller_type": "snmp",
+                    "sensor_oid": ".1.3.6.1.4.1.14988.1.1.14.1.1.2.'...6..'.1",
+                    "sensor_index": "'...6..'.1",
+                    "sensor_type": "routeros",
+                    "sensor_descr": "{{ $mtxrInterfaceStatsName }} Signal",
+                    "sensor_divisor": "1",
+                    "sensor_multiplier": "1",
+                    "sensor_current": "0",
+                    "sensor_limit": "-30",
+                    "sensor_limit_warn": null,
+                    "sensor_limit_low": "-80",
+                    "sensor_limit_low_warn": null,
+                    "sensor_alert": "1",
+                    "sensor_custom": "No",
+                    "entPhysicalIndex": null,
+                    "entPhysicalIndex_measured": null,
+                    "sensor_prev": "-87",
+                    "user_func": null,
+                    "state_name": null
+                },
+                {
+                    "sensor_deleted": "0",
+                    "sensor_class": "signal",
+                    "poller_type": "snmp",
+                    "sensor_oid": ".1.3.6.1.4.1.14988.1.1.14.1.1.2.'..y.F%'.1",
+                    "sensor_index": "'..y.F%'.1",
+                    "sensor_type": "routeros",
+                    "sensor_descr": "{{ $mtxrInterfaceStatsName }} Signal",
+                    "sensor_divisor": "1",
+                    "sensor_multiplier": "1",
+                    "sensor_current": "0",
+                    "sensor_limit": "-30",
+                    "sensor_limit_warn": null,
+                    "sensor_limit_low": "-80",
+                    "sensor_limit_low_warn": null,
+                    "sensor_alert": "1",
+                    "sensor_custom": "No",
+                    "entPhysicalIndex": null,
+                    "entPhysicalIndex_measured": null,
+                    "sensor_prev": "-91",
+                    "user_func": null,
+                    "state_name": null
+                },
+                {
+                    "sensor_deleted": "0",
+                    "sensor_class": "signal",
+                    "poller_type": "snmp",
+                    "sensor_oid": ".1.3.6.1.4.1.14988.1.1.14.1.1.2.'..+4{'.1",
+                    "sensor_index": "'..+4{'.1",
+                    "sensor_type": "routeros",
+                    "sensor_descr": "{{ $mtxrInterfaceStatsName }} Signal",
+                    "sensor_divisor": "1",
+                    "sensor_multiplier": "1",
+                    "sensor_current": "0",
+                    "sensor_limit": "-30",
+                    "sensor_limit_warn": null,
+                    "sensor_limit_low": "-80",
+                    "sensor_limit_low_warn": null,
+                    "sensor_alert": "1",
+                    "sensor_custom": "No",
+                    "entPhysicalIndex": null,
+                    "entPhysicalIndex_measured": null,
+                    "sensor_prev": "-82",
+                    "user_func": null,
                     "state_name": null
                 },
                 {
diff --git a/tests/snmpsim/routeros.snmprec b/tests/snmpsim/routeros.snmprec
index aa6df16b7..23d7fa9a5 100644
--- a/tests/snmpsim/routeros.snmprec
+++ b/tests/snmpsim/routeros.snmprec
@@ -468,7 +468,17 @@
 1.3.6.1.4.1.14988.1.1.6.1.0|66|33
 1.3.6.1.4.1.14988.1.1.7.3.0|4|71B1060EE89D
 1.3.6.1.4.1.14988.1.1.14.1.1.2.1|4|wlan1
+1.3.6.1.4.1.14988.1.1.14.1.1.2.2|4|wlan2
+1.3.6.1.4.1.14988.1.1.14.1.1.2.3|4|WAN
+1.3.6.1.4.1.14988.1.1.14.1.1.2.4|4|ether2
+1.3.6.1.4.1.14988.1.1.14.1.1.2.5|4|ether3
+1.3.6.1.4.1.14988.1.1.14.1.1.2.6|4|ether4
+1.3.6.1.4.1.14988.1.1.14.1.1.2.7|4|ether5
+1.3.6.1.4.1.14988.1.1.14.1.1.2.8|4|wlan3
 1.3.6.1.4.1.14988.1.1.14.1.1.2.9|4|wlan4
+1.3.6.1.4.1.14988.1.1.14.1.1.2.10|4|bridge-local
+1.3.6.1.4.1.14988.1.1.14.1.1.2.11|4|pppoe-out1
+1.3.6.1.4.1.14988.1.1.14.1.1.2.12|4|bridge-admin
 1.3.6.1.4.1.14988.1.1.15.1.1.1.7|2|7
 1.3.6.1.4.1.14988.1.1.15.1.1.2.7|4|ether5
 1.3.6.1.4.1.14988.1.1.15.1.1.3.7|2|2