Merge "Minor fix in codegen tests."