Upgrade tests fixed