Expand code generation coverage