Fixing merge errors, pointing tests to PROD.