[expectations] Adapt nav watchdog to new category interface
[expectations] Adapt 2nd scenario to new category interface