Merge "Fixing tests to reflect change in CDDL" into sc-dev