Fixing failing test after refactoring the upgrade tools.

Error reported by Bamboo.