PRD-5184 - Fixing some downstream issues in CDA, and tests in PRD