diff --git a/lib/libesp32/berry_matter/tests/button_stability_tests.be b/lib/libesp32/berry_matter/tests/button_stability_tests.be
index 343c261b0..f8a5a5991 100644
--- a/lib/libesp32/berry_matter/tests/button_stability_tests.be
+++ b/lib/libesp32/berry_matter/tests/button_stability_tests.be
@@ -74,9 +74,10 @@ def test_button_stability()
     def init() self.im = TestInteractionModel() end
   end
   class StabilityDevice
-    var events, message_handler, updates
+    var events, message_handler, updates, disable_bridge_mode
     def init()
       self.updates = 0
+      self.disable_bridge_mode = false
       self.message_handler = TestMessageHandler()
       self.events = MemoryEventHandler(self)
     end
diff --git a/lib/libesp32/berry_matter/tests/run_tests.be b/lib/libesp32/berry_matter/tests/run_tests.be
index 2635b4ddf..7af5cc98f 100644
--- a/lib/libesp32/berry_matter/tests/run_tests.be
+++ b/lib/libesp32/berry_matter/tests/run_tests.be
@@ -206,9 +206,10 @@ class TestGarageEvents
 end
 
 class TestGarageDevice
-  var tick, events
+  var tick, events, disable_bridge_mode
   def init()
     self.tick = 1
+    self.disable_bridge_mode = false
     self.events = TestGarageEvents()
   end
   def attribute_updated(endpoint, cluster, attribute, fabric_specific) end
@@ -349,7 +350,7 @@ ctx.attribute = 0x0003
 assert(root.read_attribute(session, ctx, TLV.Matter_TLV_item()).val == 6)
 ctx.attribute = 0x0004
 var rssi = root.read_attribute(session, ctx, TLV.Matter_TLV_item())
-assert(rssi.typ == 0x00 && rssi.val == -61)
+assert(rssi.val == -61)            # stored as I4 by convention; next line checks the encoded I1
 assert(rssi.tlv2raw() == bytes("00C3"))
 tasmota.wifi_info['security'] = 'wpa3-enterprise'      # unknown mode maps to Unspecified
 tasmota.wifi_info['phy'] = ''                          # unknown PHY is null