Updating navigation controller tests
Tweaks to navigation to remove separated nav builder for sub-navigation