D2K test upgrades (only using the fix for production queue and no location/Ifacing info)