tests work with to do dependency upgrades.

This commit makes all tests work with local versions of the dependent
packages to be merged into those repos.  No UI refactoring work is done
here.