Better testing harness for the CDS