Merge "make opus encoder test follow CDD"