Changes to the CDSAsserts to support the changed test data, also checked in here.