Update with ESPA CDR tests.