Fix and update navigation tests