Added more comprehensive navigation tests