Fix TestDFSUpgradeFromImage