Engine: Fixing navigation tests, refs #3585
Merge pull request #3350 from daviddavis/eng-nav-tests

Engine: Navigation test fixes