Fix intermittent test failures in CDS