added more scenarios for upgrade, disabled failing scenario