[expectations] Update nav exp to new framework