Fix regression of 3e3ff250a8 and add nav test