Potential fix to Navigation flakey test