Update CDR Unit tests to reflect container changes in r398579