Rework DOI test and production settings