Merge "Fixing tests to reflect change in CDDL"