Merge "Remove obsolete TODOs from codegen tests"