Beacon BugFix: expectBeacon now behaves as expected