Issue #1847506 by xjm: ToolbarHookToolbarTest has invalid preceding slash in path (and other cleanups).