More code generation
New test cases