Fix CDS unit test failures