Add extra navigation tests for #318