Issue #2296639 by eshta: Fixed testing issues related to unified navigation bar changes.