more changes to utilize testDataCenterId