diff --git a/src/plugins/azgenerator/CodeModelAzImpl.ts b/src/plugins/azgenerator/CodeModelAzImpl.ts
index 92406af2a..ceae643ea 100644
--- a/src/plugins/azgenerator/CodeModelAzImpl.ts
+++ b/src/plugins/azgenerator/CodeModelAzImpl.ts
@@ -1992,11 +1992,13 @@ export class CodeModelCliImpl implements CodeModelAz {
                         example_param.push(new ExampleParam(name, ret, false, KeyValueType.ShorthandSyntax, keys, defaultName, realParam, ancestors, value));
                     }
                     else if (this.Parameter_IsSimpleArray(realParam.value)) {
-                        for (let i=0; i<value.length; i++) {
-                            ret += ToJsonString(value[i]) + " ";
+                        if (value.length>0) {           // use value only when it's lenght > 0
+                            for (let i=0; i<value.length; i++) {
+                                ret += ToJsonString(value[i]) + " ";
+                            }
+                            ret = ret.trim();
+                            example_param.push(new ExampleParam(name, ret, false, KeyValueType.SimpleArray, [], defaultName, realParam, ancestors, value));
                         }
-                        ret = ret.trim();
-                        example_param.push(new ExampleParam(name, ret, false, KeyValueType.SimpleArray, [], defaultName, realParam, ancestors, value));
                     }
                     else {
                         for (let i=0; i<value.length; i++) {
diff --git a/src/plugins/azgenerator/azgenerator.ts b/src/plugins/azgenerator/azgenerator.ts
index 227db536d..f05f9447d 100644
--- a/src/plugins/azgenerator/azgenerator.ts
+++ b/src/plugins/azgenerator/azgenerator.ts
@@ -34,7 +34,7 @@ export async function processRequest(host: Host) {
                 let azextpath = path.join(model.azOutputFolder,  model.AzextFolder);
                 session.protectFiles(path.join(azextpath, "manual"));
                 session.protectFiles(path.join(azextpath,  "tests/latest/recordings"));
-                session.protectFiles(path.join(azextpath, "README.md"));
+                session.protectFiles(path.join(model.azOutputFolder, "README.md"));
             } while (model.SelectNextExtension());
         }
         // Read existing file generation-mode
diff --git a/src/test/scenarios/testserver/configuration/readme.az.md b/src/test/scenarios/testserver/configuration/readme.az.md
index 3bd6d00c0..10ca6dd50 100644
--- a/src/test/scenarios/testserver/configuration/readme.az.md
+++ b/src/test/scenarios/testserver/configuration/readme.az.md
@@ -12,6 +12,7 @@ az:
   client-authentication-policy: SansIOHTTPPolicy
 az-output-folder: $(azure-cli-extension-folder)/src/testserver
 python-sdk-output-folder: "$(az-output-folder)/azext_testserver/vendored_sdks/testserver"
+sdk-flatten: true
   
 #cli:
 #    cli-directive: