Fix tests, fix menu navigation (left side) [#69960454]

https://www.pivotaltracker.com/story/show/69960454