Unit tests - Fixing issue where unit test runs of navigation items
can lead to different results due to the test environment.
Merge pull request #2025 from ehelms/unittest-fix

Unit tests - Fixing issue where unit test runs of navigation items