More changes for nextgen back-to-back host testing