small fixes on testUpgrader