Fix CDS config and add it to inttest.