Fixing broken code generation tests broken due to changes