diff --git a/lib/services/dataLake.Analytics/lib/catalog/dataLakeAnalyticsCatalogManagementClient.d.ts b/lib/services/dataLake.Analytics/lib/catalog/dataLakeAnalyticsCatalogManagementClient.d.ts
index 8757d05313..1a8508209f 100644
--- a/lib/services/dataLake.Analytics/lib/catalog/dataLakeAnalyticsCatalogManagementClient.d.ts
+++ b/lib/services/dataLake.Analytics/lib/catalog/dataLakeAnalyticsCatalogManagementClient.d.ts
@@ -54,7 +54,7 @@ declare class DataLakeAnalyticsCatalogManagementClient {
     generateClientRequestId: boolean;
 
     // Operation groups
-    catalog: operations.Catalog;
+    catalogOperations: operations.CatalogOperations;
     }
 
 export = DataLakeAnalyticsCatalogManagementClient;
diff --git a/lib/services/dataLake.Analytics/lib/catalog/dataLakeAnalyticsCatalogManagementClient.js b/lib/services/dataLake.Analytics/lib/catalog/dataLakeAnalyticsCatalogManagementClient.js
index 5e991ad4bc..7042f53150 100644
--- a/lib/services/dataLake.Analytics/lib/catalog/dataLakeAnalyticsCatalogManagementClient.js
+++ b/lib/services/dataLake.Analytics/lib/catalog/dataLakeAnalyticsCatalogManagementClient.js
@@ -80,7 +80,7 @@ function DataLakeAnalyticsCatalogManagementClient(credentials, options) {
   if(options.generateClientRequestId !== null && options.generateClientRequestId !== undefined) {
     this.generateClientRequestId = options.generateClientRequestId;
   }
-  this.catalog = new operations.Catalog(this);
+  this.catalog = new operations.CatalogOperations(this);
   this.models = models;
   msRest.addSerializationMixin(this);
 }
diff --git a/lib/services/dataLake.Analytics/lib/catalog/operations/catalog.js b/lib/services/dataLake.Analytics/lib/catalog/operations/catalogOperations.js
similarity index 98%
rename from lib/services/dataLake.Analytics/lib/catalog/operations/catalog.js
rename to lib/services/dataLake.Analytics/lib/catalog/operations/catalogOperations.js
index 94e428a6cb..63f65cb764 100644
--- a/lib/services/dataLake.Analytics/lib/catalog/operations/catalog.js
+++ b/lib/services/dataLake.Analytics/lib/catalog/operations/catalogOperations.js
@@ -17,15 +17,15 @@ var WebResource = msRest.WebResource;
 
 /**
  * @class
- * Catalog
+ * CatalogOperations
  * __NOTE__: An instance of this class is automatically created for an
  * instance of the DataLakeAnalyticsCatalogManagementClient.
- * Initializes a new instance of the Catalog class.
+ * Initializes a new instance of the CatalogOperations class.
  * @constructor
  *
  * @param {DataLakeAnalyticsCatalogManagementClient} client Reference to the service client.
  */
-function Catalog(client) {
+function CatalogOperations(client) {
   this.client = client;
 }
 
@@ -67,7 +67,7 @@ function Catalog(client) {
  *
  *                      {stream} [response] - The HTTP Response stream if an error did not occur.
  */
-Catalog.prototype.createSecret = function (accountName, databaseName, secretName, parameters, options, callback) {
+CatalogOperations.prototype.createSecret = function (accountName, databaseName, secretName, parameters, options, callback) {
   var client = this.client;
   if(!callback && typeof options === 'function') {
     callback = options;
@@ -218,14 +218,13 @@ Catalog.prototype.createSecret = function (accountName, databaseName, secretName
  *
  *                      {Error}  err        - The Error object if an error occurred, null otherwise.
  *
- *                      {object} [result]   - The deserialized result object.
- *                      See {@link USqlSecret} for more information.
+ *                      {null} [result]   - The deserialized result object.
  *
  *                      {object} [request]  - The HTTP Request object if an error did not occur.
  *
  *                      {stream} [response] - The HTTP Response stream if an error did not occur.
  */
-Catalog.prototype.updateSecret = function (accountName, databaseName, secretName, parameters, options, callback) {
+CatalogOperations.prototype.updateSecret = function (accountName, databaseName, secretName, parameters, options, callback) {
   var client = this.client;
   if(!callback && typeof options === 'function') {
     callback = options;
@@ -325,13 +324,10 @@ Catalog.prototype.updateSecret = function (accountName, databaseName, secretName
       try {
         parsedErrorResponse = JSON.parse(responseBody);
         if (parsedErrorResponse) {
-          if (parsedErrorResponse.error) parsedErrorResponse = parsedErrorResponse.error;
-          if (parsedErrorResponse.code) error.code = parsedErrorResponse.code;
-          if (parsedErrorResponse.message) error.message = parsedErrorResponse.message;
-        }
-        if (parsedErrorResponse !== null && parsedErrorResponse !== undefined) {
-          var resultMapper = new client.models['CloudError']().mapper();
-          error.body = client.deserialize(resultMapper, parsedErrorResponse, 'error.body');
+          var internalError = null;
+          if (parsedErrorResponse.error) internalError = parsedErrorResponse.error;
+          error.code = internalError ? internalError.code : parsedErrorResponse.code;
+          error.message = internalError ? internalError.message : parsedErrorResponse.message;
         }
       } catch (defaultError) {
         error.message = util.format('Error "%s" occurred in deserializing the responseBody ' +
@@ -343,23 +339,6 @@ Catalog.prototype.updateSecret = function (accountName, databaseName, secretName
     // Create Result
     var result = null;
     if (responseBody === '') responseBody = null;
-    // Deserialize Response
-    if (statusCode === 200) {
-      var parsedResponse = null;
-      try {
-        parsedResponse = JSON.parse(responseBody);
-        result = JSON.parse(responseBody);
-        if (parsedResponse !== null && parsedResponse !== undefined) {
-          var resultMapper = new client.models['USqlSecret']().mapper();
-          result = client.deserialize(resultMapper, parsedResponse, 'result');
-        }
-      } catch (error) {
-        var deserializationError = new Error(util.format('Error "%s" occurred in deserializing the responseBody - "%s"', error, responseBody));
-        deserializationError.request = msRest.stripRequest(httpRequest);
-        deserializationError.response = msRest.stripResponse(response);
-        return callback(deserializationError);
-      }
-    }
 
     return callback(null, result, httpRequest, response);
   });
@@ -394,7 +373,7 @@ Catalog.prototype.updateSecret = function (accountName, databaseName, secretName
  *
  *                      {stream} [response] - The HTTP Response stream if an error did not occur.
  */
-Catalog.prototype.getSecret = function (accountName, databaseName, secretName, options, callback) {
+CatalogOperations.prototype.getSecret = function (accountName, databaseName, secretName, options, callback) {
   var client = this.client;
   if(!callback && typeof options === 'function') {
     callback = options;
@@ -546,7 +525,7 @@ Catalog.prototype.getSecret = function (accountName, databaseName, secretName, o
  *
  *                      {stream} [response] - The HTTP Response stream if an error did not occur.
  */
-Catalog.prototype.deleteSecret = function (accountName, databaseName, secretName, options, callback) {
+CatalogOperations.prototype.deleteSecret = function (accountName, databaseName, secretName, options, callback) {
   var client = this.client;
   if(!callback && typeof options === 'function') {
     callback = options;
@@ -676,7 +655,7 @@ Catalog.prototype.deleteSecret = function (accountName, databaseName, secretName
  *
  *                      {stream} [response] - The HTTP Response stream if an error did not occur.
  */
-Catalog.prototype.deleteAllSecrets = function (accountName, databaseName, options, callback) {
+CatalogOperations.prototype.deleteAllSecrets = function (accountName, databaseName, options, callback) {
   var client = this.client;
   if(!callback && typeof options === 'function') {
     callback = options;
@@ -816,7 +795,7 @@ Catalog.prototype.deleteAllSecrets = function (accountName, databaseName, option
  *
  *                      {stream} [response] - The HTTP Response stream if an error did not occur.
  */
-Catalog.prototype.createCredential = function (accountName, databaseName, credentialName, parameters, options, callback) {
+CatalogOperations.prototype.createCredential = function (accountName, databaseName, credentialName, parameters, options, callback) {
   var client = this.client;
   if(!callback && typeof options === 'function') {
     callback = options;
@@ -981,7 +960,7 @@ Catalog.prototype.createCredential = function (accountName, databaseName, creden
  *
  *                      {stream} [response] - The HTTP Response stream if an error did not occur.
  */
-Catalog.prototype.updateCredential = function (accountName, databaseName, credentialName, parameters, options, callback) {
+CatalogOperations.prototype.updateCredential = function (accountName, databaseName, credentialName, parameters, options, callback) {
   var client = this.client;
   if(!callback && typeof options === 'function') {
     callback = options;
@@ -1129,7 +1108,7 @@ Catalog.prototype.updateCredential = function (accountName, databaseName, creden
  *
  *                      {stream} [response] - The HTTP Response stream if an error did not occur.
  */
-Catalog.prototype.getCredential = function (accountName, databaseName, credentialName, options, callback) {
+CatalogOperations.prototype.getCredential = function (accountName, databaseName, credentialName, options, callback) {
   var client = this.client;
   if(!callback && typeof options === 'function') {
     callback = options;
@@ -1292,7 +1271,7 @@ Catalog.prototype.getCredential = function (accountName, databaseName, credentia
  *
  *                      {stream} [response] - The HTTP Response stream if an error did not occur.
  */
-Catalog.prototype.deleteCredential = function (accountName, databaseName, credentialName, options, callback) {
+CatalogOperations.prototype.deleteCredential = function (accountName, databaseName, credentialName, options, callback) {
   var client = this.client;
   if(!callback && typeof options === 'function') {
     callback = options;
@@ -1463,7 +1442,7 @@ Catalog.prototype.deleteCredential = function (accountName, databaseName, creden
  *
  *                      {stream} [response] - The HTTP Response stream if an error did not occur.
  */
-Catalog.prototype.listCredentials = function (accountName, databaseName, options, callback) {
+CatalogOperations.prototype.listCredentials = function (accountName, databaseName, options, callback) {
   var client = this.client;
   if(!callback && typeof options === 'function') {
     callback = options;
@@ -1667,7 +1646,7 @@ Catalog.prototype.listCredentials = function (accountName, databaseName, options
  *
  *                      {stream} [response] - The HTTP Response stream if an error did not occur.
  */
-Catalog.prototype.getExternalDataSource = function (accountName, databaseName, externalDataSourceName, options, callback) {
+CatalogOperations.prototype.getExternalDataSource = function (accountName, databaseName, externalDataSourceName, options, callback) {
   var client = this.client;
   if(!callback && typeof options === 'function') {
     callback = options;
@@ -1839,7 +1818,7 @@ Catalog.prototype.getExternalDataSource = function (accountName, databaseName, e
  *
  *                      {stream} [response] - The HTTP Response stream if an error did not occur.
  */
-Catalog.prototype.listExternalDataSources = function (accountName, databaseName, options, callback) {
+CatalogOperations.prototype.listExternalDataSources = function (accountName, databaseName, options, callback) {
   var client = this.client;
   if(!callback && typeof options === 'function') {
     callback = options;
@@ -2043,7 +2022,7 @@ Catalog.prototype.listExternalDataSources = function (accountName, databaseName,
  *
  *                      {stream} [response] - The HTTP Response stream if an error did not occur.
  */
-Catalog.prototype.getProcedure = function (accountName, databaseName, schemaName, procedureName, options, callback) {
+CatalogOperations.prototype.getProcedure = function (accountName, databaseName, schemaName, procedureName, options, callback) {
   var client = this.client;
   if(!callback && typeof options === 'function') {
     callback = options;
@@ -2219,7 +2198,7 @@ Catalog.prototype.getProcedure = function (accountName, databaseName, schemaName
  *
  *                      {stream} [response] - The HTTP Response stream if an error did not occur.
  */
-Catalog.prototype.listProcedures = function (accountName, databaseName, schemaName, options, callback) {
+CatalogOperations.prototype.listProcedures = function (accountName, databaseName, schemaName, options, callback) {
   var client = this.client;
   if(!callback && typeof options === 'function') {
     callback = options;
@@ -2426,7 +2405,7 @@ Catalog.prototype.listProcedures = function (accountName, databaseName, schemaNa
  *
  *                      {stream} [response] - The HTTP Response stream if an error did not occur.
  */
-Catalog.prototype.getTable = function (accountName, databaseName, schemaName, tableName, options, callback) {
+CatalogOperations.prototype.getTable = function (accountName, databaseName, schemaName, tableName, options, callback) {
   var client = this.client;
   if(!callback && typeof options === 'function') {
     callback = options;
@@ -2601,7 +2580,7 @@ Catalog.prototype.getTable = function (accountName, databaseName, schemaName, ta
  *
  *                      {stream} [response] - The HTTP Response stream if an error did not occur.
  */
-Catalog.prototype.listTables = function (accountName, databaseName, schemaName, options, callback) {
+CatalogOperations.prototype.listTables = function (accountName, databaseName, schemaName, options, callback) {
   var client = this.client;
   if(!callback && typeof options === 'function') {
     callback = options;
@@ -2809,7 +2788,7 @@ Catalog.prototype.listTables = function (accountName, databaseName, schemaName,
  *
  *                      {stream} [response] - The HTTP Response stream if an error did not occur.
  */
-Catalog.prototype.getTableType = function (accountName, databaseName, schemaName, tableTypeName, options, callback) {
+CatalogOperations.prototype.getTableType = function (accountName, databaseName, schemaName, tableTypeName, options, callback) {
   var client = this.client;
   if(!callback && typeof options === 'function') {
     callback = options;
@@ -2986,7 +2965,7 @@ Catalog.prototype.getTableType = function (accountName, databaseName, schemaName
  *
  *                      {stream} [response] - The HTTP Response stream if an error did not occur.
  */
-Catalog.prototype.listTableTypes = function (accountName, databaseName, schemaName, options, callback) {
+CatalogOperations.prototype.listTableTypes = function (accountName, databaseName, schemaName, options, callback) {
   var client = this.client;
   if(!callback && typeof options === 'function') {
     callback = options;
@@ -3193,7 +3172,7 @@ Catalog.prototype.listTableTypes = function (accountName, databaseName, schemaNa
  *
  *                      {stream} [response] - The HTTP Response stream if an error did not occur.
  */
-Catalog.prototype.getView = function (accountName, databaseName, schemaName, viewName, options, callback) {
+CatalogOperations.prototype.getView = function (accountName, databaseName, schemaName, viewName, options, callback) {
   var client = this.client;
   if(!callback && typeof options === 'function') {
     callback = options;
@@ -3368,7 +3347,7 @@ Catalog.prototype.getView = function (accountName, databaseName, schemaName, vie
  *
  *                      {stream} [response] - The HTTP Response stream if an error did not occur.
  */
-Catalog.prototype.listViews = function (accountName, databaseName, schemaName, options, callback) {
+CatalogOperations.prototype.listViews = function (accountName, databaseName, schemaName, options, callback) {
   var client = this.client;
   if(!callback && typeof options === 'function') {
     callback = options;
@@ -3579,7 +3558,7 @@ Catalog.prototype.listViews = function (accountName, databaseName, schemaName, o
  *
  *                      {stream} [response] - The HTTP Response stream if an error did not occur.
  */
-Catalog.prototype.getTableStatistic = function (accountName, databaseName, schemaName, tableName, statisticsName, options, callback) {
+CatalogOperations.prototype.getTableStatistic = function (accountName, databaseName, schemaName, tableName, statisticsName, options, callback) {
   var client = this.client;
   if(!callback && typeof options === 'function') {
     callback = options;
@@ -3762,7 +3741,7 @@ Catalog.prototype.getTableStatistic = function (accountName, databaseName, schem
  *
  *                      {stream} [response] - The HTTP Response stream if an error did not occur.
  */
-Catalog.prototype.listTableStatistics = function (accountName, databaseName, schemaName, tableName, options, callback) {
+CatalogOperations.prototype.listTableStatistics = function (accountName, databaseName, schemaName, tableName, options, callback) {
   var client = this.client;
   if(!callback && typeof options === 'function') {
     callback = options;
@@ -3977,7 +3956,7 @@ Catalog.prototype.listTableStatistics = function (accountName, databaseName, sch
  *
  *                      {stream} [response] - The HTTP Response stream if an error did not occur.
  */
-Catalog.prototype.getTablePartition = function (accountName, databaseName, schemaName, tableName, partitionName, options, callback) {
+CatalogOperations.prototype.getTablePartition = function (accountName, databaseName, schemaName, tableName, partitionName, options, callback) {
   var client = this.client;
   if(!callback && typeof options === 'function') {
     callback = options;
@@ -4160,7 +4139,7 @@ Catalog.prototype.getTablePartition = function (accountName, databaseName, schem
  *
  *                      {stream} [response] - The HTTP Response stream if an error did not occur.
  */
-Catalog.prototype.listTablePartitions = function (accountName, databaseName, schemaName, tableName, options, callback) {
+CatalogOperations.prototype.listTablePartitions = function (accountName, databaseName, schemaName, tableName, options, callback) {
   var client = this.client;
   if(!callback && typeof options === 'function') {
     callback = options;
@@ -4390,7 +4369,7 @@ Catalog.prototype.listTablePartitions = function (accountName, databaseName, sch
  *
  *                      {stream} [response] - The HTTP Response stream if an error did not occur.
  */
-Catalog.prototype.listTypes = function (accountName, databaseName, schemaName, options, callback) {
+CatalogOperations.prototype.listTypes = function (accountName, databaseName, schemaName, options, callback) {
   var client = this.client;
   if(!callback && typeof options === 'function') {
     callback = options;
@@ -4601,7 +4580,7 @@ Catalog.prototype.listTypes = function (accountName, databaseName, schemaName, o
  *
  *                      {stream} [response] - The HTTP Response stream if an error did not occur.
  */
-Catalog.prototype.getTableValuedFunction = function (accountName, databaseName, schemaName, tableValuedFunctionName, options, callback) {
+CatalogOperations.prototype.getTableValuedFunction = function (accountName, databaseName, schemaName, tableValuedFunctionName, options, callback) {
   var client = this.client;
   if(!callback && typeof options === 'function') {
     callback = options;
@@ -4780,7 +4759,7 @@ Catalog.prototype.getTableValuedFunction = function (accountName, databaseName,
  *
  *                      {stream} [response] - The HTTP Response stream if an error did not occur.
  */
-Catalog.prototype.listTableValuedFunctions = function (accountName, databaseName, schemaName, options, callback) {
+CatalogOperations.prototype.listTableValuedFunctions = function (accountName, databaseName, schemaName, options, callback) {
   var client = this.client;
   if(!callback && typeof options === 'function') {
     callback = options;
@@ -4986,7 +4965,7 @@ Catalog.prototype.listTableValuedFunctions = function (accountName, databaseName
  *
  *                      {stream} [response] - The HTTP Response stream if an error did not occur.
  */
-Catalog.prototype.getAssembly = function (accountName, databaseName, assemblyName, options, callback) {
+CatalogOperations.prototype.getAssembly = function (accountName, databaseName, assemblyName, options, callback) {
   var client = this.client;
   if(!callback && typeof options === 'function') {
     callback = options;
@@ -5156,7 +5135,7 @@ Catalog.prototype.getAssembly = function (accountName, databaseName, assemblyNam
  *
  *                      {stream} [response] - The HTTP Response stream if an error did not occur.
  */
-Catalog.prototype.listAssemblies = function (accountName, databaseName, options, callback) {
+CatalogOperations.prototype.listAssemblies = function (accountName, databaseName, options, callback) {
   var client = this.client;
   if(!callback && typeof options === 'function') {
     callback = options;
@@ -5357,7 +5336,7 @@ Catalog.prototype.listAssemblies = function (accountName, databaseName, options,
  *
  *                      {stream} [response] - The HTTP Response stream if an error did not occur.
  */
-Catalog.prototype.getSchema = function (accountName, databaseName, schemaName, options, callback) {
+CatalogOperations.prototype.getSchema = function (accountName, databaseName, schemaName, options, callback) {
   var client = this.client;
   if(!callback && typeof options === 'function') {
     callback = options;
@@ -5526,7 +5505,7 @@ Catalog.prototype.getSchema = function (accountName, databaseName, schemaName, o
  *
  *                      {stream} [response] - The HTTP Response stream if an error did not occur.
  */
-Catalog.prototype.listSchemas = function (accountName, databaseName, options, callback) {
+CatalogOperations.prototype.listSchemas = function (accountName, databaseName, options, callback) {
   var client = this.client;
   if(!callback && typeof options === 'function') {
     callback = options;
@@ -5725,7 +5704,7 @@ Catalog.prototype.listSchemas = function (accountName, databaseName, options, ca
  *
  *                      {stream} [response] - The HTTP Response stream if an error did not occur.
  */
-Catalog.prototype.getDatabase = function (accountName, databaseName, options, callback) {
+CatalogOperations.prototype.getDatabase = function (accountName, databaseName, options, callback) {
   var client = this.client;
   if(!callback && typeof options === 'function') {
     callback = options;
@@ -5888,7 +5867,7 @@ Catalog.prototype.getDatabase = function (accountName, databaseName, options, ca
  *
  *                      {stream} [response] - The HTTP Response stream if an error did not occur.
  */
-Catalog.prototype.listDatabases = function (accountName, options, callback) {
+CatalogOperations.prototype.listDatabases = function (accountName, options, callback) {
   var client = this.client;
   if(!callback && typeof options === 'function') {
     callback = options;
@@ -6081,7 +6060,7 @@ Catalog.prototype.listDatabases = function (accountName, options, callback) {
  *
  *                      {stream} [response] - The HTTP Response stream if an error did not occur.
  */
-Catalog.prototype.listCredentialsNext = function (nextPageLink, options, callback) {
+CatalogOperations.prototype.listCredentialsNext = function (nextPageLink, options, callback) {
   var client = this.client;
   if(!callback && typeof options === 'function') {
     callback = options;
@@ -6209,7 +6188,7 @@ Catalog.prototype.listCredentialsNext = function (nextPageLink, options, callbac
  *
  *                      {stream} [response] - The HTTP Response stream if an error did not occur.
  */
-Catalog.prototype.listExternalDataSourcesNext = function (nextPageLink, options, callback) {
+CatalogOperations.prototype.listExternalDataSourcesNext = function (nextPageLink, options, callback) {
   var client = this.client;
   if(!callback && typeof options === 'function') {
     callback = options;
@@ -6335,7 +6314,7 @@ Catalog.prototype.listExternalDataSourcesNext = function (nextPageLink, options,
  *
  *                      {stream} [response] - The HTTP Response stream if an error did not occur.
  */
-Catalog.prototype.listProceduresNext = function (nextPageLink, options, callback) {
+CatalogOperations.prototype.listProceduresNext = function (nextPageLink, options, callback) {
   var client = this.client;
   if(!callback && typeof options === 'function') {
     callback = options;
@@ -6461,7 +6440,7 @@ Catalog.prototype.listProceduresNext = function (nextPageLink, options, callback
  *
  *                      {stream} [response] - The HTTP Response stream if an error did not occur.
  */
-Catalog.prototype.listTablesNext = function (nextPageLink, options, callback) {
+CatalogOperations.prototype.listTablesNext = function (nextPageLink, options, callback) {
   var client = this.client;
   if(!callback && typeof options === 'function') {
     callback = options;
@@ -6587,7 +6566,7 @@ Catalog.prototype.listTablesNext = function (nextPageLink, options, callback) {
  *
  *                      {stream} [response] - The HTTP Response stream if an error did not occur.
  */
-Catalog.prototype.listTableTypesNext = function (nextPageLink, options, callback) {
+CatalogOperations.prototype.listTableTypesNext = function (nextPageLink, options, callback) {
   var client = this.client;
   if(!callback && typeof options === 'function') {
     callback = options;
@@ -6713,7 +6692,7 @@ Catalog.prototype.listTableTypesNext = function (nextPageLink, options, callback
  *
  *                      {stream} [response] - The HTTP Response stream if an error did not occur.
  */
-Catalog.prototype.listViewsNext = function (nextPageLink, options, callback) {
+CatalogOperations.prototype.listViewsNext = function (nextPageLink, options, callback) {
   var client = this.client;
   if(!callback && typeof options === 'function') {
     callback = options;
@@ -6840,7 +6819,7 @@ Catalog.prototype.listViewsNext = function (nextPageLink, options, callback) {
  *
  *                      {stream} [response] - The HTTP Response stream if an error did not occur.
  */
-Catalog.prototype.listTableStatisticsNext = function (nextPageLink, options, callback) {
+CatalogOperations.prototype.listTableStatisticsNext = function (nextPageLink, options, callback) {
   var client = this.client;
   if(!callback && typeof options === 'function') {
     callback = options;
@@ -6967,7 +6946,7 @@ Catalog.prototype.listTableStatisticsNext = function (nextPageLink, options, cal
  *
  *                      {stream} [response] - The HTTP Response stream if an error did not occur.
  */
-Catalog.prototype.listTablePartitionsNext = function (nextPageLink, options, callback) {
+CatalogOperations.prototype.listTablePartitionsNext = function (nextPageLink, options, callback) {
   var client = this.client;
   if(!callback && typeof options === 'function') {
     callback = options;
@@ -7094,7 +7073,7 @@ Catalog.prototype.listTablePartitionsNext = function (nextPageLink, options, cal
  *
  *                      {stream} [response] - The HTTP Response stream if an error did not occur.
  */
-Catalog.prototype.listTypesNext = function (nextPageLink, options, callback) {
+CatalogOperations.prototype.listTypesNext = function (nextPageLink, options, callback) {
   var client = this.client;
   if(!callback && typeof options === 'function') {
     callback = options;
@@ -7222,7 +7201,7 @@ Catalog.prototype.listTypesNext = function (nextPageLink, options, callback) {
  *
  *                      {stream} [response] - The HTTP Response stream if an error did not occur.
  */
-Catalog.prototype.listTableValuedFunctionsNext = function (nextPageLink, options, callback) {
+CatalogOperations.prototype.listTableValuedFunctionsNext = function (nextPageLink, options, callback) {
   var client = this.client;
   if(!callback && typeof options === 'function') {
     callback = options;
@@ -7348,7 +7327,7 @@ Catalog.prototype.listTableValuedFunctionsNext = function (nextPageLink, options
  *
  *                      {stream} [response] - The HTTP Response stream if an error did not occur.
  */
-Catalog.prototype.listAssembliesNext = function (nextPageLink, options, callback) {
+CatalogOperations.prototype.listAssembliesNext = function (nextPageLink, options, callback) {
   var client = this.client;
   if(!callback && typeof options === 'function') {
     callback = options;
@@ -7474,7 +7453,7 @@ Catalog.prototype.listAssembliesNext = function (nextPageLink, options, callback
  *
  *                      {stream} [response] - The HTTP Response stream if an error did not occur.
  */
-Catalog.prototype.listSchemasNext = function (nextPageLink, options, callback) {
+CatalogOperations.prototype.listSchemasNext = function (nextPageLink, options, callback) {
   var client = this.client;
   if(!callback && typeof options === 'function') {
     callback = options;
@@ -7600,7 +7579,7 @@ Catalog.prototype.listSchemasNext = function (nextPageLink, options, callback) {
  *
  *                      {stream} [response] - The HTTP Response stream if an error did not occur.
  */
-Catalog.prototype.listDatabasesNext = function (nextPageLink, options, callback) {
+CatalogOperations.prototype.listDatabasesNext = function (nextPageLink, options, callback) {
   var client = this.client;
   if(!callback && typeof options === 'function') {
     callback = options;
@@ -7703,4 +7682,4 @@ Catalog.prototype.listDatabasesNext = function (nextPageLink, options, callback)
 };
 
 
-module.exports = Catalog;
+module.exports = CatalogOperations;
diff --git a/lib/services/dataLake.Analytics/lib/catalog/operations/index.d.ts b/lib/services/dataLake.Analytics/lib/catalog/operations/index.d.ts
index bcb957f47f..120b386b2d 100644
--- a/lib/services/dataLake.Analytics/lib/catalog/operations/index.d.ts
+++ b/lib/services/dataLake.Analytics/lib/catalog/operations/index.d.ts
@@ -14,11 +14,11 @@ import * as models from '../models';
 
 /**
  * @class
- * Catalog
+ * CatalogOperations
  * __NOTE__: An instance of this class is automatically created for an
  * instance of the DataLakeAnalyticsCatalogManagementClient.
  */
-export interface Catalog {
+export interface CatalogOperations {
 
     /**
      * Creates the specified secret for use with external data sources in the
@@ -80,8 +80,8 @@ export interface Catalog {
      * @param {ServiceCallback} [callback] callback function; see ServiceCallback
      * doc in ms-rest index.d.ts for details
      */
-    updateSecret(accountName: string, databaseName: string, secretName: string, parameters: models.DataLakeAnalyticsCatalogSecretCreateOrUpdateParameters, options: { customHeaders? : { [headerName: string]: string; } }, callback: ServiceCallback<models.USqlSecret>): void;
-    updateSecret(accountName: string, databaseName: string, secretName: string, parameters: models.DataLakeAnalyticsCatalogSecretCreateOrUpdateParameters, callback: ServiceCallback<models.USqlSecret>): void;
+    updateSecret(accountName: string, databaseName: string, secretName: string, parameters: models.DataLakeAnalyticsCatalogSecretCreateOrUpdateParameters, options: { customHeaders? : { [headerName: string]: string; } }, callback: ServiceCallback<void>): void;
+    updateSecret(accountName: string, databaseName: string, secretName: string, parameters: models.DataLakeAnalyticsCatalogSecretCreateOrUpdateParameters, callback: ServiceCallback<void>): void;
 
     /**
      * Gets the specified secret in the specified database. This is deprecated and
diff --git a/lib/services/dataLake.Analytics/lib/catalog/operations/index.js b/lib/services/dataLake.Analytics/lib/catalog/operations/index.js
index 71bb3d593e..1afdee1044 100644
--- a/lib/services/dataLake.Analytics/lib/catalog/operations/index.js
+++ b/lib/services/dataLake.Analytics/lib/catalog/operations/index.js
@@ -14,4 +14,4 @@
 
 'use strict';
 
-exports.Catalog = require('./catalog');
+exports.CatalogOperations = require('./catalogOperations');
diff --git a/lib/services/dataLake.Analytics/lib/job/dataLakeAnalyticsJobManagementClient.d.ts b/lib/services/dataLake.Analytics/lib/job/dataLakeAnalyticsJobManagementClient.d.ts
index c0444aa971..696ac158e4 100644
--- a/lib/services/dataLake.Analytics/lib/job/dataLakeAnalyticsJobManagementClient.d.ts
+++ b/lib/services/dataLake.Analytics/lib/job/dataLakeAnalyticsJobManagementClient.d.ts
@@ -54,7 +54,7 @@ declare class DataLakeAnalyticsJobManagementClient {
     generateClientRequestId: boolean;
 
     // Operation groups
-    job: operations.Job;
+    jobOperations: operations.JobOperations;
     }
 
 export = DataLakeAnalyticsJobManagementClient;
diff --git a/lib/services/dataLake.Analytics/lib/job/dataLakeAnalyticsJobManagementClient.js b/lib/services/dataLake.Analytics/lib/job/dataLakeAnalyticsJobManagementClient.js
index 155a7e8a91..6f04add44d 100644
--- a/lib/services/dataLake.Analytics/lib/job/dataLakeAnalyticsJobManagementClient.js
+++ b/lib/services/dataLake.Analytics/lib/job/dataLakeAnalyticsJobManagementClient.js
@@ -80,7 +80,7 @@ function DataLakeAnalyticsJobManagementClient(credentials, options) {
   if(options.generateClientRequestId !== null && options.generateClientRequestId !== undefined) {
     this.generateClientRequestId = options.generateClientRequestId;
   }
-  this.job = new operations.Job(this);
+  this.job = new operations.JobOperations(this);
   this.models = models;
   msRest.addSerializationMixin(this);
 }
diff --git a/lib/services/dataLake.Analytics/lib/job/models/diagnostics.js b/lib/services/dataLake.Analytics/lib/job/models/diagnostics.js
index c3dbb256cd..7c58a35fb5 100644
--- a/lib/services/dataLake.Analytics/lib/job/models/diagnostics.js
+++ b/lib/services/dataLake.Analytics/lib/job/models/diagnostics.js
@@ -25,7 +25,8 @@
  * @member {string} [message] the error message.
  *
  * @member {string} [severity] the severity of the error. Possible values
- * include: 'Warning', 'Error', 'Info'
+ * include: 'Warning', 'Error', 'Info', 'SevereWarning', 'Deprecated',
+ * 'UserWarning'
  *
  * @member {number} [start] the starting index of the error.
  *
@@ -85,7 +86,7 @@ Diagnostics.prototype.mapper = function () {
           serializedName: 'severity',
           type: {
             name: 'Enum',
-            allowedValues: [ 'Warning', 'Error', 'Info' ]
+            allowedValues: [ 'Warning', 'Error', 'Info', 'SevereWarning', 'Deprecated', 'UserWarning' ]
           }
         },
         start: {
diff --git a/lib/services/dataLake.Analytics/lib/job/models/index.d.ts b/lib/services/dataLake.Analytics/lib/job/models/index.d.ts
index e394ea02c7..8d55dc38ec 100644
--- a/lib/services/dataLake.Analytics/lib/job/models/index.d.ts
+++ b/lib/services/dataLake.Analytics/lib/job/models/index.d.ts
@@ -196,7 +196,8 @@ export interface JobResource {
  * @member {string} [message] the error message.
  *
  * @member {string} [severity] the severity of the error. Possible values
- * include: 'Warning', 'Error', 'Info'
+ * include: 'Warning', 'Error', 'Info', 'SevereWarning', 'Deprecated',
+ * 'UserWarning'
  *
  * @member {number} [start] the starting index of the error.
  *
@@ -346,7 +347,8 @@ export interface HiveJobProperties extends JobProperties {
  * @member {number} [diagnosticCode] the diagnostic error code.
  *
  * @member {string} [severity] the severity level of the failure. Possible
- * values include: 'Warning', 'Error', 'Info'
+ * values include: 'Warning', 'Error', 'Info', 'SevereWarning', 'Deprecated',
+ * 'UserWarning'
  *
  * @member {string} [details] the details of the error message.
  *
@@ -427,7 +429,8 @@ export interface JobInnerError {
  * @member {number} [innerError.diagnosticCode] the diagnostic error code.
  *
  * @member {string} [innerError.severity] the severity level of the failure.
- * Possible values include: 'Warning', 'Error', 'Info'
+ * Possible values include: 'Warning', 'Error', 'Info', 'SevereWarning',
+ * 'Deprecated', 'UserWarning'
  *
  * @member {string} [innerError.details] the details of the error message.
  *
@@ -455,7 +458,8 @@ export interface JobInnerError {
  * @member {string} [innerError.description] the error message description
  *
  * @member {string} [severity] the severity level of the failure. Possible
- * values include: 'Warning', 'Error', 'Info'
+ * values include: 'Warning', 'Error', 'Info', 'SevereWarning', 'Deprecated',
+ * 'UserWarning'
  *
  * @member {string} [source] the ultimate source of the failure (usually either
  * SYSTEM or USER).
diff --git a/lib/services/dataLake.Analytics/lib/job/models/jobErrorDetails.js b/lib/services/dataLake.Analytics/lib/job/models/jobErrorDetails.js
index 6267406a20..a1deb88786 100644
--- a/lib/services/dataLake.Analytics/lib/job/models/jobErrorDetails.js
+++ b/lib/services/dataLake.Analytics/lib/job/models/jobErrorDetails.js
@@ -52,7 +52,8 @@ var models = require('./index');
  * @member {number} [innerError.diagnosticCode] the diagnostic error code.
  *
  * @member {string} [innerError.severity] the severity level of the failure.
- * Possible values include: 'Warning', 'Error', 'Info'
+ * Possible values include: 'Warning', 'Error', 'Info', 'SevereWarning',
+ * 'Deprecated', 'UserWarning'
  *
  * @member {string} [innerError.details] the details of the error message.
  *
@@ -80,7 +81,8 @@ var models = require('./index');
  * @member {string} [innerError.description] the error message description
  *
  * @member {string} [severity] the severity level of the failure. Possible
- * values include: 'Warning', 'Error', 'Info'
+ * values include: 'Warning', 'Error', 'Info', 'SevereWarning', 'Deprecated',
+ * 'UserWarning'
  *
  * @member {string} [source] the ultimate source of the failure (usually either
  * SYSTEM or USER).
@@ -201,7 +203,7 @@ JobErrorDetails.prototype.mapper = function () {
           serializedName: 'severity',
           type: {
             name: 'Enum',
-            allowedValues: [ 'Warning', 'Error', 'Info' ]
+            allowedValues: [ 'Warning', 'Error', 'Info', 'SevereWarning', 'Deprecated', 'UserWarning' ]
           }
         },
         source: {
diff --git a/lib/services/dataLake.Analytics/lib/job/models/jobInnerError.js b/lib/services/dataLake.Analytics/lib/job/models/jobInnerError.js
index c9de016edd..a510a0b67d 100644
--- a/lib/services/dataLake.Analytics/lib/job/models/jobInnerError.js
+++ b/lib/services/dataLake.Analytics/lib/job/models/jobInnerError.js
@@ -19,7 +19,8 @@
  * @member {number} [diagnosticCode] the diagnostic error code.
  *
  * @member {string} [severity] the severity level of the failure. Possible
- * values include: 'Warning', 'Error', 'Info'
+ * values include: 'Warning', 'Error', 'Info', 'SevereWarning', 'Deprecated',
+ * 'UserWarning'
  *
  * @member {string} [details] the details of the error message.
  *
@@ -77,7 +78,7 @@ JobInnerError.prototype.mapper = function () {
           serializedName: 'severity',
           type: {
             name: 'Enum',
-            allowedValues: [ 'Warning', 'Error', 'Info' ]
+            allowedValues: [ 'Warning', 'Error', 'Info', 'SevereWarning', 'Deprecated', 'UserWarning' ]
           }
         },
         details: {
diff --git a/lib/services/dataLake.Analytics/lib/job/operations/index.d.ts b/lib/services/dataLake.Analytics/lib/job/operations/index.d.ts
index 401be5d3b6..0f42ae8c55 100644
--- a/lib/services/dataLake.Analytics/lib/job/operations/index.d.ts
+++ b/lib/services/dataLake.Analytics/lib/job/operations/index.d.ts
@@ -14,11 +14,11 @@ import * as models from '../models';
 
 /**
  * @class
- * Job
+ * JobOperations
  * __NOTE__: An instance of this class is automatically created for an
  * instance of the DataLakeAnalyticsJobManagementClient.
  */
-export interface Job {
+export interface JobOperations {
 
     /**
      * Gets statistics of the specified job.
diff --git a/lib/services/dataLake.Analytics/lib/job/operations/index.js b/lib/services/dataLake.Analytics/lib/job/operations/index.js
index 4f752e49d5..01b064391e 100644
--- a/lib/services/dataLake.Analytics/lib/job/operations/index.js
+++ b/lib/services/dataLake.Analytics/lib/job/operations/index.js
@@ -14,4 +14,4 @@
 
 'use strict';
 
-exports.Job = require('./job');
+exports.JobOperations = require('./jobOperations');
diff --git a/lib/services/dataLake.Analytics/lib/job/operations/job.js b/lib/services/dataLake.Analytics/lib/job/operations/jobOperations.js
similarity index 98%
rename from lib/services/dataLake.Analytics/lib/job/operations/job.js
rename to lib/services/dataLake.Analytics/lib/job/operations/jobOperations.js
index 402efbc749..d5e4597641 100644
--- a/lib/services/dataLake.Analytics/lib/job/operations/job.js
+++ b/lib/services/dataLake.Analytics/lib/job/operations/jobOperations.js
@@ -17,15 +17,15 @@ var WebResource = msRest.WebResource;
 
 /**
  * @class
- * Job
+ * JobOperations
  * __NOTE__: An instance of this class is automatically created for an
  * instance of the DataLakeAnalyticsJobManagementClient.
- * Initializes a new instance of the Job class.
+ * Initializes a new instance of the JobOperations class.
  * @constructor
  *
  * @param {DataLakeAnalyticsJobManagementClient} client Reference to the service client.
  */
-function Job(client) {
+function JobOperations(client) {
   this.client = client;
 }
 
@@ -55,7 +55,7 @@ function Job(client) {
  *
  *                      {stream} [response] - The HTTP Response stream if an error did not occur.
  */
-Job.prototype.getStatistics = function (accountName, jobIdentity, options, callback) {
+JobOperations.prototype.getStatistics = function (accountName, jobIdentity, options, callback) {
   var client = this.client;
   if(!callback && typeof options === 'function') {
     callback = options;
@@ -200,7 +200,7 @@ Job.prototype.getStatistics = function (accountName, jobIdentity, options, callb
  *
  *                      {stream} [response] - The HTTP Response stream if an error did not occur.
  */
-Job.prototype.getDebugDataPath = function (accountName, jobIdentity, options, callback) {
+JobOperations.prototype.getDebugDataPath = function (accountName, jobIdentity, options, callback) {
   var client = this.client;
   if(!callback && typeof options === 'function') {
     callback = options;
@@ -372,7 +372,7 @@ Job.prototype.getDebugDataPath = function (accountName, jobIdentity, options, ca
  *
  *                      {stream} [response] - The HTTP Response stream if an error did not occur.
  */
-Job.prototype.build = function (accountName, parameters, options, callback) {
+JobOperations.prototype.build = function (accountName, parameters, options, callback) {
   var client = this.client;
   if(!callback && typeof options === 'function') {
     callback = options;
@@ -529,7 +529,7 @@ Job.prototype.build = function (accountName, parameters, options, callback) {
  *
  *                      {stream} [response] - The HTTP Response stream if an error did not occur.
  */
-Job.prototype.cancel = function (accountName, jobIdentity, options, callback) {
+JobOperations.prototype.cancel = function (accountName, jobIdentity, options, callback) {
   var client = this.client;
   if(!callback && typeof options === 'function') {
     callback = options;
@@ -654,7 +654,7 @@ Job.prototype.cancel = function (accountName, jobIdentity, options, callback) {
  *
  *                      {stream} [response] - The HTTP Response stream if an error did not occur.
  */
-Job.prototype.get = function (accountName, jobIdentity, options, callback) {
+JobOperations.prototype.get = function (accountName, jobIdentity, options, callback) {
   var client = this.client;
   if(!callback && typeof options === 'function') {
     callback = options;
@@ -827,7 +827,7 @@ Job.prototype.get = function (accountName, jobIdentity, options, callback) {
  *
  *                      {stream} [response] - The HTTP Response stream if an error did not occur.
  */
-Job.prototype.create = function (accountName, jobIdentity, parameters, options, callback) {
+JobOperations.prototype.create = function (accountName, jobIdentity, parameters, options, callback) {
   var client = this.client;
   if(!callback && typeof options === 'function') {
     callback = options;
@@ -1008,7 +1008,7 @@ Job.prototype.create = function (accountName, jobIdentity, parameters, options,
  *
  *                      {stream} [response] - The HTTP Response stream if an error did not occur.
  */
-Job.prototype.list = function (accountName, options, callback) {
+JobOperations.prototype.list = function (accountName, options, callback) {
   var client = this.client;
   if(!callback && typeof options === 'function') {
     callback = options;
@@ -1202,7 +1202,7 @@ Job.prototype.list = function (accountName, options, callback) {
  *
  *                      {stream} [response] - The HTTP Response stream if an error did not occur.
  */
-Job.prototype.listNext = function (nextPageLink, options, callback) {
+JobOperations.prototype.listNext = function (nextPageLink, options, callback) {
   var client = this.client;
   if(!callback && typeof options === 'function') {
     callback = options;
@@ -1305,4 +1305,4 @@ Job.prototype.listNext = function (nextPageLink, options, callback) {
 };
 
 
-module.exports = Job;
+module.exports = JobOperations;
diff --git a/lib/services/dataLake.Store/lib/filesystem/dataLakeStoreFileSystemManagementClient.d.ts b/lib/services/dataLake.Store/lib/filesystem/dataLakeStoreFileSystemManagementClient.d.ts
index 64dd37e908..e94a2365f3 100644
--- a/lib/services/dataLake.Store/lib/filesystem/dataLakeStoreFileSystemManagementClient.d.ts
+++ b/lib/services/dataLake.Store/lib/filesystem/dataLakeStoreFileSystemManagementClient.d.ts
@@ -12,7 +12,7 @@ import { ServiceClientOptions, RequestOptions, ServiceCallback, ServiceClientCre
 import * as operations from "./operations";
 
 declare class DataLakeStoreFileSystemManagementClient {
-    /**
+        /**
      * @class
      * Initializes a new instance of the DataLakeStoreFileSystemManagementClient class.
      * @constructor
diff --git a/lib/services/dataLake.Store/lib/filesystem/dataLakeStoreFileSystemManagementClient.js b/lib/services/dataLake.Store/lib/filesystem/dataLakeStoreFileSystemManagementClient.js
index 0b4e2676fa..6f3bb494d0 100644
--- a/lib/services/dataLake.Store/lib/filesystem/dataLakeStoreFileSystemManagementClient.js
+++ b/lib/services/dataLake.Store/lib/filesystem/dataLakeStoreFileSystemManagementClient.js
@@ -65,6 +65,8 @@ function DataLakeStoreFileSystemManagementClient(credentials, options) {
   this.baseUri = 'https://{accountName}.{adlsFileSystemDnsSuffix}';
   this.credentials = credentials;
 
+  var packageInfo = this.getPackageJsonInfo(__dirname);
+  this.addUserAgentInfo(util.format('%s/%s', packageInfo.name, packageInfo.version));
   if(options.apiVersion !== null && options.apiVersion !== undefined) {
     this.apiVersion = options.apiVersion;
   }
diff --git a/lib/services/dataLake.Store/lib/filesystem/models/fileStatusProperties.js b/lib/services/dataLake.Store/lib/filesystem/models/fileStatusProperties.js
index 704cfe1ffe..10b7bdf768 100644
--- a/lib/services/dataLake.Store/lib/filesystem/models/fileStatusProperties.js
+++ b/lib/services/dataLake.Store/lib/filesystem/models/fileStatusProperties.js
@@ -42,6 +42,8 @@
  * @member {string} [type] the type of the path object. Possible values
  * include: 'FILE', 'DIRECTORY'
  *
+ * @member {boolean} [aclBit] flag to indicate if extended acls are enabled
+ *
  */
 function FileStatusProperties() {
 }
@@ -87,7 +89,7 @@ FileStatusProperties.prototype.mapper = function () {
         expirationTime: {
           required: false,
           readOnly: true,
-          serializedName: 'expirationTime',
+          serializedName: 'msExpirationTime',
           type: {
             name: 'Number'
           }
@@ -148,6 +150,14 @@ FileStatusProperties.prototype.mapper = function () {
             name: 'Enum',
             allowedValues: [ 'FILE', 'DIRECTORY' ]
           }
+        },
+        aclBit: {
+          required: false,
+          readOnly: true,
+          serializedName: 'aclBit',
+          type: {
+            name: 'Boolean'
+          }
         }
       }
     }
diff --git a/lib/services/dataLake.Store/lib/filesystem/models/fileStatusResult.js b/lib/services/dataLake.Store/lib/filesystem/models/fileStatusResult.js
index 6b966d174b..34c62cd953 100644
--- a/lib/services/dataLake.Store/lib/filesystem/models/fileStatusResult.js
+++ b/lib/services/dataLake.Store/lib/filesystem/models/fileStatusResult.js
@@ -50,6 +50,9 @@ var models = require('./index');
  * @member {string} [fileStatus.type] the type of the path object. Possible
  * values include: 'FILE', 'DIRECTORY'
  *
+ * @member {boolean} [fileStatus.aclBit] flag to indicate if extended acls are
+ * enabled
+ *
  */
 function FileStatusResult() {
 }
diff --git a/lib/services/dataLake.Store/lib/filesystem/models/index.d.ts b/lib/services/dataLake.Store/lib/filesystem/models/index.d.ts
index 7e0f9a0b24..d9c3194152 100644
--- a/lib/services/dataLake.Store/lib/filesystem/models/index.d.ts
+++ b/lib/services/dataLake.Store/lib/filesystem/models/index.d.ts
@@ -157,6 +157,8 @@ export interface ContentSummaryResult {
  * @member {string} [type] the type of the path object. Possible values
  * include: 'FILE', 'DIRECTORY'
  *
+ * @member {boolean} [aclBit] flag to indicate if extended acls are enabled
+ *
  */
 export interface FileStatusProperties {
   accessTime?: number;
@@ -170,6 +172,7 @@ export interface FileStatusProperties {
   pathSuffix?: string;
   permission?: string;
   type?: string;
+  aclBit?: boolean;
 }
 
 /**
@@ -241,6 +244,9 @@ export interface FileStatusesResult {
  * @member {string} [fileStatus.type] the type of the path object. Possible
  * values include: 'FILE', 'DIRECTORY'
  *
+ * @member {boolean} [fileStatus.aclBit] flag to indicate if extended acls are
+ * enabled
+ *
  */
 export interface FileStatusResult {
   fileStatus?: FileStatusProperties;
diff --git a/lib/services/dataLake.Store/lib/filesystem/operations/fileSystem.js b/lib/services/dataLake.Store/lib/filesystem/operations/fileSystem.js
index af0ed531fa..339184f76f 100644
--- a/lib/services/dataLake.Store/lib/filesystem/operations/fileSystem.js
+++ b/lib/services/dataLake.Store/lib/filesystem/operations/fileSystem.js
@@ -30,12 +30,14 @@ function FileSystem(client) {
 }
 
 /**
- * Appends to the specified file. This method supports multiple concurrent
- * appends to the file. NOTE: ConcurrentAppend and normal (serial) Append
- * CANNOT be used interchangeably; once a file has been appended to using
- * either of these append options, it can only be appended to using that append
- * option. ConcurrentAppend DOES NOT guarantee order and can result in
- * duplicated data landing in the target file.
+ * Appends to the specified file, optionally first creating the file if it does
+ * not yet exist. This method supports multiple concurrent appends to the file.
+ * NOTE: The target must not contain data added by Create or normal (serial)
+ * Append. ConcurrentAppend and Append cannot be used interchangeably; once a
+ * target file has been modified using either of these append options, the
+ * other append option cannot be used on the target file. ConcurrentAppend does
+ * not guarantee order and can result in duplicated data landing in the target
+ * file.
  *
  * @param {string} accountName The Azure Data Lake Store account to execute
  * filesystem operations on.
@@ -377,10 +379,10 @@ FileSystem.prototype.setFileExpiry = function (accountName, filePath, expiryOpti
  * @param {string} path The Data Lake Store path (starting with '/') of the
  * file or directory for which to check access.
  *
- * @param {object} [options] Optional Parameters.
+ * @param {string} fsaction File system operation read/write/execute in string
+ * form, matching regex pattern '[rwx-]{3}'
  *
- * @param {string} [options.fsaction] File system operation read/write/execute
- * in string form, matching regex pattern '[rwx-]{3}'
+ * @param {object} [options] Optional Parameters.
  *
  * @param {object} [options.customHeaders] Headers that will be added to the
  * request
@@ -397,7 +399,7 @@ FileSystem.prototype.setFileExpiry = function (accountName, filePath, expiryOpti
  *
  *                      {stream} [response] - The HTTP Response stream if an error did not occur.
  */
-FileSystem.prototype.checkAccess = function (accountName, path, options, callback) {
+FileSystem.prototype.checkAccess = function (accountName, path, fsaction, options, callback) {
   var client = this.client;
   if(!callback && typeof options === 'function') {
     callback = options;
@@ -406,7 +408,6 @@ FileSystem.prototype.checkAccess = function (accountName, path, options, callbac
   if (!callback) {
     throw new Error('callback cannot be null.');
   }
-  var fsaction = (options && options.fsaction !== undefined) ? options.fsaction : undefined;
   var op = 'CHECKACCESS';
   // Validate
   try {
@@ -419,8 +420,8 @@ FileSystem.prototype.checkAccess = function (accountName, path, options, callbac
     if (path === null || path === undefined || typeof path.valueOf() !== 'string') {
       throw new Error('path cannot be null or undefined and it must be of type string.');
     }
-    if (fsaction !== null && fsaction !== undefined && typeof fsaction.valueOf() !== 'string') {
-      throw new Error('fsaction must be of type string.');
+    if (fsaction === null || fsaction === undefined || typeof fsaction.valueOf() !== 'string') {
+      throw new Error('fsaction cannot be null or undefined and it must be of type string.');
     }
     if (this.client.apiVersion === null || this.client.apiVersion === undefined || typeof this.client.apiVersion.valueOf() !== 'string') {
       throw new Error('this.client.apiVersion cannot be null or undefined and it must be of type string.');
@@ -439,9 +440,7 @@ FileSystem.prototype.checkAccess = function (accountName, path, options, callbac
   requestUrl = requestUrl.replace('{adlsFileSystemDnsSuffix}', this.client.adlsFileSystemDnsSuffix);
   requestUrl = requestUrl.replace('{path}', encodeURIComponent(path));
   var queryParameters = [];
-  if (fsaction !== null && fsaction !== undefined) {
-    queryParameters.push('fsaction=' + encodeURIComponent(fsaction));
-  }
+  queryParameters.push('fsaction=' + encodeURIComponent(fsaction));
   queryParameters.push('op=' + encodeURIComponent(op));
   queryParameters.push('api-version=' + encodeURIComponent(this.client.apiVersion));
   if (queryParameters.length > 0) {
@@ -520,6 +519,9 @@ FileSystem.prototype.checkAccess = function (accountName, path, options, callbac
  *
  * @param {object} [options] Optional Parameters.
  *
+ * @param {number} [options.permission] Optional octal permission with which
+ * the directory should be created.
+ *
  * @param {object} [options.customHeaders] Headers that will be added to the
  * request
  *
@@ -545,6 +547,7 @@ FileSystem.prototype.mkdirs = function (accountName, path, options, callback) {
   if (!callback) {
     throw new Error('callback cannot be null.');
   }
+  var permission = (options && options.permission !== undefined) ? options.permission : undefined;
   var op = 'MKDIRS';
   // Validate
   try {
@@ -557,6 +560,9 @@ FileSystem.prototype.mkdirs = function (accountName, path, options, callback) {
     if (path === null || path === undefined || typeof path.valueOf() !== 'string') {
       throw new Error('path cannot be null or undefined and it must be of type string.');
     }
+    if (permission !== null && permission !== undefined && typeof permission !== 'number') {
+      throw new Error('permission must be of type number.');
+    }
     if (this.client.apiVersion === null || this.client.apiVersion === undefined || typeof this.client.apiVersion.valueOf() !== 'string') {
       throw new Error('this.client.apiVersion cannot be null or undefined and it must be of type string.');
     }
@@ -574,6 +580,9 @@ FileSystem.prototype.mkdirs = function (accountName, path, options, callback) {
   requestUrl = requestUrl.replace('{adlsFileSystemDnsSuffix}', this.client.adlsFileSystemDnsSuffix);
   requestUrl = requestUrl.replace('{path}', encodeURIComponent(path));
   var queryParameters = [];
+  if (permission !== null && permission !== undefined) {
+    queryParameters.push('permission=' + encodeURIComponent(permission.toString()));
+  }
   queryParameters.push('op=' + encodeURIComponent(op));
   queryParameters.push('api-version=' + encodeURIComponent(this.client.apiVersion));
   if (queryParameters.length > 0) {
@@ -668,7 +677,7 @@ FileSystem.prototype.mkdirs = function (accountName, path, options, callback) {
  * @param {string} destinationPath The Data Lake Store path (starting with '/')
  * of the destination file resulting from the concatenation.
  *
- * @param {array} sources A list of comma seperated Data Lake Store paths
+ * @param {array} sources A list of comma separated Data Lake Store paths
  * (starting with '/') of the files to concatenate, in the order in which they
  * should be concatenated.
  *
@@ -816,8 +825,8 @@ FileSystem.prototype.concat = function (accountName, destinationPath, sources, o
  * with '/') of the destination file resulting from the concatenation.
  *
  * @param {object} streamContents A list of Data Lake Store paths (starting
- * with '/') of the source files. Must be in the format: sources=<comma
- * separated list>
+ * with '/') of the source files. Must be a comma-separated path list in the
+ * format: sources=/file/path/1.txt,/file/path/2.txt,/file/path/lastfile.csv
  *
  * @param {object} [options] Optional Parameters.
  *
@@ -986,6 +995,10 @@ FileSystem.prototype.msConcat = function (accountName, msConcatDestinationPath,
  * 'a','b','d' and listBefore='d' will return 'a','b', and a listBefore='c'
  * will also return 'a','b'. Optional.
  *
+ * @param {boolean} [options.tooId] An optional switch to return friendly names
+ * in place of owner and group. tooid=false returns friendly names instead of
+ * the AAD Object ID. Default value is true, returning AAD object IDs.
+ *
  * @param {object} [options.customHeaders] Headers that will be added to the
  * request
  *
@@ -1014,7 +1027,8 @@ FileSystem.prototype.listFileStatus = function (accountName, listFilePath, optio
   var listSize = (options && options.listSize !== undefined) ? options.listSize : undefined;
   var listAfter = (options && options.listAfter !== undefined) ? options.listAfter : undefined;
   var listBefore = (options && options.listBefore !== undefined) ? options.listBefore : undefined;
-  var op = 'MSLISTSTATUS';
+  var tooId = (options && options.tooId !== undefined) ? options.tooId : undefined;
+  var op = 'LISTSTATUS';
   // Validate
   try {
     if (accountName === null || accountName === undefined || typeof accountName.valueOf() !== 'string') {
@@ -1035,6 +1049,9 @@ FileSystem.prototype.listFileStatus = function (accountName, listFilePath, optio
     if (listBefore !== null && listBefore !== undefined && typeof listBefore.valueOf() !== 'string') {
       throw new Error('listBefore must be of type string.');
     }
+    if (tooId !== null && tooId !== undefined && typeof tooId !== 'boolean') {
+      throw new Error('tooId must be of type boolean.');
+    }
     if (this.client.apiVersion === null || this.client.apiVersion === undefined || typeof this.client.apiVersion.valueOf() !== 'string') {
       throw new Error('this.client.apiVersion cannot be null or undefined and it must be of type string.');
     }
@@ -1061,6 +1078,9 @@ FileSystem.prototype.listFileStatus = function (accountName, listFilePath, optio
   if (listBefore !== null && listBefore !== undefined) {
     queryParameters.push('listBefore=' + encodeURIComponent(listBefore));
   }
+  if (tooId !== null && tooId !== undefined) {
+    queryParameters.push('tooId=' + encodeURIComponent(tooId.toString()));
+  }
   queryParameters.push('op=' + encodeURIComponent(op));
   queryParameters.push('api-version=' + encodeURIComponent(this.client.apiVersion));
   if (queryParameters.length > 0) {
@@ -1205,7 +1225,7 @@ FileSystem.prototype.getContentSummary = function (accountName, getContentSummar
 
   // Construct URL
   var baseUrl = this.client.baseUri;
-  var requestUrl = baseUrl + (baseUrl.endsWith('/') ? '' : '/') + 'webhdfs/va/{getContentSummaryFilePath}';
+  var requestUrl = baseUrl + (baseUrl.endsWith('/') ? '' : '/') + 'webhdfs/v1/{getContentSummaryFilePath}';
   requestUrl = requestUrl.replace('{accountName}', accountName);
   requestUrl = requestUrl.replace('{adlsFileSystemDnsSuffix}', this.client.adlsFileSystemDnsSuffix);
   requestUrl = requestUrl.replace('{getContentSummaryFilePath}', encodeURIComponent(getContentSummaryFilePath));
@@ -1305,6 +1325,10 @@ FileSystem.prototype.getContentSummary = function (accountName, getContentSummar
  *
  * @param {object} [options] Optional Parameters.
  *
+ * @param {boolean} [options.tooId] An optional switch to return friendly names
+ * in place of owner and group. tooid=false returns friendly names instead of
+ * the AAD Object ID. Default value is true, returning AAD object IDs.
+ *
  * @param {object} [options.customHeaders] Headers that will be added to the
  * request
  *
@@ -1330,7 +1354,8 @@ FileSystem.prototype.getFileStatus = function (accountName, getFilePath, options
   if (!callback) {
     throw new Error('callback cannot be null.');
   }
-  var op = 'MSGETFILESTATUS';
+  var tooId = (options && options.tooId !== undefined) ? options.tooId : undefined;
+  var op = 'GETFILESTATUS';
   // Validate
   try {
     if (accountName === null || accountName === undefined || typeof accountName.valueOf() !== 'string') {
@@ -1342,6 +1367,9 @@ FileSystem.prototype.getFileStatus = function (accountName, getFilePath, options
     if (getFilePath === null || getFilePath === undefined || typeof getFilePath.valueOf() !== 'string') {
       throw new Error('getFilePath cannot be null or undefined and it must be of type string.');
     }
+    if (tooId !== null && tooId !== undefined && typeof tooId !== 'boolean') {
+      throw new Error('tooId must be of type boolean.');
+    }
     if (this.client.apiVersion === null || this.client.apiVersion === undefined || typeof this.client.apiVersion.valueOf() !== 'string') {
       throw new Error('this.client.apiVersion cannot be null or undefined and it must be of type string.');
     }
@@ -1359,6 +1387,9 @@ FileSystem.prototype.getFileStatus = function (accountName, getFilePath, options
   requestUrl = requestUrl.replace('{adlsFileSystemDnsSuffix}', this.client.adlsFileSystemDnsSuffix);
   requestUrl = requestUrl.replace('{getFilePath}', encodeURIComponent(getFilePath));
   var queryParameters = [];
+  if (tooId !== null && tooId !== undefined) {
+    queryParameters.push('tooId=' + encodeURIComponent(tooId.toString()));
+  }
   queryParameters.push('op=' + encodeURIComponent(op));
   queryParameters.push('api-version=' + encodeURIComponent(this.client.apiVersion));
   if (queryParameters.length > 0) {
@@ -1444,12 +1475,11 @@ FileSystem.prototype.getFileStatus = function (accountName, getFilePath, options
 };
 
 /**
- * Appends to the specified file. This method does not support multiple
- * concurrent appends to the file. NOTE: Concurrent append and normal (serial)
- * append CANNOT be used interchangeably. Once a file has been appended to
- * using either append option, it can only be appended to using that append
- * option. Use the ConcurrentAppend option if you would like support for
- * concurrent appends.
+ * Used for serial appends to the specified file. NOTE: The target must not
+ * contain data added by ConcurrentAppend. ConcurrentAppend and Append cannot
+ * be used interchangeably; once a target file has been modified using either
+ * of these append options, the other append option cannot be used on the
+ * target file.
  *
  * @param {string} accountName The Azure Data Lake Store account to execute
  * filesystem operations on.
@@ -1472,6 +1502,15 @@ FileSystem.prototype.getFileStatus = function (accountName, getFilePath, options
  * refreshed upon append completion. Possible values include: 'DATA',
  * 'METADATA', 'CLOSE'
  *
+ * @param {uuid} [options.leaseId] Optional unique GUID per file to ensure
+ * single writer semantics, meaning that only clients that append to the file
+ * with the same leaseId will be allowed to do so.
+ *
+ * @param {uuid} [options.fileSessionId] Optional unique GUID per file
+ * indicating all the appends with the same fileSessionId are from the same
+ * client and same session. This will give a performance benefit when syncFlag
+ * is DATA or METADATA.
+ *
  * @param {object} [options.customHeaders] Headers that will be added to the
  * request
  *
@@ -1498,6 +1537,8 @@ FileSystem.prototype.append = function (accountName, directFilePath, streamConte
   }
   var offset = (options && options.offset !== undefined) ? options.offset : undefined;
   var syncFlag = (options && options.syncFlag !== undefined) ? options.syncFlag : 'CLOSE';
+  var leaseId = (options && options.leaseId !== undefined) ? options.leaseId : undefined;
+  var fileSessionId = (options && options.fileSessionId !== undefined) ? options.fileSessionId : undefined;
   var op = 'APPEND';
   var appendParameter = 'true';
   // Validate
@@ -1523,6 +1564,12 @@ FileSystem.prototype.append = function (accountName, directFilePath, streamConte
         throw new Error(syncFlag + ' is not a valid value. The valid values are: ' + allowedValues);
       }
     }
+    if (leaseId !== null && leaseId !== undefined && !(typeof leaseId.valueOf() === 'string' && msRest.isValidUuid(leaseId))) {
+      throw new Error('leaseId must be of type string and must be a valid uuid.');
+    }
+    if (fileSessionId !== null && fileSessionId !== undefined && !(typeof fileSessionId.valueOf() === 'string' && msRest.isValidUuid(fileSessionId))) {
+      throw new Error('fileSessionId must be of type string and must be a valid uuid.');
+    }
     if (this.client.apiVersion === null || this.client.apiVersion === undefined || typeof this.client.apiVersion.valueOf() !== 'string') {
       throw new Error('this.client.apiVersion cannot be null or undefined and it must be of type string.');
     }
@@ -1546,6 +1593,12 @@ FileSystem.prototype.append = function (accountName, directFilePath, streamConte
   if (syncFlag !== null && syncFlag !== undefined) {
     queryParameters.push('syncFlag=' + encodeURIComponent(syncFlag));
   }
+  if (leaseId !== null && leaseId !== undefined) {
+    queryParameters.push('leaseId=' + encodeURIComponent(leaseId.toString()));
+  }
+  if (fileSessionId !== null && fileSessionId !== undefined) {
+    queryParameters.push('fileSessionId=' + encodeURIComponent(fileSessionId.toString()));
+  }
   queryParameters.push('op=' + encodeURIComponent(op));
   queryParameters.push('append=' + encodeURIComponent(appendParameter));
   queryParameters.push('api-version=' + encodeURIComponent(this.client.apiVersion));
@@ -1617,7 +1670,8 @@ FileSystem.prototype.append = function (accountName, directFilePath, streamConte
 };
 
 /**
- * Creates a file with optionally specified content.
+ * Creates a file with optionally specified content. NOTE: If content is
+ * provided, the resulting file cannot be modified using ConcurrentAppend.
  *
  * @param {string} accountName The Azure Data Lake Store account to execute
  * filesystem operations on.
@@ -1638,9 +1692,17 @@ FileSystem.prototype.append = function (accountName, directFilePath, streamConte
  * completion of the append. DATA indicates more data is coming so no sync
  * takes place, METADATA indicates a sync should be done to refresh metadata of
  * the file only. CLOSE indicates that both the stream and metadata should be
- * refreshed upon append completion. Possible values include: 'DATA',
+ * refreshed upon create completion. Possible values include: 'DATA',
  * 'METADATA', 'CLOSE'
  *
+ * @param {uuid} [options.leaseId] Optional unique GUID per file to ensure
+ * single writer semantics, meaning that only clients that append to the file
+ * with the same leaseId will be allowed to do so.
+ *
+ * @param {number} [options.permission] The octal representation of the unnamed
+ * user, mask and other permissions that should be set for the file when
+ * created. If not specified, it inherits these from the container.
+ *
  * @param {object} [options.customHeaders] Headers that will be added to the
  * request
  *
@@ -1668,6 +1730,8 @@ FileSystem.prototype.create = function (accountName, directFilePath, options, ca
   var streamContents = (options && options.streamContents !== undefined) ? options.streamContents : undefined;
   var overwrite = (options && options.overwrite !== undefined) ? options.overwrite : undefined;
   var syncFlag = (options && options.syncFlag !== undefined) ? options.syncFlag : 'CLOSE';
+  var leaseId = (options && options.leaseId !== undefined) ? options.leaseId : undefined;
+  var permission = (options && options.permission !== undefined) ? options.permission : undefined;
   var op = 'CREATE';
   var write = 'true';
   // Validate
@@ -1693,6 +1757,12 @@ FileSystem.prototype.create = function (accountName, directFilePath, options, ca
         throw new Error(syncFlag + ' is not a valid value. The valid values are: ' + allowedValues);
       }
     }
+    if (leaseId !== null && leaseId !== undefined && !(typeof leaseId.valueOf() === 'string' && msRest.isValidUuid(leaseId))) {
+      throw new Error('leaseId must be of type string and must be a valid uuid.');
+    }
+    if (permission !== null && permission !== undefined && typeof permission !== 'number') {
+      throw new Error('permission must be of type number.');
+    }
     if (this.client.apiVersion === null || this.client.apiVersion === undefined || typeof this.client.apiVersion.valueOf() !== 'string') {
       throw new Error('this.client.apiVersion cannot be null or undefined and it must be of type string.');
     }
@@ -1716,6 +1786,12 @@ FileSystem.prototype.create = function (accountName, directFilePath, options, ca
   if (syncFlag !== null && syncFlag !== undefined) {
     queryParameters.push('syncFlag=' + encodeURIComponent(syncFlag));
   }
+  if (leaseId !== null && leaseId !== undefined) {
+    queryParameters.push('leaseId=' + encodeURIComponent(leaseId.toString()));
+  }
+  if (permission !== null && permission !== undefined) {
+    queryParameters.push('permission=' + encodeURIComponent(permission.toString()));
+  }
   queryParameters.push('op=' + encodeURIComponent(op));
   queryParameters.push('write=' + encodeURIComponent(write));
   queryParameters.push('api-version=' + encodeURIComponent(this.client.apiVersion));
@@ -1802,6 +1878,10 @@ FileSystem.prototype.create = function (accountName, directFilePath, options, ca
  *
  * @param {number} [options.offset] The byte offset to start reading data from.
  *
+ * @param {uuid} [options.fileSessionId] Optional unique GUID per file
+ * indicating all the reads with the same fileSessionId are from the same
+ * client and same session. This will give a performance benefit.
+ *
  * @param {object} [options.customHeaders] Headers that will be added to the
  * request
  *
@@ -1828,6 +1908,7 @@ FileSystem.prototype.open = function (accountName, directFilePath, options, call
   }
   var length = (options && options.length !== undefined) ? options.length : undefined;
   var offset = (options && options.offset !== undefined) ? options.offset : undefined;
+  var fileSessionId = (options && options.fileSessionId !== undefined) ? options.fileSessionId : undefined;
   var op = 'OPEN';
   var read = 'true';
   // Validate
@@ -1847,6 +1928,9 @@ FileSystem.prototype.open = function (accountName, directFilePath, options, call
     if (offset !== null && offset !== undefined && typeof offset !== 'number') {
       throw new Error('offset must be of type number.');
     }
+    if (fileSessionId !== null && fileSessionId !== undefined && !(typeof fileSessionId.valueOf() === 'string' && msRest.isValidUuid(fileSessionId))) {
+      throw new Error('fileSessionId must be of type string and must be a valid uuid.');
+    }
     if (this.client.apiVersion === null || this.client.apiVersion === undefined || typeof this.client.apiVersion.valueOf() !== 'string') {
       throw new Error('this.client.apiVersion cannot be null or undefined and it must be of type string.');
     }
@@ -1870,6 +1954,9 @@ FileSystem.prototype.open = function (accountName, directFilePath, options, call
   if (offset !== null && offset !== undefined) {
     queryParameters.push('offset=' + encodeURIComponent(offset.toString()));
   }
+  if (fileSessionId !== null && fileSessionId !== undefined) {
+    queryParameters.push('fileSessionId=' + encodeURIComponent(fileSessionId.toString()));
+  }
   queryParameters.push('op=' + encodeURIComponent(op));
   queryParameters.push('read=' + encodeURIComponent(read));
   queryParameters.push('api-version=' + encodeURIComponent(this.client.apiVersion));
@@ -2627,6 +2714,11 @@ FileSystem.prototype.removeAcl = function (accountName, aclFilePath, options, ca
  *
  * @param {object} [options] Optional Parameters.
  *
+ * @param {boolean} [options.tooId] An optional switch to return friendly names
+ * in place of object ID for ACL entries. tooid=false returns friendly names
+ * instead of the AAD Object ID. Default value is true, returning AAD object
+ * IDs.
+ *
  * @param {object} [options.customHeaders] Headers that will be added to the
  * request
  *
@@ -2652,7 +2744,8 @@ FileSystem.prototype.getAclStatus = function (accountName, aclFilePath, options,
   if (!callback) {
     throw new Error('callback cannot be null.');
   }
-  var op = 'MSGETACLSTATUS';
+  var tooId = (options && options.tooId !== undefined) ? options.tooId : undefined;
+  var op = 'GETACLSTATUS';
   // Validate
   try {
     if (accountName === null || accountName === undefined || typeof accountName.valueOf() !== 'string') {
@@ -2664,6 +2757,9 @@ FileSystem.prototype.getAclStatus = function (accountName, aclFilePath, options,
     if (aclFilePath === null || aclFilePath === undefined || typeof aclFilePath.valueOf() !== 'string') {
       throw new Error('aclFilePath cannot be null or undefined and it must be of type string.');
     }
+    if (tooId !== null && tooId !== undefined && typeof tooId !== 'boolean') {
+      throw new Error('tooId must be of type boolean.');
+    }
     if (this.client.apiVersion === null || this.client.apiVersion === undefined || typeof this.client.apiVersion.valueOf() !== 'string') {
       throw new Error('this.client.apiVersion cannot be null or undefined and it must be of type string.');
     }
@@ -2681,6 +2777,9 @@ FileSystem.prototype.getAclStatus = function (accountName, aclFilePath, options,
   requestUrl = requestUrl.replace('{adlsFileSystemDnsSuffix}', this.client.adlsFileSystemDnsSuffix);
   requestUrl = requestUrl.replace('{aclFilePath}', encodeURIComponent(aclFilePath));
   var queryParameters = [];
+  if (tooId !== null && tooId !== undefined) {
+    queryParameters.push('tooId=' + encodeURIComponent(tooId.toString()));
+  }
   queryParameters.push('op=' + encodeURIComponent(op));
   queryParameters.push('api-version=' + encodeURIComponent(this.client.apiVersion));
   if (queryParameters.length > 0) {
diff --git a/lib/services/dataLake.Store/lib/filesystem/operations/index.d.ts b/lib/services/dataLake.Store/lib/filesystem/operations/index.d.ts
index 6fd5db6470..e71140267f 100644
--- a/lib/services/dataLake.Store/lib/filesystem/operations/index.d.ts
+++ b/lib/services/dataLake.Store/lib/filesystem/operations/index.d.ts
@@ -22,12 +22,14 @@ import * as models from '../models';
 export interface FileSystem {
 
     /**
-     * Appends to the specified file. This method supports multiple concurrent
-     * appends to the file. NOTE: ConcurrentAppend and normal (serial) Append
-     * CANNOT be used interchangeably; once a file has been appended to using
-     * either of these append options, it can only be appended to using that append
-     * option. ConcurrentAppend DOES NOT guarantee order and can result in
-     * duplicated data landing in the target file.
+     * Appends to the specified file, optionally first creating the file if it does
+     * not yet exist. This method supports multiple concurrent appends to the file.
+     * NOTE: The target must not contain data added by Create or normal (serial)
+     * Append. ConcurrentAppend and Append cannot be used interchangeably; once a
+     * target file has been modified using either of these append options, the
+     * other append option cannot be used on the target file. ConcurrentAppend does
+     * not guarantee order and can result in duplicated data landing in the target
+     * file.
      *
      * @param {string} accountName The Azure Data Lake Store account to execute
      * filesystem operations on.
@@ -102,10 +104,10 @@ export interface FileSystem {
      * @param {string} path The Data Lake Store path (starting with '/') of the
      * file or directory for which to check access.
      *
-     * @param {object} [options] Optional Parameters.
+     * @param {string} fsaction File system operation read/write/execute in string
+     * form, matching regex pattern '[rwx-]{3}'
      *
-     * @param {string} [options.fsaction] File system operation read/write/execute
-     * in string form, matching regex pattern '[rwx-]{3}'
+     * @param {object} [options] Optional Parameters.
      *
      * @param {object} [options.customHeaders] Headers that will be added to the
      * request
@@ -113,8 +115,8 @@ export interface FileSystem {
      * @param {ServiceCallback} [callback] callback function; see ServiceCallback
      * doc in ms-rest index.d.ts for details
      */
-    checkAccess(accountName: string, path: string, options: { fsaction? : string, customHeaders? : { [headerName: string]: string; } }, callback: ServiceCallback<void>): void;
-    checkAccess(accountName: string, path: string, callback: ServiceCallback<void>): void;
+    checkAccess(accountName: string, path: string, fsaction: string, options: { customHeaders? : { [headerName: string]: string; } }, callback: ServiceCallback<void>): void;
+    checkAccess(accountName: string, path: string, fsaction: string, callback: ServiceCallback<void>): void;
 
     /**
      * Creates a directory.
@@ -127,13 +129,16 @@ export interface FileSystem {
      *
      * @param {object} [options] Optional Parameters.
      *
+     * @param {number} [options.permission] Optional octal permission with which
+     * the directory should be created.
+     *
      * @param {object} [options.customHeaders] Headers that will be added to the
      * request
      *
      * @param {ServiceCallback} [callback] callback function; see ServiceCallback
      * doc in ms-rest index.d.ts for details
      */
-    mkdirs(accountName: string, path: string, options: { customHeaders? : { [headerName: string]: string; } }, callback: ServiceCallback<models.FileOperationResult>): void;
+    mkdirs(accountName: string, path: string, options: { permission? : number, customHeaders? : { [headerName: string]: string; } }, callback: ServiceCallback<models.FileOperationResult>): void;
     mkdirs(accountName: string, path: string, callback: ServiceCallback<models.FileOperationResult>): void;
 
     /**
@@ -146,7 +151,7 @@ export interface FileSystem {
      * @param {string} destinationPath The Data Lake Store path (starting with '/')
      * of the destination file resulting from the concatenation.
      *
-     * @param {array} sources A list of comma seperated Data Lake Store paths
+     * @param {array} sources A list of comma separated Data Lake Store paths
      * (starting with '/') of the files to concatenate, in the order in which they
      * should be concatenated.
      *
@@ -174,8 +179,8 @@ export interface FileSystem {
      * with '/') of the destination file resulting from the concatenation.
      *
      * @param {object} streamContents A list of Data Lake Store paths (starting
-     * with '/') of the source files. Must be in the format: sources=<comma
-     * separated list>
+     * with '/') of the source files. Must be a comma-separated path list in the
+     * format: sources=/file/path/1.txt,/file/path/2.txt,/file/path/lastfile.csv
      *
      * @param {object} [options] Optional Parameters.
      *
@@ -221,13 +226,17 @@ export interface FileSystem {
      * 'a','b','d' and listBefore='d' will return 'a','b', and a listBefore='c'
      * will also return 'a','b'. Optional.
      *
+     * @param {boolean} [options.tooId] An optional switch to return friendly names
+     * in place of owner and group. tooid=false returns friendly names instead of
+     * the AAD Object ID. Default value is true, returning AAD object IDs.
+     *
      * @param {object} [options.customHeaders] Headers that will be added to the
      * request
      *
      * @param {ServiceCallback} [callback] callback function; see ServiceCallback
      * doc in ms-rest index.d.ts for details
      */
-    listFileStatus(accountName: string, listFilePath: string, options: { listSize? : number, listAfter? : string, listBefore? : string, customHeaders? : { [headerName: string]: string; } }, callback: ServiceCallback<models.FileStatusesResult>): void;
+    listFileStatus(accountName: string, listFilePath: string, options: { listSize? : number, listAfter? : string, listBefore? : string, tooId? : boolean, customHeaders? : { [headerName: string]: string; } }, callback: ServiceCallback<models.FileStatusesResult>): void;
     listFileStatus(accountName: string, listFilePath: string, callback: ServiceCallback<models.FileStatusesResult>): void;
 
     /**
@@ -261,22 +270,25 @@ export interface FileSystem {
      *
      * @param {object} [options] Optional Parameters.
      *
+     * @param {boolean} [options.tooId] An optional switch to return friendly names
+     * in place of owner and group. tooid=false returns friendly names instead of
+     * the AAD Object ID. Default value is true, returning AAD object IDs.
+     *
      * @param {object} [options.customHeaders] Headers that will be added to the
      * request
      *
      * @param {ServiceCallback} [callback] callback function; see ServiceCallback
      * doc in ms-rest index.d.ts for details
      */
-    getFileStatus(accountName: string, getFilePath: string, options: { customHeaders? : { [headerName: string]: string; } }, callback: ServiceCallback<models.FileStatusResult>): void;
+    getFileStatus(accountName: string, getFilePath: string, options: { tooId? : boolean, customHeaders? : { [headerName: string]: string; } }, callback: ServiceCallback<models.FileStatusResult>): void;
     getFileStatus(accountName: string, getFilePath: string, callback: ServiceCallback<models.FileStatusResult>): void;
 
     /**
-     * Appends to the specified file. This method does not support multiple
-     * concurrent appends to the file. NOTE: Concurrent append and normal (serial)
-     * append CANNOT be used interchangeably. Once a file has been appended to
-     * using either append option, it can only be appended to using that append
-     * option. Use the ConcurrentAppend option if you would like support for
-     * concurrent appends.
+     * Used for serial appends to the specified file. NOTE: The target must not
+     * contain data added by ConcurrentAppend. ConcurrentAppend and Append cannot
+     * be used interchangeably; once a target file has been modified using either
+     * of these append options, the other append option cannot be used on the
+     * target file.
      *
      * @param {string} accountName The Azure Data Lake Store account to execute
      * filesystem operations on.
@@ -299,17 +311,27 @@ export interface FileSystem {
      * refreshed upon append completion. Possible values include: 'DATA',
      * 'METADATA', 'CLOSE'
      *
+     * @param {uuid} [options.leaseId] Optional unique GUID per file to ensure
+     * single writer semantics, meaning that only clients that append to the file
+     * with the same leaseId will be allowed to do so.
+     *
+     * @param {uuid} [options.fileSessionId] Optional unique GUID per file
+     * indicating all the appends with the same fileSessionId are from the same
+     * client and same session. This will give a performance benefit when syncFlag
+     * is DATA or METADATA.
+     *
      * @param {object} [options.customHeaders] Headers that will be added to the
      * request
      *
      * @param {ServiceCallback} [callback] callback function; see ServiceCallback
      * doc in ms-rest index.d.ts for details
      */
-    append(accountName: string, directFilePath: string, streamContents: stream.Readable, options: { offset? : number, syncFlag? : string, customHeaders? : { [headerName: string]: string; } }, callback: ServiceCallback<void>): void;
+    append(accountName: string, directFilePath: string, streamContents: stream.Readable, options: { offset? : number, syncFlag? : string, leaseId? : string, fileSessionId? : string, customHeaders? : { [headerName: string]: string; } }, callback: ServiceCallback<void>): void;
     append(accountName: string, directFilePath: string, streamContents: stream.Readable, callback: ServiceCallback<void>): void;
 
     /**
-     * Creates a file with optionally specified content.
+     * Creates a file with optionally specified content. NOTE: If content is
+     * provided, the resulting file cannot be modified using ConcurrentAppend.
      *
      * @param {string} accountName The Azure Data Lake Store account to execute
      * filesystem operations on.
@@ -330,16 +352,24 @@ export interface FileSystem {
      * completion of the append. DATA indicates more data is coming so no sync
      * takes place, METADATA indicates a sync should be done to refresh metadata of
      * the file only. CLOSE indicates that both the stream and metadata should be
-     * refreshed upon append completion. Possible values include: 'DATA',
+     * refreshed upon create completion. Possible values include: 'DATA',
      * 'METADATA', 'CLOSE'
      *
+     * @param {uuid} [options.leaseId] Optional unique GUID per file to ensure
+     * single writer semantics, meaning that only clients that append to the file
+     * with the same leaseId will be allowed to do so.
+     *
+     * @param {number} [options.permission] The octal representation of the unnamed
+     * user, mask and other permissions that should be set for the file when
+     * created. If not specified, it inherits these from the container.
+     *
      * @param {object} [options.customHeaders] Headers that will be added to the
      * request
      *
      * @param {ServiceCallback} [callback] callback function; see ServiceCallback
      * doc in ms-rest index.d.ts for details
      */
-    create(accountName: string, directFilePath: string, options: { streamContents? : stream.Readable, overwrite? : boolean, syncFlag? : string, customHeaders? : { [headerName: string]: string; } }, callback: ServiceCallback<void>): void;
+    create(accountName: string, directFilePath: string, options: { streamContents? : stream.Readable, overwrite? : boolean, syncFlag? : string, leaseId? : string, permission? : number, customHeaders? : { [headerName: string]: string; } }, callback: ServiceCallback<void>): void;
     create(accountName: string, directFilePath: string, callback: ServiceCallback<void>): void;
 
     /**
@@ -358,13 +388,17 @@ export interface FileSystem {
      *
      * @param {number} [options.offset] The byte offset to start reading data from.
      *
+     * @param {uuid} [options.fileSessionId] Optional unique GUID per file
+     * indicating all the reads with the same fileSessionId are from the same
+     * client and same session. This will give a performance benefit.
+     *
      * @param {object} [options.customHeaders] Headers that will be added to the
      * request
      *
      * @param {ServiceCallback} [callback] callback function; see ServiceCallback
      * doc in ms-rest index.d.ts for details
      */
-    open(accountName: string, directFilePath: string, options: { length? : number, offset? : number, customHeaders? : { [headerName: string]: string; } }, callback: ServiceCallback<stream.Readable>): void;
+    open(accountName: string, directFilePath: string, options: { length? : number, offset? : number, fileSessionId? : string, customHeaders? : { [headerName: string]: string; } }, callback: ServiceCallback<stream.Readable>): void;
     open(accountName: string, directFilePath: string, callback: ServiceCallback<stream.Readable>): void;
 
     /**
@@ -489,13 +523,18 @@ export interface FileSystem {
      *
      * @param {object} [options] Optional Parameters.
      *
+     * @param {boolean} [options.tooId] An optional switch to return friendly names
+     * in place of object ID for ACL entries. tooid=false returns friendly names
+     * instead of the AAD Object ID. Default value is true, returning AAD object
+     * IDs.
+     *
      * @param {object} [options.customHeaders] Headers that will be added to the
      * request
      *
      * @param {ServiceCallback} [callback] callback function; see ServiceCallback
      * doc in ms-rest index.d.ts for details
      */
-    getAclStatus(accountName: string, aclFilePath: string, options: { customHeaders? : { [headerName: string]: string; } }, callback: ServiceCallback<models.AclStatusResult>): void;
+    getAclStatus(accountName: string, aclFilePath: string, options: { tooId? : boolean, customHeaders? : { [headerName: string]: string; } }, callback: ServiceCallback<models.AclStatusResult>): void;
     getAclStatus(accountName: string, aclFilePath: string, callback: ServiceCallback<models.AclStatusResult>): void;
 
     /**
diff --git a/lib/services/dataLake.Store/package.json b/lib/services/dataLake.Store/package.json
index 1d6f2ba9dc..caa35f1cd9 100644
--- a/lib/services/dataLake.Store/package.json
+++ b/lib/services/dataLake.Store/package.json
@@ -17,8 +17,8 @@
   "main": "./lib/dataLakeStore.js",
   "license": "MIT",
   "dependencies": {
-    "ms-rest": "^1.14.2",
-    "ms-rest-azure": "^1.14.2"
+    "ms-rest": "^1.15.7",
+    "ms-rest-azure": "^1.15.7"
   },
   "homepage": "http://github.com/Azure/azure-sdk-for-node",
   "repository": {
diff --git a/test/recordings/arm-datalake-store-tests/Data_Lake_Store_Clients_Account_and_Filesystem_Data_Lake_Store_Account_Delete_command_should_work.nock.js b/test/recordings/arm-datalake-store-tests/Data_Lake_Store_Clients_Account_and_Filesystem_Data_Lake_Store_Account_Delete_command_should_work.nock.js
index d166ad8cc6..5dc86cdd33 100644
--- a/test/recordings/arm-datalake-store-tests/Data_Lake_Store_Clients_Account_and_Filesystem_Data_Lake_Store_Account_Delete_command_should_work.nock.js
+++ b/test/recordings/arm-datalake-store-tests/Data_Lake_Store_Clients_Account_and_Filesystem_Data_Lake_Store_Account_Delete_command_should_work.nock.js
@@ -9,72 +9,72 @@ exports.setEnvironment = function() {
 exports.scopes = [[function (nock) { 
 var result = 
 nock('http://management.azure.com:443')
-  .delete('/subscriptions/53d9063d-87ae-4ea8-be90-3686c3b8669f/resourceGroups/xplattestadlsrg01/providers/Microsoft.DataLakeStore/accounts/xplattestadls3113?api-version=2016-11-01')
+  .delete('/subscriptions/53d9063d-87ae-4ea8-be90-3686c3b8669f/resourceGroups/xplattestadlsrg01/providers/Microsoft.DataLakeStore/accounts/xplattestadls7774?api-version=2016-11-01')
   .reply(200, "", { 'cache-control': 'no-cache',
   pragma: 'no-cache',
   'content-length': '0',
   expires: '-1',
-  'x-ms-request-id': '8dec5e2e-cb2d-488f-a000-c2535cf7fca0',
+  'x-ms-request-id': '5bbde766-09ff-49d9-b421-8b80d8c12e65',
   server: 'Microsoft-IIS/8.5',
   'x-aspnet-version': '4.0.30319',
   'x-powered-by': 'ASP.NET',
   'x-ms-ratelimit-remaining-subscription-writes': '1199',
-  'x-ms-correlation-request-id': 'cf676823-eb60-43d2-b113-64b4981e7451',
-  'x-ms-routing-request-id': 'WESTUS2:20161111T215551Z:cf676823-eb60-43d2-b113-64b4981e7451',
+  'x-ms-correlation-request-id': 'f3e55937-e534-4282-bf24-f0cf126fc5d0',
+  'x-ms-routing-request-id': 'CENTRALUS:20170316T234026Z:f3e55937-e534-4282-bf24-f0cf126fc5d0',
   'strict-transport-security': 'max-age=31536000; includeSubDomains',
-  date: 'Fri, 11 Nov 2016 21:55:50 GMT',
+  date: 'Thu, 16 Mar 2017 23:40:25 GMT',
   connection: 'close' });
  return result; },
 function (nock) { 
 var result = 
 nock('https://management.azure.com:443')
-  .delete('/subscriptions/53d9063d-87ae-4ea8-be90-3686c3b8669f/resourceGroups/xplattestadlsrg01/providers/Microsoft.DataLakeStore/accounts/xplattestadls3113?api-version=2016-11-01')
+  .delete('/subscriptions/53d9063d-87ae-4ea8-be90-3686c3b8669f/resourceGroups/xplattestadlsrg01/providers/Microsoft.DataLakeStore/accounts/xplattestadls7774?api-version=2016-11-01')
   .reply(200, "", { 'cache-control': 'no-cache',
   pragma: 'no-cache',
   'content-length': '0',
   expires: '-1',
-  'x-ms-request-id': '8dec5e2e-cb2d-488f-a000-c2535cf7fca0',
+  'x-ms-request-id': '5bbde766-09ff-49d9-b421-8b80d8c12e65',
   server: 'Microsoft-IIS/8.5',
   'x-aspnet-version': '4.0.30319',
   'x-powered-by': 'ASP.NET',
   'x-ms-ratelimit-remaining-subscription-writes': '1199',
-  'x-ms-correlation-request-id': 'cf676823-eb60-43d2-b113-64b4981e7451',
-  'x-ms-routing-request-id': 'WESTUS2:20161111T215551Z:cf676823-eb60-43d2-b113-64b4981e7451',
+  'x-ms-correlation-request-id': 'f3e55937-e534-4282-bf24-f0cf126fc5d0',
+  'x-ms-routing-request-id': 'CENTRALUS:20170316T234026Z:f3e55937-e534-4282-bf24-f0cf126fc5d0',
   'strict-transport-security': 'max-age=31536000; includeSubDomains',
-  date: 'Fri, 11 Nov 2016 21:55:50 GMT',
+  date: 'Thu, 16 Mar 2017 23:40:25 GMT',
   connection: 'close' });
  return result; },
 function (nock) { 
 var result = 
 nock('http://management.azure.com:443')
-  .get('/subscriptions/53d9063d-87ae-4ea8-be90-3686c3b8669f/resourceGroups/xplattestadlsrg01/providers/Microsoft.DataLakeStore/accounts/xplattestadls3113?api-version=2016-11-01')
-  .reply(404, "{\"error\":{\"code\":\"ResourceNotFound\",\"message\":\"The Resource 'Microsoft.DataLakeStore/accounts/xplattestadls3113' under resource group 'xplattestadlsrg01' was not found.\"}}", { 'cache-control': 'no-cache',
+  .get('/subscriptions/53d9063d-87ae-4ea8-be90-3686c3b8669f/resourceGroups/xplattestadlsrg01/providers/Microsoft.DataLakeStore/accounts/xplattestadls7774?api-version=2016-11-01')
+  .reply(404, "{\"error\":{\"code\":\"ResourceNotFound\",\"message\":\"The Resource 'Microsoft.DataLakeStore/accounts/xplattestadls7774' under resource group 'xplattestadlsrg01' was not found.\"}}", { 'cache-control': 'no-cache',
   pragma: 'no-cache',
   'content-type': 'application/json; charset=utf-8',
   expires: '-1',
   'x-ms-failure-cause': 'gateway',
-  'x-ms-request-id': '47e4978f-7cdc-4d6d-895d-3180bf6b8d05',
-  'x-ms-correlation-request-id': '47e4978f-7cdc-4d6d-895d-3180bf6b8d05',
-  'x-ms-routing-request-id': 'WESTUS2:20161111T215551Z:47e4978f-7cdc-4d6d-895d-3180bf6b8d05',
+  'x-ms-request-id': '96087976-5acd-404d-9b72-c14ae13736ea',
+  'x-ms-correlation-request-id': '96087976-5acd-404d-9b72-c14ae13736ea',
+  'x-ms-routing-request-id': 'CENTRALUS:20170316T234026Z:96087976-5acd-404d-9b72-c14ae13736ea',
   'strict-transport-security': 'max-age=31536000; includeSubDomains',
-  date: 'Fri, 11 Nov 2016 21:55:51 GMT',
+  date: 'Thu, 16 Mar 2017 23:40:25 GMT',
   connection: 'close',
   'content-length': '171' });
  return result; },
 function (nock) { 
 var result = 
 nock('https://management.azure.com:443')
-  .get('/subscriptions/53d9063d-87ae-4ea8-be90-3686c3b8669f/resourceGroups/xplattestadlsrg01/providers/Microsoft.DataLakeStore/accounts/xplattestadls3113?api-version=2016-11-01')
-  .reply(404, "{\"error\":{\"code\":\"ResourceNotFound\",\"message\":\"The Resource 'Microsoft.DataLakeStore/accounts/xplattestadls3113' under resource group 'xplattestadlsrg01' was not found.\"}}", { 'cache-control': 'no-cache',
+  .get('/subscriptions/53d9063d-87ae-4ea8-be90-3686c3b8669f/resourceGroups/xplattestadlsrg01/providers/Microsoft.DataLakeStore/accounts/xplattestadls7774?api-version=2016-11-01')
+  .reply(404, "{\"error\":{\"code\":\"ResourceNotFound\",\"message\":\"The Resource 'Microsoft.DataLakeStore/accounts/xplattestadls7774' under resource group 'xplattestadlsrg01' was not found.\"}}", { 'cache-control': 'no-cache',
   pragma: 'no-cache',
   'content-type': 'application/json; charset=utf-8',
   expires: '-1',
   'x-ms-failure-cause': 'gateway',
-  'x-ms-request-id': '47e4978f-7cdc-4d6d-895d-3180bf6b8d05',
-  'x-ms-correlation-request-id': '47e4978f-7cdc-4d6d-895d-3180bf6b8d05',
-  'x-ms-routing-request-id': 'WESTUS2:20161111T215551Z:47e4978f-7cdc-4d6d-895d-3180bf6b8d05',
+  'x-ms-request-id': '96087976-5acd-404d-9b72-c14ae13736ea',
+  'x-ms-correlation-request-id': '96087976-5acd-404d-9b72-c14ae13736ea',
+  'x-ms-routing-request-id': 'CENTRALUS:20170316T234026Z:96087976-5acd-404d-9b72-c14ae13736ea',
   'strict-transport-security': 'max-age=31536000; includeSubDomains',
-  date: 'Fri, 11 Nov 2016 21:55:51 GMT',
+  date: 'Thu, 16 Mar 2017 23:40:25 GMT',
   connection: 'close',
   'content-length': '171' });
  return result; }]];
\ No newline at end of file
diff --git a/test/recordings/arm-datalake-store-tests/Data_Lake_Store_Clients_Account_and_Filesystem_Data_Lake_Store_Account_create_account_with_same_name_should_fail.nock.js b/test/recordings/arm-datalake-store-tests/Data_Lake_Store_Clients_Account_and_Filesystem_Data_Lake_Store_Account_create_account_with_same_name_should_fail.nock.js
index 53da5d3a55..d99419e431 100644
--- a/test/recordings/arm-datalake-store-tests/Data_Lake_Store_Clients_Account_and_Filesystem_Data_Lake_Store_Account_create_account_with_same_name_should_fail.nock.js
+++ b/test/recordings/arm-datalake-store-tests/Data_Lake_Store_Clients_Account_and_Filesystem_Data_Lake_Store_Account_create_account_with_same_name_should_fail.nock.js
@@ -10,43 +10,43 @@ exports.scopes = [[function (nock) {
 var result = 
 nock('http://management.azure.com:443')
   .filteringRequestBody(function (path) { return '*';})
-.put('/subscriptions/53d9063d-87ae-4ea8-be90-3686c3b8669f/resourceGroups/xplattestadls9869/providers/Microsoft.DataLakeStore/accounts/xplattestadls3113?api-version=2016-11-01', '*')
+.put('/subscriptions/53d9063d-87ae-4ea8-be90-3686c3b8669f/resourceGroups/xplattestadls1164/providers/Microsoft.DataLakeStore/accounts/xplattestadls7774?api-version=2016-11-01', '*')
   .reply(409, "{\"error\":{\"code\":\"ResourceConflicted\",\"message\":\"Resource Name belongs to another resource.\"}}", { 'cache-control': 'no-cache',
   pragma: 'no-cache',
   'content-length': '94',
   'content-type': 'application/json',
   expires: '-1',
-  'x-ms-request-id': '3f560104-b1d6-4c77-a2ad-f660fce526d6',
+  'x-ms-request-id': 'fceac2d9-dadf-44a3-b728-6c27d9fc7faf',
   'x-content-type-options': 'nosniff',
   server: 'Microsoft-IIS/8.5',
   'x-aspnet-version': '4.0.30319',
   'x-powered-by': 'ASP.NET',
   'x-ms-ratelimit-remaining-subscription-writes': '1199',
-  'x-ms-correlation-request-id': '5d6a4a1e-191d-4497-ba30-fb7a0e56c93c',
-  'x-ms-routing-request-id': 'WESTUS2:20161111T215544Z:5d6a4a1e-191d-4497-ba30-fb7a0e56c93c',
+  'x-ms-correlation-request-id': 'c865cdaf-d56e-48f8-a8d6-aa494cfa82a7',
+  'x-ms-routing-request-id': 'CENTRALUS:20170316T234020Z:c865cdaf-d56e-48f8-a8d6-aa494cfa82a7',
   'strict-transport-security': 'max-age=31536000; includeSubDomains',
-  date: 'Fri, 11 Nov 2016 21:55:43 GMT',
+  date: 'Thu, 16 Mar 2017 23:40:19 GMT',
   connection: 'close' });
  return result; },
 function (nock) { 
 var result = 
 nock('https://management.azure.com:443')
   .filteringRequestBody(function (path) { return '*';})
-.put('/subscriptions/53d9063d-87ae-4ea8-be90-3686c3b8669f/resourceGroups/xplattestadls9869/providers/Microsoft.DataLakeStore/accounts/xplattestadls3113?api-version=2016-11-01', '*')
+.put('/subscriptions/53d9063d-87ae-4ea8-be90-3686c3b8669f/resourceGroups/xplattestadls1164/providers/Microsoft.DataLakeStore/accounts/xplattestadls7774?api-version=2016-11-01', '*')
   .reply(409, "{\"error\":{\"code\":\"ResourceConflicted\",\"message\":\"Resource Name belongs to another resource.\"}}", { 'cache-control': 'no-cache',
   pragma: 'no-cache',
   'content-length': '94',
   'content-type': 'application/json',
   expires: '-1',
-  'x-ms-request-id': '3f560104-b1d6-4c77-a2ad-f660fce526d6',
+  'x-ms-request-id': 'fceac2d9-dadf-44a3-b728-6c27d9fc7faf',
   'x-content-type-options': 'nosniff',
   server: 'Microsoft-IIS/8.5',
   'x-aspnet-version': '4.0.30319',
   'x-powered-by': 'ASP.NET',
   'x-ms-ratelimit-remaining-subscription-writes': '1199',
-  'x-ms-correlation-request-id': '5d6a4a1e-191d-4497-ba30-fb7a0e56c93c',
-  'x-ms-routing-request-id': 'WESTUS2:20161111T215544Z:5d6a4a1e-191d-4497-ba30-fb7a0e56c93c',
+  'x-ms-correlation-request-id': 'c865cdaf-d56e-48f8-a8d6-aa494cfa82a7',
+  'x-ms-routing-request-id': 'CENTRALUS:20170316T234020Z:c865cdaf-d56e-48f8-a8d6-aa494cfa82a7',
   'strict-transport-security': 'max-age=31536000; includeSubDomains',
-  date: 'Fri, 11 Nov 2016 21:55:43 GMT',
+  date: 'Thu, 16 Mar 2017 23:40:19 GMT',
   connection: 'close' });
  return result; }]];
\ No newline at end of file
diff --git a/test/recordings/arm-datalake-store-tests/Data_Lake_Store_Clients_Account_and_Filesystem_Data_Lake_Store_Account_create_command_should_work.nock.js b/test/recordings/arm-datalake-store-tests/Data_Lake_Store_Clients_Account_and_Filesystem_Data_Lake_Store_Account_create_command_should_work.nock.js
index 37ac938ff4..b047430f8c 100644
--- a/test/recordings/arm-datalake-store-tests/Data_Lake_Store_Clients_Account_and_Filesystem_Data_Lake_Store_Account_create_command_should_work.nock.js
+++ b/test/recordings/arm-datalake-store-tests/Data_Lake_Store_Clients_Account_and_Filesystem_Data_Lake_Store_Account_create_command_should_work.nock.js
@@ -10,133 +10,133 @@ exports.scopes = [[function (nock) {
 var result = 
 nock('http://management.azure.com:443')
   .filteringRequestBody(function (path) { return '*';})
-.put('/subscriptions/53d9063d-87ae-4ea8-be90-3686c3b8669f/resourceGroups/xplattestadlsrg01/providers/Microsoft.DataLakeStore/accounts/xplattestadls3113?api-version=2016-11-01', '*')
-  .reply(201, "{\"properties\":{\"provisioningState\":\"Creating\",\"state\":null,\"endpoint\":null,\"accountId\":\"b8dfd0da-1be0-4a39-b60d-6b60234a5d13\",\"creationTime\":null,\"lastModifiedTime\":null},\"location\":\"eastus2\",\"tags\":{\"testtag1\":\"testvalue1\",\"testtag2\":\"testvalue2\"},\"id\":\"/subscriptions/53d9063d-87ae-4ea8-be90-3686c3b8669f/resourceGroups/xplattestadlsrg01/providers/Microsoft.DataLakeStore/accounts/xplattestadls3113\",\"name\":\"xplattestadls3113\",\"type\":\"Microsoft.DataLakeStore/accounts\"}", { 'cache-control': 'no-cache',
+.put('/subscriptions/53d9063d-87ae-4ea8-be90-3686c3b8669f/resourceGroups/xplattestadlsrg01/providers/Microsoft.DataLakeStore/accounts/xplattestadls7774?api-version=2016-11-01', '*')
+  .reply(201, "{\"properties\":{\"provisioningState\":\"Creating\",\"state\":null,\"endpoint\":null,\"accountId\":\"7fa7b233-ca67-470a-8c9f-4c9597e2a826\",\"creationTime\":null,\"lastModifiedTime\":null},\"location\":\"eastus2\",\"tags\":{\"testtag1\":\"testvalue1\",\"testtag2\":\"testvalue2\"},\"id\":\"/subscriptions/53d9063d-87ae-4ea8-be90-3686c3b8669f/resourceGroups/xplattestadlsrg01/providers/Microsoft.DataLakeStore/accounts/xplattestadls7774\",\"name\":\"xplattestadls7774\",\"type\":\"Microsoft.DataLakeStore/accounts\"}", { 'cache-control': 'no-cache',
   pragma: 'no-cache',
   'content-length': '471',
   'content-type': 'application/json',
   expires: '-1',
-  location: 'https://management.azure.com/subscriptions/53d9063d-87ae-4ea8-be90-3686c3b8669f/resourcegroups/xplattestadlsrg01/providers/Microsoft.DataLakeStore/accounts/xplattestadls3113/operationresults/0?api-version=2016-11-01',
+  location: 'https://management.azure.com/subscriptions/53d9063d-87ae-4ea8-be90-3686c3b8669f/resourcegroups/xplattestadlsrg01/providers/Microsoft.DataLakeStore/accounts/xplattestadls7774/operationresults/0?api-version=2016-11-01',
   'retry-after': '10',
-  'azure-asyncoperation': 'https://management.azure.com/subscriptions/53d9063d-87ae-4ea8-be90-3686c3b8669f/providers/Microsoft.DataLakeStore/locations/eastus2/operationResults/b8dfd0da-1be0-4a39-b60d-6b60234a5d130?api-version=2016-11-01&expanded=true',
-  'x-ms-request-id': 'a0f08393-fadc-451b-b3b9-541ede55ed45',
+  'azure-asyncoperation': 'https://management.azure.com/subscriptions/53d9063d-87ae-4ea8-be90-3686c3b8669f/providers/Microsoft.DataLakeStore/locations/eastus2/operationResults/7fa7b233-ca67-470a-8c9f-4c9597e2a8260?api-version=2016-11-01&expanded=true',
+  'x-ms-request-id': '7c7b31ab-a34d-49a4-bc32-734c433340c3',
   'x-content-type-options': 'nosniff',
   server: 'Microsoft-IIS/8.5',
   'x-aspnet-version': '4.0.30319',
   'x-powered-by': 'ASP.NET',
-  'x-ms-ratelimit-remaining-subscription-writes': '1199',
-  'x-ms-correlation-request-id': 'ae4f8671-2820-4d8d-8204-0d71f4f5a66e',
-  'x-ms-routing-request-id': 'WESTUS2:20161111T215510Z:ae4f8671-2820-4d8d-8204-0d71f4f5a66e',
+  'x-ms-ratelimit-remaining-subscription-writes': '1197',
+  'x-ms-correlation-request-id': 'f8b26dd1-0141-4954-8b56-b41d4e92fb01',
+  'x-ms-routing-request-id': 'WESTUS2:20170316T233947Z:f8b26dd1-0141-4954-8b56-b41d4e92fb01',
   'strict-transport-security': 'max-age=31536000; includeSubDomains',
-  date: 'Fri, 11 Nov 2016 21:55:09 GMT',
+  date: 'Thu, 16 Mar 2017 23:39:46 GMT',
   connection: 'close' });
  return result; },
 function (nock) { 
 var result = 
 nock('https://management.azure.com:443')
   .filteringRequestBody(function (path) { return '*';})
-.put('/subscriptions/53d9063d-87ae-4ea8-be90-3686c3b8669f/resourceGroups/xplattestadlsrg01/providers/Microsoft.DataLakeStore/accounts/xplattestadls3113?api-version=2016-11-01', '*')
-  .reply(201, "{\"properties\":{\"provisioningState\":\"Creating\",\"state\":null,\"endpoint\":null,\"accountId\":\"b8dfd0da-1be0-4a39-b60d-6b60234a5d13\",\"creationTime\":null,\"lastModifiedTime\":null},\"location\":\"eastus2\",\"tags\":{\"testtag1\":\"testvalue1\",\"testtag2\":\"testvalue2\"},\"id\":\"/subscriptions/53d9063d-87ae-4ea8-be90-3686c3b8669f/resourceGroups/xplattestadlsrg01/providers/Microsoft.DataLakeStore/accounts/xplattestadls3113\",\"name\":\"xplattestadls3113\",\"type\":\"Microsoft.DataLakeStore/accounts\"}", { 'cache-control': 'no-cache',
+.put('/subscriptions/53d9063d-87ae-4ea8-be90-3686c3b8669f/resourceGroups/xplattestadlsrg01/providers/Microsoft.DataLakeStore/accounts/xplattestadls7774?api-version=2016-11-01', '*')
+  .reply(201, "{\"properties\":{\"provisioningState\":\"Creating\",\"state\":null,\"endpoint\":null,\"accountId\":\"7fa7b233-ca67-470a-8c9f-4c9597e2a826\",\"creationTime\":null,\"lastModifiedTime\":null},\"location\":\"eastus2\",\"tags\":{\"testtag1\":\"testvalue1\",\"testtag2\":\"testvalue2\"},\"id\":\"/subscriptions/53d9063d-87ae-4ea8-be90-3686c3b8669f/resourceGroups/xplattestadlsrg01/providers/Microsoft.DataLakeStore/accounts/xplattestadls7774\",\"name\":\"xplattestadls7774\",\"type\":\"Microsoft.DataLakeStore/accounts\"}", { 'cache-control': 'no-cache',
   pragma: 'no-cache',
   'content-length': '471',
   'content-type': 'application/json',
   expires: '-1',
-  location: 'https://management.azure.com/subscriptions/53d9063d-87ae-4ea8-be90-3686c3b8669f/resourcegroups/xplattestadlsrg01/providers/Microsoft.DataLakeStore/accounts/xplattestadls3113/operationresults/0?api-version=2016-11-01',
+  location: 'https://management.azure.com/subscriptions/53d9063d-87ae-4ea8-be90-3686c3b8669f/resourcegroups/xplattestadlsrg01/providers/Microsoft.DataLakeStore/accounts/xplattestadls7774/operationresults/0?api-version=2016-11-01',
   'retry-after': '10',
-  'azure-asyncoperation': 'https://management.azure.com/subscriptions/53d9063d-87ae-4ea8-be90-3686c3b8669f/providers/Microsoft.DataLakeStore/locations/eastus2/operationResults/b8dfd0da-1be0-4a39-b60d-6b60234a5d130?api-version=2016-11-01&expanded=true',
-  'x-ms-request-id': 'a0f08393-fadc-451b-b3b9-541ede55ed45',
+  'azure-asyncoperation': 'https://management.azure.com/subscriptions/53d9063d-87ae-4ea8-be90-3686c3b8669f/providers/Microsoft.DataLakeStore/locations/eastus2/operationResults/7fa7b233-ca67-470a-8c9f-4c9597e2a8260?api-version=2016-11-01&expanded=true',
+  'x-ms-request-id': '7c7b31ab-a34d-49a4-bc32-734c433340c3',
   'x-content-type-options': 'nosniff',
   server: 'Microsoft-IIS/8.5',
   'x-aspnet-version': '4.0.30319',
   'x-powered-by': 'ASP.NET',
-  'x-ms-ratelimit-remaining-subscription-writes': '1199',
-  'x-ms-correlation-request-id': 'ae4f8671-2820-4d8d-8204-0d71f4f5a66e',
-  'x-ms-routing-request-id': 'WESTUS2:20161111T215510Z:ae4f8671-2820-4d8d-8204-0d71f4f5a66e',
+  'x-ms-ratelimit-remaining-subscription-writes': '1197',
+  'x-ms-correlation-request-id': 'f8b26dd1-0141-4954-8b56-b41d4e92fb01',
+  'x-ms-routing-request-id': 'WESTUS2:20170316T233947Z:f8b26dd1-0141-4954-8b56-b41d4e92fb01',
   'strict-transport-security': 'max-age=31536000; includeSubDomains',
-  date: 'Fri, 11 Nov 2016 21:55:09 GMT',
+  date: 'Thu, 16 Mar 2017 23:39:46 GMT',
   connection: 'close' });
  return result; },
 function (nock) { 
 var result = 
 nock('http://management.azure.com:443')
-  .get('/subscriptions/53d9063d-87ae-4ea8-be90-3686c3b8669f/providers/Microsoft.DataLakeStore/locations/eastus2/operationResults/b8dfd0da-1be0-4a39-b60d-6b60234a5d130?api-version=2016-11-01&expanded=true')
+  .get('/subscriptions/53d9063d-87ae-4ea8-be90-3686c3b8669f/providers/Microsoft.DataLakeStore/locations/eastus2/operationResults/7fa7b233-ca67-470a-8c9f-4c9597e2a8260?api-version=2016-11-01&expanded=true')
   .reply(200, "{\"status\":\"Succeeded\"}", { 'cache-control': 'no-cache',
   pragma: 'no-cache',
   'content-length': '22',
   'content-type': 'application/json',
   expires: '-1',
-  'x-ms-request-id': 'c33ad754-ea85-4053-9a25-cb2915d940a4',
+  'x-ms-request-id': 'cd0f0108-78e0-49e5-9b70-e9ffa57766fa',
   'x-content-type-options': 'nosniff',
   server: 'Microsoft-IIS/8.5',
   'x-aspnet-version': '4.0.30319',
   'x-powered-by': 'ASP.NET',
-  'x-ms-ratelimit-remaining-subscription-reads': '14999',
-  'x-ms-correlation-request-id': '7f083086-7e55-456f-a584-12104365964d',
-  'x-ms-routing-request-id': 'WESTUS2:20161111T215541Z:7f083086-7e55-456f-a584-12104365964d',
+  'x-ms-ratelimit-remaining-subscription-reads': '14997',
+  'x-ms-correlation-request-id': 'e7ccdd74-fbbc-4547-9a92-7c3155f68369',
+  'x-ms-routing-request-id': 'CENTRALUS:20170316T234017Z:e7ccdd74-fbbc-4547-9a92-7c3155f68369',
   'strict-transport-security': 'max-age=31536000; includeSubDomains',
-  date: 'Fri, 11 Nov 2016 21:55:40 GMT',
+  date: 'Thu, 16 Mar 2017 23:40:17 GMT',
   connection: 'close' });
  return result; },
 function (nock) { 
 var result = 
 nock('https://management.azure.com:443')
-  .get('/subscriptions/53d9063d-87ae-4ea8-be90-3686c3b8669f/providers/Microsoft.DataLakeStore/locations/eastus2/operationResults/b8dfd0da-1be0-4a39-b60d-6b60234a5d130?api-version=2016-11-01&expanded=true')
+  .get('/subscriptions/53d9063d-87ae-4ea8-be90-3686c3b8669f/providers/Microsoft.DataLakeStore/locations/eastus2/operationResults/7fa7b233-ca67-470a-8c9f-4c9597e2a8260?api-version=2016-11-01&expanded=true')
   .reply(200, "{\"status\":\"Succeeded\"}", { 'cache-control': 'no-cache',
   pragma: 'no-cache',
   'content-length': '22',
   'content-type': 'application/json',
   expires: '-1',
-  'x-ms-request-id': 'c33ad754-ea85-4053-9a25-cb2915d940a4',
+  'x-ms-request-id': 'cd0f0108-78e0-49e5-9b70-e9ffa57766fa',
   'x-content-type-options': 'nosniff',
   server: 'Microsoft-IIS/8.5',
   'x-aspnet-version': '4.0.30319',
   'x-powered-by': 'ASP.NET',
-  'x-ms-ratelimit-remaining-subscription-reads': '14999',
-  'x-ms-correlation-request-id': '7f083086-7e55-456f-a584-12104365964d',
-  'x-ms-routing-request-id': 'WESTUS2:20161111T215541Z:7f083086-7e55-456f-a584-12104365964d',
+  'x-ms-ratelimit-remaining-subscription-reads': '14997',
+  'x-ms-correlation-request-id': 'e7ccdd74-fbbc-4547-9a92-7c3155f68369',
+  'x-ms-routing-request-id': 'CENTRALUS:20170316T234017Z:e7ccdd74-fbbc-4547-9a92-7c3155f68369',
   'strict-transport-security': 'max-age=31536000; includeSubDomains',
-  date: 'Fri, 11 Nov 2016 21:55:40 GMT',
+  date: 'Thu, 16 Mar 2017 23:40:17 GMT',
   connection: 'close' });
  return result; },
 function (nock) { 
 var result = 
 nock('http://management.azure.com:443')
-  .get('/subscriptions/53d9063d-87ae-4ea8-be90-3686c3b8669f/resourceGroups/xplattestadlsrg01/providers/Microsoft.DataLakeStore/accounts/xplattestadls3113?api-version=2016-11-01')
-  .reply(200, "{\"properties\":{\"firewallState\":\"Disabled\",\"firewallRules\":[],\"trustedIdProviderState\":\"Disabled\",\"trustedIdProviders\":[],\"encryptionState\":\"Enabled\",\"encryptionConfig\":{\"type\":\"ServiceManaged\"},\"provisioningState\":\"Succeeded\",\"state\":\"Active\",\"endpoint\":\"xplattestadls3113.azuredatalakestore.net\",\"accountId\":\"b8dfd0da-1be0-4a39-b60d-6b60234a5d13\",\"creationTime\":\"2016-11-11T21:55:15.0555195Z\",\"lastModifiedTime\":\"2016-11-11T21:55:15.0555195Z\"},\"location\":\"eastus2\",\"tags\":{\"testtag1\":\"testvalue1\",\"testtag2\":\"testvalue2\"},\"id\":\"/subscriptions/53d9063d-87ae-4ea8-be90-3686c3b8669f/resourceGroups/xplattestadlsrg01/providers/Microsoft.DataLakeStore/accounts/xplattestadls3113\",\"name\":\"xplattestadls3113\",\"type\":\"Microsoft.DataLakeStore/accounts\"}", { 'cache-control': 'no-cache',
+  .get('/subscriptions/53d9063d-87ae-4ea8-be90-3686c3b8669f/resourceGroups/xplattestadlsrg01/providers/Microsoft.DataLakeStore/accounts/xplattestadls7774?api-version=2016-11-01')
+  .reply(200, "{\"properties\":{\"firewallState\":\"Disabled\",\"firewallRules\":[],\"trustedIdProviderState\":\"Disabled\",\"trustedIdProviders\":[],\"encryptionState\":\"Enabled\",\"encryptionConfig\":{\"type\":\"ServiceManaged\"},\"currentTier\":\"Consumption\",\"newTier\":\"Consumption\",\"provisioningState\":\"Succeeded\",\"state\":\"Active\",\"endpoint\":\"xplattestadls7774.azuredatalakestore.net\",\"accountId\":\"7fa7b233-ca67-470a-8c9f-4c9597e2a826\",\"creationTime\":\"2017-03-16T23:39:46.6761056Z\",\"lastModifiedTime\":\"2017-03-16T23:39:46.6761056Z\"},\"location\":\"eastus2\",\"tags\":{\"testtag1\":\"testvalue1\",\"testtag2\":\"testvalue2\"},\"id\":\"/subscriptions/53d9063d-87ae-4ea8-be90-3686c3b8669f/resourceGroups/xplattestadlsrg01/providers/Microsoft.DataLakeStore/accounts/xplattestadls7774\",\"name\":\"xplattestadls7774\",\"type\":\"Microsoft.DataLakeStore/accounts\"}", { 'cache-control': 'no-cache',
   pragma: 'no-cache',
-  'content-length': '745',
+  'content-length': '797',
   'content-type': 'application/json',
   expires: '-1',
-  'x-ms-request-id': 'c0fe2246-6e28-40d9-b9c0-bb29f25e0009',
+  'x-ms-request-id': '46302ddf-a4ea-4a58-894b-a15ad952f03f',
   'x-content-type-options': 'nosniff',
   server: 'Microsoft-IIS/8.5',
   'x-aspnet-version': '4.0.30319',
   'x-powered-by': 'ASP.NET',
   'x-ms-ratelimit-remaining-subscription-reads': '14999',
-  'x-ms-correlation-request-id': 'efe19fd6-4442-4a6c-9d80-334651d16aa9',
-  'x-ms-routing-request-id': 'WESTUS2:20161111T215541Z:efe19fd6-4442-4a6c-9d80-334651d16aa9',
+  'x-ms-correlation-request-id': 'e046b6a4-7b2b-4b4b-9014-1ae8a6363192',
+  'x-ms-routing-request-id': 'CENTRALUS:20170316T234018Z:e046b6a4-7b2b-4b4b-9014-1ae8a6363192',
   'strict-transport-security': 'max-age=31536000; includeSubDomains',
-  date: 'Fri, 11 Nov 2016 21:55:40 GMT',
+  date: 'Thu, 16 Mar 2017 23:40:17 GMT',
   connection: 'close' });
  return result; },
 function (nock) { 
 var result = 
 nock('https://management.azure.com:443')
-  .get('/subscriptions/53d9063d-87ae-4ea8-be90-3686c3b8669f/resourceGroups/xplattestadlsrg01/providers/Microsoft.DataLakeStore/accounts/xplattestadls3113?api-version=2016-11-01')
-  .reply(200, "{\"properties\":{\"firewallState\":\"Disabled\",\"firewallRules\":[],\"trustedIdProviderState\":\"Disabled\",\"trustedIdProviders\":[],\"encryptionState\":\"Enabled\",\"encryptionConfig\":{\"type\":\"ServiceManaged\"},\"provisioningState\":\"Succeeded\",\"state\":\"Active\",\"endpoint\":\"xplattestadls3113.azuredatalakestore.net\",\"accountId\":\"b8dfd0da-1be0-4a39-b60d-6b60234a5d13\",\"creationTime\":\"2016-11-11T21:55:15.0555195Z\",\"lastModifiedTime\":\"2016-11-11T21:55:15.0555195Z\"},\"location\":\"eastus2\",\"tags\":{\"testtag1\":\"testvalue1\",\"testtag2\":\"testvalue2\"},\"id\":\"/subscriptions/53d9063d-87ae-4ea8-be90-3686c3b8669f/resourceGroups/xplattestadlsrg01/providers/Microsoft.DataLakeStore/accounts/xplattestadls3113\",\"name\":\"xplattestadls3113\",\"type\":\"Microsoft.DataLakeStore/accounts\"}", { 'cache-control': 'no-cache',
+  .get('/subscriptions/53d9063d-87ae-4ea8-be90-3686c3b8669f/resourceGroups/xplattestadlsrg01/providers/Microsoft.DataLakeStore/accounts/xplattestadls7774?api-version=2016-11-01')
+  .reply(200, "{\"properties\":{\"firewallState\":\"Disabled\",\"firewallRules\":[],\"trustedIdProviderState\":\"Disabled\",\"trustedIdProviders\":[],\"encryptionState\":\"Enabled\",\"encryptionConfig\":{\"type\":\"ServiceManaged\"},\"currentTier\":\"Consumption\",\"newTier\":\"Consumption\",\"provisioningState\":\"Succeeded\",\"state\":\"Active\",\"endpoint\":\"xplattestadls7774.azuredatalakestore.net\",\"accountId\":\"7fa7b233-ca67-470a-8c9f-4c9597e2a826\",\"creationTime\":\"2017-03-16T23:39:46.6761056Z\",\"lastModifiedTime\":\"2017-03-16T23:39:46.6761056Z\"},\"location\":\"eastus2\",\"tags\":{\"testtag1\":\"testvalue1\",\"testtag2\":\"testvalue2\"},\"id\":\"/subscriptions/53d9063d-87ae-4ea8-be90-3686c3b8669f/resourceGroups/xplattestadlsrg01/providers/Microsoft.DataLakeStore/accounts/xplattestadls7774\",\"name\":\"xplattestadls7774\",\"type\":\"Microsoft.DataLakeStore/accounts\"}", { 'cache-control': 'no-cache',
   pragma: 'no-cache',
-  'content-length': '745',
+  'content-length': '797',
   'content-type': 'application/json',
   expires: '-1',
-  'x-ms-request-id': 'c0fe2246-6e28-40d9-b9c0-bb29f25e0009',
+  'x-ms-request-id': '46302ddf-a4ea-4a58-894b-a15ad952f03f',
   'x-content-type-options': 'nosniff',
   server: 'Microsoft-IIS/8.5',
   'x-aspnet-version': '4.0.30319',
   'x-powered-by': 'ASP.NET',
   'x-ms-ratelimit-remaining-subscription-reads': '14999',
-  'x-ms-correlation-request-id': 'efe19fd6-4442-4a6c-9d80-334651d16aa9',
-  'x-ms-routing-request-id': 'WESTUS2:20161111T215541Z:efe19fd6-4442-4a6c-9d80-334651d16aa9',
+  'x-ms-correlation-request-id': 'e046b6a4-7b2b-4b4b-9014-1ae8a6363192',
+  'x-ms-routing-request-id': 'CENTRALUS:20170316T234018Z:e046b6a4-7b2b-4b4b-9014-1ae8a6363192',
   'strict-transport-security': 'max-age=31536000; includeSubDomains',
-  date: 'Fri, 11 Nov 2016 21:55:40 GMT',
+  date: 'Thu, 16 Mar 2017 23:40:17 GMT',
   connection: 'close' });
  return result; }]];
\ No newline at end of file
diff --git a/test/recordings/arm-datalake-store-tests/Data_Lake_Store_Clients_Account_and_Filesystem_Data_Lake_Store_Account_get_command_should_work.nock.js b/test/recordings/arm-datalake-store-tests/Data_Lake_Store_Clients_Account_and_Filesystem_Data_Lake_Store_Account_get_command_should_work.nock.js
index f8543a608f..f432b7c178 100644
--- a/test/recordings/arm-datalake-store-tests/Data_Lake_Store_Clients_Account_and_Filesystem_Data_Lake_Store_Account_get_command_should_work.nock.js
+++ b/test/recordings/arm-datalake-store-tests/Data_Lake_Store_Clients_Account_and_Filesystem_Data_Lake_Store_Account_get_command_should_work.nock.js
@@ -9,42 +9,42 @@ exports.setEnvironment = function() {
 exports.scopes = [[function (nock) { 
 var result = 
 nock('http://management.azure.com:443')
-  .get('/subscriptions/53d9063d-87ae-4ea8-be90-3686c3b8669f/resourceGroups/xplattestadlsrg01/providers/Microsoft.DataLakeStore/accounts/xplattestadls2879?api-version=2016-11-01')
-  .reply(200, "{\"properties\":{\"firewallState\":\"Disabled\",\"firewallRules\":[],\"trustedIdProviderState\":\"Disabled\",\"trustedIdProviders\":[],\"encryptionState\":\"Enabled\",\"encryptionConfig\":{\"type\":\"ServiceManaged\"},\"provisioningState\":\"Succeeded\",\"state\":\"Active\",\"endpoint\":\"xplattestadls2879.azuredatalakestore.net\",\"accountId\":\"bf72cf14-9ca5-4af6-912c-78be6473772f\",\"creationTime\":\"2016-11-11T21:54:41.2817266Z\",\"lastModifiedTime\":\"2016-11-11T21:54:41.2817266Z\"},\"location\":\"eastus2\",\"tags\":null,\"id\":\"/subscriptions/53d9063d-87ae-4ea8-be90-3686c3b8669f/resourceGroups/xplattestadlsrg01/providers/Microsoft.DataLakeStore/accounts/xplattestadls2879\",\"name\":\"xplattestadls2879\",\"type\":\"Microsoft.DataLakeStore/accounts\"}", { 'cache-control': 'no-cache',
+  .get('/subscriptions/53d9063d-87ae-4ea8-be90-3686c3b8669f/resourceGroups/xplattestadlsrg01/providers/Microsoft.DataLakeStore/accounts/xplattestadls5855?api-version=2016-11-01')
+  .reply(200, "{\"properties\":{\"firewallState\":\"Disabled\",\"firewallRules\":[],\"trustedIdProviderState\":\"Disabled\",\"trustedIdProviders\":[],\"encryptionState\":\"Enabled\",\"encryptionConfig\":{\"type\":\"ServiceManaged\"},\"currentTier\":\"Consumption\",\"newTier\":\"Consumption\",\"provisioningState\":\"Succeeded\",\"state\":\"Active\",\"endpoint\":\"xplattestadls5855.azuredatalakestore.net\",\"accountId\":\"9258c5fc-ab9b-48a6-99a5-f93d8191c07c\",\"creationTime\":\"2017-03-16T23:39:13.7101281Z\",\"lastModifiedTime\":\"2017-03-16T23:39:13.7101281Z\"},\"location\":\"eastus2\",\"tags\":null,\"id\":\"/subscriptions/53d9063d-87ae-4ea8-be90-3686c3b8669f/resourceGroups/xplattestadlsrg01/providers/Microsoft.DataLakeStore/accounts/xplattestadls5855\",\"name\":\"xplattestadls5855\",\"type\":\"Microsoft.DataLakeStore/accounts\"}", { 'cache-control': 'no-cache',
   pragma: 'no-cache',
-  'content-length': '700',
+  'content-length': '752',
   'content-type': 'application/json',
   expires: '-1',
-  'x-ms-request-id': '1015382f-5111-4521-9680-ac186bbb72ca',
+  'x-ms-request-id': 'ec4267c9-5bb1-4a7b-840c-713c7bf57fd8',
   'x-content-type-options': 'nosniff',
   server: 'Microsoft-IIS/8.5',
   'x-aspnet-version': '4.0.30319',
   'x-powered-by': 'ASP.NET',
   'x-ms-ratelimit-remaining-subscription-reads': '14999',
-  'x-ms-correlation-request-id': '2c260192-b9c2-4718-9929-792694189f6c',
-  'x-ms-routing-request-id': 'WESTUS2:20161111T215544Z:2c260192-b9c2-4718-9929-792694189f6c',
+  'x-ms-correlation-request-id': 'f89de5de-bc10-46be-a4b5-48586ffa35b3',
+  'x-ms-routing-request-id': 'CENTRALUS:20170316T234021Z:f89de5de-bc10-46be-a4b5-48586ffa35b3',
   'strict-transport-security': 'max-age=31536000; includeSubDomains',
-  date: 'Fri, 11 Nov 2016 21:55:44 GMT',
+  date: 'Thu, 16 Mar 2017 23:40:20 GMT',
   connection: 'close' });
  return result; },
 function (nock) { 
 var result = 
 nock('https://management.azure.com:443')
-  .get('/subscriptions/53d9063d-87ae-4ea8-be90-3686c3b8669f/resourceGroups/xplattestadlsrg01/providers/Microsoft.DataLakeStore/accounts/xplattestadls2879?api-version=2016-11-01')
-  .reply(200, "{\"properties\":{\"firewallState\":\"Disabled\",\"firewallRules\":[],\"trustedIdProviderState\":\"Disabled\",\"trustedIdProviders\":[],\"encryptionState\":\"Enabled\",\"encryptionConfig\":{\"type\":\"ServiceManaged\"},\"provisioningState\":\"Succeeded\",\"state\":\"Active\",\"endpoint\":\"xplattestadls2879.azuredatalakestore.net\",\"accountId\":\"bf72cf14-9ca5-4af6-912c-78be6473772f\",\"creationTime\":\"2016-11-11T21:54:41.2817266Z\",\"lastModifiedTime\":\"2016-11-11T21:54:41.2817266Z\"},\"location\":\"eastus2\",\"tags\":null,\"id\":\"/subscriptions/53d9063d-87ae-4ea8-be90-3686c3b8669f/resourceGroups/xplattestadlsrg01/providers/Microsoft.DataLakeStore/accounts/xplattestadls2879\",\"name\":\"xplattestadls2879\",\"type\":\"Microsoft.DataLakeStore/accounts\"}", { 'cache-control': 'no-cache',
+  .get('/subscriptions/53d9063d-87ae-4ea8-be90-3686c3b8669f/resourceGroups/xplattestadlsrg01/providers/Microsoft.DataLakeStore/accounts/xplattestadls5855?api-version=2016-11-01')
+  .reply(200, "{\"properties\":{\"firewallState\":\"Disabled\",\"firewallRules\":[],\"trustedIdProviderState\":\"Disabled\",\"trustedIdProviders\":[],\"encryptionState\":\"Enabled\",\"encryptionConfig\":{\"type\":\"ServiceManaged\"},\"currentTier\":\"Consumption\",\"newTier\":\"Consumption\",\"provisioningState\":\"Succeeded\",\"state\":\"Active\",\"endpoint\":\"xplattestadls5855.azuredatalakestore.net\",\"accountId\":\"9258c5fc-ab9b-48a6-99a5-f93d8191c07c\",\"creationTime\":\"2017-03-16T23:39:13.7101281Z\",\"lastModifiedTime\":\"2017-03-16T23:39:13.7101281Z\"},\"location\":\"eastus2\",\"tags\":null,\"id\":\"/subscriptions/53d9063d-87ae-4ea8-be90-3686c3b8669f/resourceGroups/xplattestadlsrg01/providers/Microsoft.DataLakeStore/accounts/xplattestadls5855\",\"name\":\"xplattestadls5855\",\"type\":\"Microsoft.DataLakeStore/accounts\"}", { 'cache-control': 'no-cache',
   pragma: 'no-cache',
-  'content-length': '700',
+  'content-length': '752',
   'content-type': 'application/json',
   expires: '-1',
-  'x-ms-request-id': '1015382f-5111-4521-9680-ac186bbb72ca',
+  'x-ms-request-id': 'ec4267c9-5bb1-4a7b-840c-713c7bf57fd8',
   'x-content-type-options': 'nosniff',
   server: 'Microsoft-IIS/8.5',
   'x-aspnet-version': '4.0.30319',
   'x-powered-by': 'ASP.NET',
   'x-ms-ratelimit-remaining-subscription-reads': '14999',
-  'x-ms-correlation-request-id': '2c260192-b9c2-4718-9929-792694189f6c',
-  'x-ms-routing-request-id': 'WESTUS2:20161111T215544Z:2c260192-b9c2-4718-9929-792694189f6c',
+  'x-ms-correlation-request-id': 'f89de5de-bc10-46be-a4b5-48586ffa35b3',
+  'x-ms-routing-request-id': 'CENTRALUS:20170316T234021Z:f89de5de-bc10-46be-a4b5-48586ffa35b3',
   'strict-transport-security': 'max-age=31536000; includeSubDomains',
-  date: 'Fri, 11 Nov 2016 21:55:44 GMT',
+  date: 'Thu, 16 Mar 2017 23:40:20 GMT',
   connection: 'close' });
  return result; }]];
\ No newline at end of file
diff --git a/test/recordings/arm-datalake-store-tests/Data_Lake_Store_Clients_Account_and_Filesystem_Data_Lake_Store_Account_list_commands_should_work.nock.js b/test/recordings/arm-datalake-store-tests/Data_Lake_Store_Clients_Account_and_Filesystem_Data_Lake_Store_Account_list_commands_should_work.nock.js
index 202098e3c4..04b09f76f9 100644
--- a/test/recordings/arm-datalake-store-tests/Data_Lake_Store_Clients_Account_and_Filesystem_Data_Lake_Store_Account_list_commands_should_work.nock.js
+++ b/test/recordings/arm-datalake-store-tests/Data_Lake_Store_Clients_Account_and_Filesystem_Data_Lake_Store_Account_list_commands_should_work.nock.js
@@ -10,83 +10,83 @@ exports.scopes = [[function (nock) {
 var result = 
 nock('http://management.azure.com:443')
   .get('/subscriptions/53d9063d-87ae-4ea8-be90-3686c3b8669f/providers/Microsoft.DataLakeStore/accounts?api-version=2016-11-01')
-  .reply(200, "{\"value\":[{\"properties\":{\"provisioningState\":\"Succeeded\",\"state\":\"Active\",\"endpoint\":\"adlspysample01.azuredatalakestore.net\",\"accountId\":\"f7a5c302-324f-4e8c-949a-9d9bd37d0560\",\"creationTime\":\"2016-09-07T18:13:56.9504562Z\",\"lastModifiedTime\":\"2016-09-07T18:13:56.9504562Z\"},\"location\":\"eastus2\",\"tags\":null,\"id\":\"/subscriptions/53d9063d-87ae-4ea8-be90-3686c3b8669f/resourceGroups/adlpysamplerg01/providers/Microsoft.DataLakeStore/accounts/adlspysample01\",\"name\":\"adlspysample01\",\"type\":\"Microsoft.DataLakeStore/accounts\"},{\"properties\":{\"provisioningState\":\"Succeeded\",\"state\":\"Active\",\"endpoint\":\"pyarmadlscd761330.azuredatalakestore.net\",\"accountId\":\"7b92abde-b1fe-4b5b-9f46-fae5adfc2e4d\",\"creationTime\":\"2016-11-10T21:44:51.2057522Z\",\"lastModifiedTime\":\"2016-11-10T21:44:51.2057522Z\"},\"location\":\"East US 2\",\"tags\":null,\"id\":\"/subscriptions/53d9063d-87ae-4ea8-be90-3686c3b8669f/resourceGroups/test_mgmt_datalake_analytics_test_adla_accountscd761330/providers/Microsoft.DataLakeStore/accounts/pyarmadlscd761330\",\"name\":\"pyarmadlscd761330\",\"type\":\"Microsoft.DataLakeStore/accounts\"},{\"properties\":{\"provisioningState\":\"Succeeded\",\"state\":\"Active\",\"endpoint\":\"pyarmadlsb9d51798.azuredatalakestore.net\",\"accountId\":\"560612c7-46f1-46d2-a9cc-019263b996d6\",\"creationTime\":\"2016-11-11T02:55:41.6849669Z\",\"lastModifiedTime\":\"2016-11-11T02:55:41.6849669Z\"},\"location\":\"East US 2\",\"tags\":null,\"id\":\"/subscriptions/53d9063d-87ae-4ea8-be90-3686c3b8669f/resourceGroups/test_mgmt_datalake_analytics_test_adla_catalog_credentialsb9d51798/providers/Microsoft.DataLakeStore/accounts/pyarmadlsb9d51798\",\"name\":\"pyarmadlsb9d51798\",\"type\":\"Microsoft.DataLakeStore/accounts\"},{\"properties\":{\"provisioningState\":\"Succeeded\",\"state\":\"Active\",\"endpoint\":\"pyarmadls485f1590.azuredatalakestore.net\",\"accountId\":\"7436db03-b4ba-4483-98b5-84d68f188706\",\"creationTime\":\"2016-11-11T02:48:45.8202549Z\",\"lastModifiedTime\":\"2016-11-11T02:48:45.8202549Z\"},\"location\":\"East US 2\",\"tags\":null,\"id\":\"/subscriptions/53d9063d-87ae-4ea8-be90-3686c3b8669f/resourceGroups/test_mgmt_datalake_analytics_test_adla_catalog_secret485f1590/providers/Microsoft.DataLakeStore/accounts/pyarmadls485f1590\",\"name\":\"pyarmadls485f1590\",\"type\":\"Microsoft.DataLakeStore/accounts\"},{\"properties\":{\"provisioningState\":\"Succeeded\",\"state\":\"Active\",\"endpoint\":\"pyarmadls5e621603.azuredatalakestore.net\",\"accountId\":\"e7bbd84b-76dc-4ca7-b24e-88fbe4ce36ad\",\"creationTime\":\"2016-11-10T19:31:45.3226661Z\",\"lastModifiedTime\":\"2016-11-10T19:31:45.3226661Z\"},\"location\":\"East US 2\",\"tags\":null,\"id\":\"/subscriptions/53d9063d-87ae-4ea8-be90-3686c3b8669f/resourceGroups/test_mgmt_datalake_analytics_test_adla_catalog_secrets5e621603/providers/Microsoft.DataLakeStore/accounts/pyarmadls5e621603\",\"name\":\"pyarmadls5e621603\",\"type\":\"Microsoft.DataLakeStore/accounts\"},{\"properties\":{\"provisioningState\":\"Succeeded\",\"state\":\"Active\",\"endpoint\":\"pyarmadls2847d11a7.azuredatalakestore.net\",\"accountId\":\"524182e1-793b-482b-bddb-051691f6810e\",\"creationTime\":\"2016-11-11T02:47:53.5357821Z\",\"lastModifiedTime\":\"2016-11-11T02:47:53.5357821Z\"},\"location\":\"East US 2\",\"tags\":{\"tag1\":\"value1\"},\"id\":\"/subscriptions/53d9063d-87ae-4ea8-be90-3686c3b8669f/resourceGroups/test_mgmt_datalake_store_test_adls_accounts847d11a7/providers/Microsoft.DataLakeStore/accounts/pyarmadls2847d11a7\",\"name\":\"pyarmadls2847d11a7\",\"type\":\"Microsoft.DataLakeStore/accounts\"},{\"properties\":{\"provisioningState\":\"Succeeded\",\"state\":\"Active\",\"endpoint\":\"pyarmadls847d11a7.azuredatalakestore.net\",\"accountId\":\"56d9ac31-c82c-4a65-9777-bfa9b30023fc\",\"creationTime\":\"2016-11-11T02:47:10.060909Z\",\"lastModifiedTime\":\"2016-11-11T02:48:33.2020066Z\"},\"location\":\"East US 2\",\"tags\":{\"tag2\":\"value2\"},\"id\":\"/subscriptions/53d9063d-87ae-4ea8-be90-3686c3b8669f/resourceGroups/test_mgmt_datalake_store_test_adls_accounts847d11a7/providers/Microsoft.DataLakeStore/accounts/pyarmadls847d11a7\",\"name\":\"pyarmadls847d11a7\",\"type\":\"Microsoft.DataLakeStore/accounts\"},{\"properties\":{\"provisioningState\":\"Succeeded\",\"state\":\"Active\",\"endpoint\":\"begoldsmtstacl01.azuredatalakestore.net\",\"accountId\":\"ef22f349-0793-4386-b6b6-04a94f33ba12\",\"creationTime\":\"2016-08-30T18:29:18.0064863Z\",\"lastModifiedTime\":\"2016-08-30T18:29:18.0064863Z\"},\"location\":\"eastus2\",\"tags\":null,\"id\":\"/subscriptions/53d9063d-87ae-4ea8-be90-3686c3b8669f/resourceGroups/testaclrg/providers/Microsoft.DataLakeStore/accounts/begoldsmtstacl01\",\"name\":\"begoldsmtstacl01\",\"type\":\"Microsoft.DataLakeStore/accounts\"},{\"properties\":{\"provisioningState\":\"Succeeded\",\"state\":\"Active\",\"endpoint\":\"xplattestadls2879.azuredatalakestore.net\",\"accountId\":\"bf72cf14-9ca5-4af6-912c-78be6473772f\",\"creationTime\":\"2016-11-11T21:54:41.2817266Z\",\"lastModifiedTime\":\"2016-11-11T21:54:41.2817266Z\"},\"location\":\"eastus2\",\"tags\":null,\"id\":\"/subscriptions/53d9063d-87ae-4ea8-be90-3686c3b8669f/resourceGroups/xplattestadlsrg01/providers/Microsoft.DataLakeStore/accounts/xplattestadls2879\",\"name\":\"xplattestadls2879\",\"type\":\"Microsoft.DataLakeStore/accounts\"},{\"properties\":{\"provisioningState\":\"Succeeded\",\"state\":\"Active\",\"endpoint\":\"xplattestadls3113.azuredatalakestore.net\",\"accountId\":\"b8dfd0da-1be0-4a39-b60d-6b60234a5d13\",\"creationTime\":\"2016-11-11T21:55:15.0555195Z\",\"lastModifiedTime\":\"2016-11-11T21:55:15.0555195Z\"},\"location\":\"eastus2\",\"tags\":{\"testtag1\":\"testvalue1\",\"testtag2\":\"testvalue2\"},\"id\":\"/subscriptions/53d9063d-87ae-4ea8-be90-3686c3b8669f/resourceGroups/xplattestadlsrg01/providers/Microsoft.DataLakeStore/accounts/xplattestadls3113\",\"name\":\"xplattestadls3113\",\"type\":\"Microsoft.DataLakeStore/accounts\"}]}", { 'cache-control': 'no-cache',
+  .reply(200, "{\"value\":[{\"properties\":{\"provisioningState\":\"Succeeded\",\"state\":\"Active\",\"endpoint\":\"cliadls1234531.azuredatalakestore.net\",\"accountId\":\"8ec9f6be-881c-4af2-9690-6f80a9934f34\",\"creationTime\":\"2017-03-08T19:01:25.3411347Z\",\"lastModifiedTime\":\"2017-03-08T19:01:25.3411347Z\"},\"location\":\"eastus2\",\"tags\":null,\"id\":\"/subscriptions/53d9063d-87ae-4ea8-be90-3686c3b8669f/resourceGroups/test-adla-job-mgmt_olik_/providers/Microsoft.DataLakeStore/accounts/cliadls1234531\",\"name\":\"cliadls1234531\",\"type\":\"Microsoft.DataLakeStore/accounts\"},{\"properties\":{\"provisioningState\":\"Succeeded\",\"state\":\"Active\",\"endpoint\":\"xplattestadls5855.azuredatalakestore.net\",\"accountId\":\"9258c5fc-ab9b-48a6-99a5-f93d8191c07c\",\"creationTime\":\"2017-03-16T23:39:13.7101281Z\",\"lastModifiedTime\":\"2017-03-16T23:39:13.7101281Z\"},\"location\":\"eastus2\",\"tags\":null,\"id\":\"/subscriptions/53d9063d-87ae-4ea8-be90-3686c3b8669f/resourceGroups/xplattestadlsrg01/providers/Microsoft.DataLakeStore/accounts/xplattestadls5855\",\"name\":\"xplattestadls5855\",\"type\":\"Microsoft.DataLakeStore/accounts\"},{\"properties\":{\"provisioningState\":\"Succeeded\",\"state\":\"Active\",\"endpoint\":\"xplattestadls7774.azuredatalakestore.net\",\"accountId\":\"7fa7b233-ca67-470a-8c9f-4c9597e2a826\",\"creationTime\":\"2017-03-16T23:39:46.6761056Z\",\"lastModifiedTime\":\"2017-03-16T23:39:46.6761056Z\"},\"location\":\"eastus2\",\"tags\":{\"testtag1\":\"testvalue1\",\"testtag2\":\"testvalue2\"},\"id\":\"/subscriptions/53d9063d-87ae-4ea8-be90-3686c3b8669f/resourceGroups/xplattestadlsrg01/providers/Microsoft.DataLakeStore/accounts/xplattestadls7774\",\"name\":\"xplattestadls7774\",\"type\":\"Microsoft.DataLakeStore/accounts\"}]}", { 'cache-control': 'no-cache',
   pragma: 'no-cache',
-  'content-length': '5538',
+  'content-length': '1620',
   'content-type': 'application/json',
   expires: '-1',
-  'x-ms-request-id': 'aa085970-b4f4-4c24-812c-603520ea7a61',
+  'x-ms-request-id': '51365aed-6d68-49d1-9e65-a6608f20f933',
   'x-content-type-options': 'nosniff',
   server: 'Microsoft-IIS/8.5',
   'x-aspnet-version': '4.0.30319',
   'x-powered-by': 'ASP.NET',
-  'x-ms-ratelimit-remaining-subscription-reads': '14998',
-  'x-ms-correlation-request-id': 'fefa1805-4519-4637-aa90-ec0dfdb7deed',
-  'x-ms-routing-request-id': 'WESTUS2:20161111T215545Z:fefa1805-4519-4637-aa90-ec0dfdb7deed',
+  'x-ms-ratelimit-remaining-subscription-reads': '14999',
+  'x-ms-correlation-request-id': '52616db5-0010-41fd-8778-db733da60008',
+  'x-ms-routing-request-id': 'CENTRALUS:20170316T234021Z:52616db5-0010-41fd-8778-db733da60008',
   'strict-transport-security': 'max-age=31536000; includeSubDomains',
-  date: 'Fri, 11 Nov 2016 21:55:44 GMT',
+  date: 'Thu, 16 Mar 2017 23:40:21 GMT',
   connection: 'close' });
  return result; },
 function (nock) { 
 var result = 
 nock('https://management.azure.com:443')
   .get('/subscriptions/53d9063d-87ae-4ea8-be90-3686c3b8669f/providers/Microsoft.DataLakeStore/accounts?api-version=2016-11-01')
-  .reply(200, "{\"value\":[{\"properties\":{\"provisioningState\":\"Succeeded\",\"state\":\"Active\",\"endpoint\":\"adlspysample01.azuredatalakestore.net\",\"accountId\":\"f7a5c302-324f-4e8c-949a-9d9bd37d0560\",\"creationTime\":\"2016-09-07T18:13:56.9504562Z\",\"lastModifiedTime\":\"2016-09-07T18:13:56.9504562Z\"},\"location\":\"eastus2\",\"tags\":null,\"id\":\"/subscriptions/53d9063d-87ae-4ea8-be90-3686c3b8669f/resourceGroups/adlpysamplerg01/providers/Microsoft.DataLakeStore/accounts/adlspysample01\",\"name\":\"adlspysample01\",\"type\":\"Microsoft.DataLakeStore/accounts\"},{\"properties\":{\"provisioningState\":\"Succeeded\",\"state\":\"Active\",\"endpoint\":\"pyarmadlscd761330.azuredatalakestore.net\",\"accountId\":\"7b92abde-b1fe-4b5b-9f46-fae5adfc2e4d\",\"creationTime\":\"2016-11-10T21:44:51.2057522Z\",\"lastModifiedTime\":\"2016-11-10T21:44:51.2057522Z\"},\"location\":\"East US 2\",\"tags\":null,\"id\":\"/subscriptions/53d9063d-87ae-4ea8-be90-3686c3b8669f/resourceGroups/test_mgmt_datalake_analytics_test_adla_accountscd761330/providers/Microsoft.DataLakeStore/accounts/pyarmadlscd761330\",\"name\":\"pyarmadlscd761330\",\"type\":\"Microsoft.DataLakeStore/accounts\"},{\"properties\":{\"provisioningState\":\"Succeeded\",\"state\":\"Active\",\"endpoint\":\"pyarmadlsb9d51798.azuredatalakestore.net\",\"accountId\":\"560612c7-46f1-46d2-a9cc-019263b996d6\",\"creationTime\":\"2016-11-11T02:55:41.6849669Z\",\"lastModifiedTime\":\"2016-11-11T02:55:41.6849669Z\"},\"location\":\"East US 2\",\"tags\":null,\"id\":\"/subscriptions/53d9063d-87ae-4ea8-be90-3686c3b8669f/resourceGroups/test_mgmt_datalake_analytics_test_adla_catalog_credentialsb9d51798/providers/Microsoft.DataLakeStore/accounts/pyarmadlsb9d51798\",\"name\":\"pyarmadlsb9d51798\",\"type\":\"Microsoft.DataLakeStore/accounts\"},{\"properties\":{\"provisioningState\":\"Succeeded\",\"state\":\"Active\",\"endpoint\":\"pyarmadls485f1590.azuredatalakestore.net\",\"accountId\":\"7436db03-b4ba-4483-98b5-84d68f188706\",\"creationTime\":\"2016-11-11T02:48:45.8202549Z\",\"lastModifiedTime\":\"2016-11-11T02:48:45.8202549Z\"},\"location\":\"East US 2\",\"tags\":null,\"id\":\"/subscriptions/53d9063d-87ae-4ea8-be90-3686c3b8669f/resourceGroups/test_mgmt_datalake_analytics_test_adla_catalog_secret485f1590/providers/Microsoft.DataLakeStore/accounts/pyarmadls485f1590\",\"name\":\"pyarmadls485f1590\",\"type\":\"Microsoft.DataLakeStore/accounts\"},{\"properties\":{\"provisioningState\":\"Succeeded\",\"state\":\"Active\",\"endpoint\":\"pyarmadls5e621603.azuredatalakestore.net\",\"accountId\":\"e7bbd84b-76dc-4ca7-b24e-88fbe4ce36ad\",\"creationTime\":\"2016-11-10T19:31:45.3226661Z\",\"lastModifiedTime\":\"2016-11-10T19:31:45.3226661Z\"},\"location\":\"East US 2\",\"tags\":null,\"id\":\"/subscriptions/53d9063d-87ae-4ea8-be90-3686c3b8669f/resourceGroups/test_mgmt_datalake_analytics_test_adla_catalog_secrets5e621603/providers/Microsoft.DataLakeStore/accounts/pyarmadls5e621603\",\"name\":\"pyarmadls5e621603\",\"type\":\"Microsoft.DataLakeStore/accounts\"},{\"properties\":{\"provisioningState\":\"Succeeded\",\"state\":\"Active\",\"endpoint\":\"pyarmadls2847d11a7.azuredatalakestore.net\",\"accountId\":\"524182e1-793b-482b-bddb-051691f6810e\",\"creationTime\":\"2016-11-11T02:47:53.5357821Z\",\"lastModifiedTime\":\"2016-11-11T02:47:53.5357821Z\"},\"location\":\"East US 2\",\"tags\":{\"tag1\":\"value1\"},\"id\":\"/subscriptions/53d9063d-87ae-4ea8-be90-3686c3b8669f/resourceGroups/test_mgmt_datalake_store_test_adls_accounts847d11a7/providers/Microsoft.DataLakeStore/accounts/pyarmadls2847d11a7\",\"name\":\"pyarmadls2847d11a7\",\"type\":\"Microsoft.DataLakeStore/accounts\"},{\"properties\":{\"provisioningState\":\"Succeeded\",\"state\":\"Active\",\"endpoint\":\"pyarmadls847d11a7.azuredatalakestore.net\",\"accountId\":\"56d9ac31-c82c-4a65-9777-bfa9b30023fc\",\"creationTime\":\"2016-11-11T02:47:10.060909Z\",\"lastModifiedTime\":\"2016-11-11T02:48:33.2020066Z\"},\"location\":\"East US 2\",\"tags\":{\"tag2\":\"value2\"},\"id\":\"/subscriptions/53d9063d-87ae-4ea8-be90-3686c3b8669f/resourceGroups/test_mgmt_datalake_store_test_adls_accounts847d11a7/providers/Microsoft.DataLakeStore/accounts/pyarmadls847d11a7\",\"name\":\"pyarmadls847d11a7\",\"type\":\"Microsoft.DataLakeStore/accounts\"},{\"properties\":{\"provisioningState\":\"Succeeded\",\"state\":\"Active\",\"endpoint\":\"begoldsmtstacl01.azuredatalakestore.net\",\"accountId\":\"ef22f349-0793-4386-b6b6-04a94f33ba12\",\"creationTime\":\"2016-08-30T18:29:18.0064863Z\",\"lastModifiedTime\":\"2016-08-30T18:29:18.0064863Z\"},\"location\":\"eastus2\",\"tags\":null,\"id\":\"/subscriptions/53d9063d-87ae-4ea8-be90-3686c3b8669f/resourceGroups/testaclrg/providers/Microsoft.DataLakeStore/accounts/begoldsmtstacl01\",\"name\":\"begoldsmtstacl01\",\"type\":\"Microsoft.DataLakeStore/accounts\"},{\"properties\":{\"provisioningState\":\"Succeeded\",\"state\":\"Active\",\"endpoint\":\"xplattestadls2879.azuredatalakestore.net\",\"accountId\":\"bf72cf14-9ca5-4af6-912c-78be6473772f\",\"creationTime\":\"2016-11-11T21:54:41.2817266Z\",\"lastModifiedTime\":\"2016-11-11T21:54:41.2817266Z\"},\"location\":\"eastus2\",\"tags\":null,\"id\":\"/subscriptions/53d9063d-87ae-4ea8-be90-3686c3b8669f/resourceGroups/xplattestadlsrg01/providers/Microsoft.DataLakeStore/accounts/xplattestadls2879\",\"name\":\"xplattestadls2879\",\"type\":\"Microsoft.DataLakeStore/accounts\"},{\"properties\":{\"provisioningState\":\"Succeeded\",\"state\":\"Active\",\"endpoint\":\"xplattestadls3113.azuredatalakestore.net\",\"accountId\":\"b8dfd0da-1be0-4a39-b60d-6b60234a5d13\",\"creationTime\":\"2016-11-11T21:55:15.0555195Z\",\"lastModifiedTime\":\"2016-11-11T21:55:15.0555195Z\"},\"location\":\"eastus2\",\"tags\":{\"testtag1\":\"testvalue1\",\"testtag2\":\"testvalue2\"},\"id\":\"/subscriptions/53d9063d-87ae-4ea8-be90-3686c3b8669f/resourceGroups/xplattestadlsrg01/providers/Microsoft.DataLakeStore/accounts/xplattestadls3113\",\"name\":\"xplattestadls3113\",\"type\":\"Microsoft.DataLakeStore/accounts\"}]}", { 'cache-control': 'no-cache',
+  .reply(200, "{\"value\":[{\"properties\":{\"provisioningState\":\"Succeeded\",\"state\":\"Active\",\"endpoint\":\"cliadls1234531.azuredatalakestore.net\",\"accountId\":\"8ec9f6be-881c-4af2-9690-6f80a9934f34\",\"creationTime\":\"2017-03-08T19:01:25.3411347Z\",\"lastModifiedTime\":\"2017-03-08T19:01:25.3411347Z\"},\"location\":\"eastus2\",\"tags\":null,\"id\":\"/subscriptions/53d9063d-87ae-4ea8-be90-3686c3b8669f/resourceGroups/test-adla-job-mgmt_olik_/providers/Microsoft.DataLakeStore/accounts/cliadls1234531\",\"name\":\"cliadls1234531\",\"type\":\"Microsoft.DataLakeStore/accounts\"},{\"properties\":{\"provisioningState\":\"Succeeded\",\"state\":\"Active\",\"endpoint\":\"xplattestadls5855.azuredatalakestore.net\",\"accountId\":\"9258c5fc-ab9b-48a6-99a5-f93d8191c07c\",\"creationTime\":\"2017-03-16T23:39:13.7101281Z\",\"lastModifiedTime\":\"2017-03-16T23:39:13.7101281Z\"},\"location\":\"eastus2\",\"tags\":null,\"id\":\"/subscriptions/53d9063d-87ae-4ea8-be90-3686c3b8669f/resourceGroups/xplattestadlsrg01/providers/Microsoft.DataLakeStore/accounts/xplattestadls5855\",\"name\":\"xplattestadls5855\",\"type\":\"Microsoft.DataLakeStore/accounts\"},{\"properties\":{\"provisioningState\":\"Succeeded\",\"state\":\"Active\",\"endpoint\":\"xplattestadls7774.azuredatalakestore.net\",\"accountId\":\"7fa7b233-ca67-470a-8c9f-4c9597e2a826\",\"creationTime\":\"2017-03-16T23:39:46.6761056Z\",\"lastModifiedTime\":\"2017-03-16T23:39:46.6761056Z\"},\"location\":\"eastus2\",\"tags\":{\"testtag1\":\"testvalue1\",\"testtag2\":\"testvalue2\"},\"id\":\"/subscriptions/53d9063d-87ae-4ea8-be90-3686c3b8669f/resourceGroups/xplattestadlsrg01/providers/Microsoft.DataLakeStore/accounts/xplattestadls7774\",\"name\":\"xplattestadls7774\",\"type\":\"Microsoft.DataLakeStore/accounts\"}]}", { 'cache-control': 'no-cache',
   pragma: 'no-cache',
-  'content-length': '5538',
+  'content-length': '1620',
   'content-type': 'application/json',
   expires: '-1',
-  'x-ms-request-id': 'aa085970-b4f4-4c24-812c-603520ea7a61',
+  'x-ms-request-id': '51365aed-6d68-49d1-9e65-a6608f20f933',
   'x-content-type-options': 'nosniff',
   server: 'Microsoft-IIS/8.5',
   'x-aspnet-version': '4.0.30319',
   'x-powered-by': 'ASP.NET',
-  'x-ms-ratelimit-remaining-subscription-reads': '14998',
-  'x-ms-correlation-request-id': 'fefa1805-4519-4637-aa90-ec0dfdb7deed',
-  'x-ms-routing-request-id': 'WESTUS2:20161111T215545Z:fefa1805-4519-4637-aa90-ec0dfdb7deed',
+  'x-ms-ratelimit-remaining-subscription-reads': '14999',
+  'x-ms-correlation-request-id': '52616db5-0010-41fd-8778-db733da60008',
+  'x-ms-routing-request-id': 'CENTRALUS:20170316T234021Z:52616db5-0010-41fd-8778-db733da60008',
   'strict-transport-security': 'max-age=31536000; includeSubDomains',
-  date: 'Fri, 11 Nov 2016 21:55:44 GMT',
+  date: 'Thu, 16 Mar 2017 23:40:21 GMT',
   connection: 'close' });
  return result; },
 function (nock) { 
 var result = 
 nock('http://management.azure.com:443')
   .get('/subscriptions/53d9063d-87ae-4ea8-be90-3686c3b8669f/resourceGroups/xplattestadlsrg01/providers/Microsoft.DataLakeStore/accounts?api-version=2016-11-01')
-  .reply(200, "{\"value\":[{\"properties\":{\"provisioningState\":\"Succeeded\",\"state\":\"Active\",\"endpoint\":\"xplattestadls2879.azuredatalakestore.net\",\"accountId\":\"bf72cf14-9ca5-4af6-912c-78be6473772f\",\"creationTime\":\"2016-11-11T21:54:41.2817266Z\",\"lastModifiedTime\":\"2016-11-11T21:54:41.2817266Z\"},\"location\":\"eastus2\",\"tags\":null,\"id\":\"/subscriptions/53d9063d-87ae-4ea8-be90-3686c3b8669f/resourceGroups/xplattestadlsrg01/providers/Microsoft.DataLakeStore/accounts/xplattestadls2879\",\"name\":\"xplattestadls2879\",\"type\":\"Microsoft.DataLakeStore/accounts\"},{\"properties\":{\"provisioningState\":\"Succeeded\",\"state\":\"Active\",\"endpoint\":\"xplattestadls3113.azuredatalakestore.net\",\"accountId\":\"b8dfd0da-1be0-4a39-b60d-6b60234a5d13\",\"creationTime\":\"2016-11-11T21:55:15.0555195Z\",\"lastModifiedTime\":\"2016-11-11T21:55:15.0555195Z\"},\"location\":\"eastus2\",\"tags\":{\"testtag1\":\"testvalue1\",\"testtag2\":\"testvalue2\"},\"id\":\"/subscriptions/53d9063d-87ae-4ea8-be90-3686c3b8669f/resourceGroups/xplattestadlsrg01/providers/Microsoft.DataLakeStore/accounts/xplattestadls3113\",\"name\":\"xplattestadls3113\",\"type\":\"Microsoft.DataLakeStore/accounts\"}]}", { 'cache-control': 'no-cache',
+  .reply(200, "{\"value\":[{\"properties\":{\"provisioningState\":\"Succeeded\",\"state\":\"Active\",\"endpoint\":\"xplattestadls5855.azuredatalakestore.net\",\"accountId\":\"9258c5fc-ab9b-48a6-99a5-f93d8191c07c\",\"creationTime\":\"2017-03-16T23:39:13.7101281Z\",\"lastModifiedTime\":\"2017-03-16T23:39:13.7101281Z\"},\"location\":\"eastus2\",\"tags\":null,\"id\":\"/subscriptions/53d9063d-87ae-4ea8-be90-3686c3b8669f/resourceGroups/xplattestadlsrg01/providers/Microsoft.DataLakeStore/accounts/xplattestadls5855\",\"name\":\"xplattestadls5855\",\"type\":\"Microsoft.DataLakeStore/accounts\"},{\"properties\":{\"provisioningState\":\"Succeeded\",\"state\":\"Active\",\"endpoint\":\"xplattestadls7774.azuredatalakestore.net\",\"accountId\":\"7fa7b233-ca67-470a-8c9f-4c9597e2a826\",\"creationTime\":\"2017-03-16T23:39:46.6761056Z\",\"lastModifiedTime\":\"2017-03-16T23:39:46.6761056Z\"},\"location\":\"eastus2\",\"tags\":{\"testtag1\":\"testvalue1\",\"testtag2\":\"testvalue2\"},\"id\":\"/subscriptions/53d9063d-87ae-4ea8-be90-3686c3b8669f/resourceGroups/xplattestadlsrg01/providers/Microsoft.DataLakeStore/accounts/xplattestadls7774\",\"name\":\"xplattestadls7774\",\"type\":\"Microsoft.DataLakeStore/accounts\"}]}", { 'cache-control': 'no-cache',
   pragma: 'no-cache',
   'content-length': '1100',
   'content-type': 'application/json',
   expires: '-1',
-  'x-ms-request-id': '6625bcfb-bede-4870-bdbb-620133b0f822',
+  'x-ms-request-id': 'b6f6e3f9-f44c-49e6-b45f-6fe2dcb2f52c',
   'x-content-type-options': 'nosniff',
   server: 'Microsoft-IIS/8.5',
   'x-aspnet-version': '4.0.30319',
   'x-powered-by': 'ASP.NET',
-  'x-ms-ratelimit-remaining-subscription-reads': '14997',
-  'x-ms-correlation-request-id': 'cdefa2cc-c6f5-4911-b64f-5b32d1f6983b',
-  'x-ms-routing-request-id': 'WESTUS2:20161111T215545Z:cdefa2cc-c6f5-4911-b64f-5b32d1f6983b',
+  'x-ms-ratelimit-remaining-subscription-reads': '14998',
+  'x-ms-correlation-request-id': 'bae72779-9116-4f49-9e42-24e1e3a114a6',
+  'x-ms-routing-request-id': 'CENTRALUS:20170316T234022Z:bae72779-9116-4f49-9e42-24e1e3a114a6',
   'strict-transport-security': 'max-age=31536000; includeSubDomains',
-  date: 'Fri, 11 Nov 2016 21:55:45 GMT',
+  date: 'Thu, 16 Mar 2017 23:40:21 GMT',
   connection: 'close' });
  return result; },
 function (nock) { 
 var result = 
 nock('https://management.azure.com:443')
   .get('/subscriptions/53d9063d-87ae-4ea8-be90-3686c3b8669f/resourceGroups/xplattestadlsrg01/providers/Microsoft.DataLakeStore/accounts?api-version=2016-11-01')
-  .reply(200, "{\"value\":[{\"properties\":{\"provisioningState\":\"Succeeded\",\"state\":\"Active\",\"endpoint\":\"xplattestadls2879.azuredatalakestore.net\",\"accountId\":\"bf72cf14-9ca5-4af6-912c-78be6473772f\",\"creationTime\":\"2016-11-11T21:54:41.2817266Z\",\"lastModifiedTime\":\"2016-11-11T21:54:41.2817266Z\"},\"location\":\"eastus2\",\"tags\":null,\"id\":\"/subscriptions/53d9063d-87ae-4ea8-be90-3686c3b8669f/resourceGroups/xplattestadlsrg01/providers/Microsoft.DataLakeStore/accounts/xplattestadls2879\",\"name\":\"xplattestadls2879\",\"type\":\"Microsoft.DataLakeStore/accounts\"},{\"properties\":{\"provisioningState\":\"Succeeded\",\"state\":\"Active\",\"endpoint\":\"xplattestadls3113.azuredatalakestore.net\",\"accountId\":\"b8dfd0da-1be0-4a39-b60d-6b60234a5d13\",\"creationTime\":\"2016-11-11T21:55:15.0555195Z\",\"lastModifiedTime\":\"2016-11-11T21:55:15.0555195Z\"},\"location\":\"eastus2\",\"tags\":{\"testtag1\":\"testvalue1\",\"testtag2\":\"testvalue2\"},\"id\":\"/subscriptions/53d9063d-87ae-4ea8-be90-3686c3b8669f/resourceGroups/xplattestadlsrg01/providers/Microsoft.DataLakeStore/accounts/xplattestadls3113\",\"name\":\"xplattestadls3113\",\"type\":\"Microsoft.DataLakeStore/accounts\"}]}", { 'cache-control': 'no-cache',
+  .reply(200, "{\"value\":[{\"properties\":{\"provisioningState\":\"Succeeded\",\"state\":\"Active\",\"endpoint\":\"xplattestadls5855.azuredatalakestore.net\",\"accountId\":\"9258c5fc-ab9b-48a6-99a5-f93d8191c07c\",\"creationTime\":\"2017-03-16T23:39:13.7101281Z\",\"lastModifiedTime\":\"2017-03-16T23:39:13.7101281Z\"},\"location\":\"eastus2\",\"tags\":null,\"id\":\"/subscriptions/53d9063d-87ae-4ea8-be90-3686c3b8669f/resourceGroups/xplattestadlsrg01/providers/Microsoft.DataLakeStore/accounts/xplattestadls5855\",\"name\":\"xplattestadls5855\",\"type\":\"Microsoft.DataLakeStore/accounts\"},{\"properties\":{\"provisioningState\":\"Succeeded\",\"state\":\"Active\",\"endpoint\":\"xplattestadls7774.azuredatalakestore.net\",\"accountId\":\"7fa7b233-ca67-470a-8c9f-4c9597e2a826\",\"creationTime\":\"2017-03-16T23:39:46.6761056Z\",\"lastModifiedTime\":\"2017-03-16T23:39:46.6761056Z\"},\"location\":\"eastus2\",\"tags\":{\"testtag1\":\"testvalue1\",\"testtag2\":\"testvalue2\"},\"id\":\"/subscriptions/53d9063d-87ae-4ea8-be90-3686c3b8669f/resourceGroups/xplattestadlsrg01/providers/Microsoft.DataLakeStore/accounts/xplattestadls7774\",\"name\":\"xplattestadls7774\",\"type\":\"Microsoft.DataLakeStore/accounts\"}]}", { 'cache-control': 'no-cache',
   pragma: 'no-cache',
   'content-length': '1100',
   'content-type': 'application/json',
   expires: '-1',
-  'x-ms-request-id': '6625bcfb-bede-4870-bdbb-620133b0f822',
+  'x-ms-request-id': 'b6f6e3f9-f44c-49e6-b45f-6fe2dcb2f52c',
   'x-content-type-options': 'nosniff',
   server: 'Microsoft-IIS/8.5',
   'x-aspnet-version': '4.0.30319',
   'x-powered-by': 'ASP.NET',
-  'x-ms-ratelimit-remaining-subscription-reads': '14997',
-  'x-ms-correlation-request-id': 'cdefa2cc-c6f5-4911-b64f-5b32d1f6983b',
-  'x-ms-routing-request-id': 'WESTUS2:20161111T215545Z:cdefa2cc-c6f5-4911-b64f-5b32d1f6983b',
+  'x-ms-ratelimit-remaining-subscription-reads': '14998',
+  'x-ms-correlation-request-id': 'bae72779-9116-4f49-9e42-24e1e3a114a6',
+  'x-ms-routing-request-id': 'CENTRALUS:20170316T234022Z:bae72779-9116-4f49-9e42-24e1e3a114a6',
   'strict-transport-security': 'max-age=31536000; includeSubDomains',
-  date: 'Fri, 11 Nov 2016 21:55:45 GMT',
+  date: 'Thu, 16 Mar 2017 23:40:21 GMT',
   connection: 'close' });
  return result; }]];
\ No newline at end of file
diff --git a/test/recordings/arm-datalake-store-tests/Data_Lake_Store_Clients_Account_and_Filesystem_Data_Lake_Store_Account_updating_the_account_should_work.nock.js b/test/recordings/arm-datalake-store-tests/Data_Lake_Store_Clients_Account_and_Filesystem_Data_Lake_Store_Account_updating_the_account_should_work.nock.js
index 6cc38a2ec9..974a6ba2d1 100644
--- a/test/recordings/arm-datalake-store-tests/Data_Lake_Store_Clients_Account_and_Filesystem_Data_Lake_Store_Account_updating_the_account_should_work.nock.js
+++ b/test/recordings/arm-datalake-store-tests/Data_Lake_Store_Clients_Account_and_Filesystem_Data_Lake_Store_Account_updating_the_account_should_work.nock.js
@@ -10,43 +10,43 @@ exports.scopes = [[function (nock) {
 var result = 
 nock('http://management.azure.com:443')
   .filteringRequestBody(function (path) { return '*';})
-.patch('/subscriptions/53d9063d-87ae-4ea8-be90-3686c3b8669f/resourceGroups/xplattestadlsrg01/providers/Microsoft.DataLakeStore/accounts/xplattestadls2879?api-version=2016-11-01', '*')
-  .reply(200, "{\"properties\":{\"firewallState\":\"Disabled\",\"firewallRules\":[],\"trustedIdProviderState\":\"Disabled\",\"trustedIdProviders\":[],\"encryptionState\":\"Enabled\",\"encryptionConfig\":{\"type\":\"ServiceManaged\"},\"provisioningState\":\"Succeeded\",\"state\":\"Active\",\"endpoint\":\"xplattestadls2879.azuredatalakestore.net\",\"accountId\":\"bf72cf14-9ca5-4af6-912c-78be6473772f\",\"creationTime\":\"2016-11-11T21:54:41.2817266Z\",\"lastModifiedTime\":\"2016-11-11T21:55:47.6389352Z\"},\"location\":\"eastus2\",\"tags\":{\"testtag1\":\"testvalue1\",\"testtag2\":\"testvalue2\",\"testtag3\":\"testvalue3\"},\"id\":\"/subscriptions/53d9063d-87ae-4ea8-be90-3686c3b8669f/resourceGroups/xplattestadlsrg01/providers/Microsoft.DataLakeStore/accounts/xplattestadls2879\",\"name\":\"xplattestadls2879\",\"type\":\"Microsoft.DataLakeStore/accounts\"}", { 'cache-control': 'no-cache',
+.patch('/subscriptions/53d9063d-87ae-4ea8-be90-3686c3b8669f/resourceGroups/xplattestadlsrg01/providers/Microsoft.DataLakeStore/accounts/xplattestadls5855?api-version=2016-11-01', '*')
+  .reply(200, "{\"properties\":{\"firewallState\":\"Disabled\",\"firewallRules\":[],\"trustedIdProviderState\":\"Disabled\",\"trustedIdProviders\":[],\"encryptionState\":\"Enabled\",\"encryptionConfig\":{\"type\":\"ServiceManaged\"},\"currentTier\":\"Consumption\",\"newTier\":\"Consumption\",\"provisioningState\":\"Succeeded\",\"state\":\"Active\",\"endpoint\":\"xplattestadls5855.azuredatalakestore.net\",\"accountId\":\"9258c5fc-ab9b-48a6-99a5-f93d8191c07c\",\"creationTime\":\"2017-03-16T23:39:13.7101281Z\",\"lastModifiedTime\":\"2017-03-16T23:40:23.3615587Z\"},\"location\":\"eastus2\",\"tags\":{\"testtag1\":\"testvalue1\",\"testtag2\":\"testvalue2\",\"testtag3\":\"testvalue3\"},\"id\":\"/subscriptions/53d9063d-87ae-4ea8-be90-3686c3b8669f/resourceGroups/xplattestadlsrg01/providers/Microsoft.DataLakeStore/accounts/xplattestadls5855\",\"name\":\"xplattestadls5855\",\"type\":\"Microsoft.DataLakeStore/accounts\"}", { 'cache-control': 'no-cache',
   pragma: 'no-cache',
-  'content-length': '769',
+  'content-length': '821',
   'content-type': 'application/json',
   expires: '-1',
-  'x-ms-request-id': '847318ad-62ec-4f34-b181-d138c4f93828',
+  'x-ms-request-id': '0b1d946b-bb9d-4719-b44d-b2be5f0b439a',
   'x-content-type-options': 'nosniff',
   server: 'Microsoft-IIS/8.5',
   'x-aspnet-version': '4.0.30319',
   'x-powered-by': 'ASP.NET',
-  'x-ms-ratelimit-remaining-subscription-writes': '1199',
-  'x-ms-correlation-request-id': '91fc4771-af99-4927-ba07-5612c464b49d',
-  'x-ms-routing-request-id': 'WESTUS2:20161111T215548Z:91fc4771-af99-4927-ba07-5612c464b49d',
+  'x-ms-ratelimit-remaining-subscription-writes': '1196',
+  'x-ms-correlation-request-id': 'f89c7614-a545-4262-a6da-078c81b6fe5d',
+  'x-ms-routing-request-id': 'CENTRALUS:20170316T234024Z:f89c7614-a545-4262-a6da-078c81b6fe5d',
   'strict-transport-security': 'max-age=31536000; includeSubDomains',
-  date: 'Fri, 11 Nov 2016 21:55:47 GMT',
+  date: 'Thu, 16 Mar 2017 23:40:24 GMT',
   connection: 'close' });
  return result; },
 function (nock) { 
 var result = 
 nock('https://management.azure.com:443')
   .filteringRequestBody(function (path) { return '*';})
-.patch('/subscriptions/53d9063d-87ae-4ea8-be90-3686c3b8669f/resourceGroups/xplattestadlsrg01/providers/Microsoft.DataLakeStore/accounts/xplattestadls2879?api-version=2016-11-01', '*')
-  .reply(200, "{\"properties\":{\"firewallState\":\"Disabled\",\"firewallRules\":[],\"trustedIdProviderState\":\"Disabled\",\"trustedIdProviders\":[],\"encryptionState\":\"Enabled\",\"encryptionConfig\":{\"type\":\"ServiceManaged\"},\"provisioningState\":\"Succeeded\",\"state\":\"Active\",\"endpoint\":\"xplattestadls2879.azuredatalakestore.net\",\"accountId\":\"bf72cf14-9ca5-4af6-912c-78be6473772f\",\"creationTime\":\"2016-11-11T21:54:41.2817266Z\",\"lastModifiedTime\":\"2016-11-11T21:55:47.6389352Z\"},\"location\":\"eastus2\",\"tags\":{\"testtag1\":\"testvalue1\",\"testtag2\":\"testvalue2\",\"testtag3\":\"testvalue3\"},\"id\":\"/subscriptions/53d9063d-87ae-4ea8-be90-3686c3b8669f/resourceGroups/xplattestadlsrg01/providers/Microsoft.DataLakeStore/accounts/xplattestadls2879\",\"name\":\"xplattestadls2879\",\"type\":\"Microsoft.DataLakeStore/accounts\"}", { 'cache-control': 'no-cache',
+.patch('/subscriptions/53d9063d-87ae-4ea8-be90-3686c3b8669f/resourceGroups/xplattestadlsrg01/providers/Microsoft.DataLakeStore/accounts/xplattestadls5855?api-version=2016-11-01', '*')
+  .reply(200, "{\"properties\":{\"firewallState\":\"Disabled\",\"firewallRules\":[],\"trustedIdProviderState\":\"Disabled\",\"trustedIdProviders\":[],\"encryptionState\":\"Enabled\",\"encryptionConfig\":{\"type\":\"ServiceManaged\"},\"currentTier\":\"Consumption\",\"newTier\":\"Consumption\",\"provisioningState\":\"Succeeded\",\"state\":\"Active\",\"endpoint\":\"xplattestadls5855.azuredatalakestore.net\",\"accountId\":\"9258c5fc-ab9b-48a6-99a5-f93d8191c07c\",\"creationTime\":\"2017-03-16T23:39:13.7101281Z\",\"lastModifiedTime\":\"2017-03-16T23:40:23.3615587Z\"},\"location\":\"eastus2\",\"tags\":{\"testtag1\":\"testvalue1\",\"testtag2\":\"testvalue2\",\"testtag3\":\"testvalue3\"},\"id\":\"/subscriptions/53d9063d-87ae-4ea8-be90-3686c3b8669f/resourceGroups/xplattestadlsrg01/providers/Microsoft.DataLakeStore/accounts/xplattestadls5855\",\"name\":\"xplattestadls5855\",\"type\":\"Microsoft.DataLakeStore/accounts\"}", { 'cache-control': 'no-cache',
   pragma: 'no-cache',
-  'content-length': '769',
+  'content-length': '821',
   'content-type': 'application/json',
   expires: '-1',
-  'x-ms-request-id': '847318ad-62ec-4f34-b181-d138c4f93828',
+  'x-ms-request-id': '0b1d946b-bb9d-4719-b44d-b2be5f0b439a',
   'x-content-type-options': 'nosniff',
   server: 'Microsoft-IIS/8.5',
   'x-aspnet-version': '4.0.30319',
   'x-powered-by': 'ASP.NET',
-  'x-ms-ratelimit-remaining-subscription-writes': '1199',
-  'x-ms-correlation-request-id': '91fc4771-af99-4927-ba07-5612c464b49d',
-  'x-ms-routing-request-id': 'WESTUS2:20161111T215548Z:91fc4771-af99-4927-ba07-5612c464b49d',
+  'x-ms-ratelimit-remaining-subscription-writes': '1196',
+  'x-ms-correlation-request-id': 'f89c7614-a545-4262-a6da-078c81b6fe5d',
+  'x-ms-routing-request-id': 'CENTRALUS:20170316T234024Z:f89c7614-a545-4262-a6da-078c81b6fe5d',
   'strict-transport-security': 'max-age=31536000; includeSubDomains',
-  date: 'Fri, 11 Nov 2016 21:55:47 GMT',
+  date: 'Thu, 16 Mar 2017 23:40:24 GMT',
   connection: 'close' });
  return result; }]];
\ No newline at end of file
diff --git a/test/recordings/arm-datalake-store-tests/Data_Lake_Store_Clients_Account_and_Filesystem_Data_Lake_Store_FileSystem_Permissions_get_set_and_delete_entry_commands_should_work.nock.js b/test/recordings/arm-datalake-store-tests/Data_Lake_Store_Clients_Account_and_Filesystem_Data_Lake_Store_FileSystem_Permissions_get_set_and_delete_entry_commands_should_work.nock.js
index f9e7b95c5d..ade362b2f1 100644
--- a/test/recordings/arm-datalake-store-tests/Data_Lake_Store_Clients_Account_and_Filesystem_Data_Lake_Store_FileSystem_Permissions_get_set_and_delete_entry_commands_should_work.nock.js
+++ b/test/recordings/arm-datalake-store-tests/Data_Lake_Store_Clients_Account_and_Filesystem_Data_Lake_Store_FileSystem_Permissions_get_set_and_delete_entry_commands_should_work.nock.js
@@ -8,239 +8,239 @@ exports.setEnvironment = function() {
 
 exports.scopes = [[function (nock) { 
 var result = 
-nock('http://xplattestadls2879.azuredatalakestore.net:443')
-  .get('/webhdfs/v1/%2F?op=MSGETACLSTATUS&api-version=2016-11-01')
-  .reply(200, "{\"AclStatus\":{\"entries\":[\"user::rwx\",\"group::rwx\",\"other::---\"],\"owner\":\"2e6c02d2-a364-4530-9137-d17403996cbf\",\"group\":\"2e6c02d2-a364-4530-9137-d17403996cbf\",\"permission\":\"770\",\"stickyBit\":false}}", { 'cache-control': 'no-cache, no-cache, no-store, max-age=0',
+nock('http://xplattestadls5855.azuredatalakestore.net:443')
+  .get('/webhdfs/v1/%2F?op=GETACLSTATUS&api-version=2016-11-01')
+  .reply(200, "{\"AclStatus\":{\"entries\":[\"group::rwx\"],\"owner\":\"2e6c02d2-a364-4530-9137-d17403996cbf\",\"group\":\"2e6c02d2-a364-4530-9137-d17403996cbf\",\"permission\":\"770\",\"stickyBit\":false}}", { 'cache-control': 'no-cache, no-cache, no-store, max-age=0',
   pragma: 'no-cache',
   'content-type': 'application/json; charset=utf-8',
   expires: '-1',
-  'x-ms-request-id': '4988f049-1233-4f63-ba08-73aaa0f8a27b',
-  'x-ms-webhdfs-version': '16.07.18.01',
+  'x-ms-request-id': '4a644e9a-8bb7-4219-be26-425a1a39898c',
+  'x-ms-webhdfs-version': '16.12.19.00',
   status: '0x0',
   'x-content-type-options': 'nosniff',
   'strict-transport-security': 'max-age=15724800; includeSubDomains',
-  date: 'Fri, 11 Nov 2016 21:56:08 GMT',
+  date: 'Thu, 16 Mar 2017 23:40:46 GMT',
   connection: 'close',
-  'content-length': '196' });
+  'content-length': '171' });
  return result; },
 function (nock) { 
 var result = 
-nock('https://xplattestadls2879.azuredatalakestore.net:443')
-  .get('/webhdfs/v1/%2F?op=MSGETACLSTATUS&api-version=2016-11-01')
-  .reply(200, "{\"AclStatus\":{\"entries\":[\"user::rwx\",\"group::rwx\",\"other::---\"],\"owner\":\"2e6c02d2-a364-4530-9137-d17403996cbf\",\"group\":\"2e6c02d2-a364-4530-9137-d17403996cbf\",\"permission\":\"770\",\"stickyBit\":false}}", { 'cache-control': 'no-cache, no-cache, no-store, max-age=0',
+nock('https://xplattestadls5855.azuredatalakestore.net:443')
+  .get('/webhdfs/v1/%2F?op=GETACLSTATUS&api-version=2016-11-01')
+  .reply(200, "{\"AclStatus\":{\"entries\":[\"group::rwx\"],\"owner\":\"2e6c02d2-a364-4530-9137-d17403996cbf\",\"group\":\"2e6c02d2-a364-4530-9137-d17403996cbf\",\"permission\":\"770\",\"stickyBit\":false}}", { 'cache-control': 'no-cache, no-cache, no-store, max-age=0',
   pragma: 'no-cache',
   'content-type': 'application/json; charset=utf-8',
   expires: '-1',
-  'x-ms-request-id': '4988f049-1233-4f63-ba08-73aaa0f8a27b',
-  'x-ms-webhdfs-version': '16.07.18.01',
+  'x-ms-request-id': '4a644e9a-8bb7-4219-be26-425a1a39898c',
+  'x-ms-webhdfs-version': '16.12.19.00',
   status: '0x0',
   'x-content-type-options': 'nosniff',
   'strict-transport-security': 'max-age=15724800; includeSubDomains',
-  date: 'Fri, 11 Nov 2016 21:56:08 GMT',
+  date: 'Thu, 16 Mar 2017 23:40:46 GMT',
   connection: 'close',
-  'content-length': '196' });
+  'content-length': '171' });
  return result; },
 function (nock) { 
 var result = 
-nock('http://xplattestadls2879.azuredatalakestore.net:443')
+nock('http://xplattestadls5855.azuredatalakestore.net:443')
   .put('/webhdfs/v1/%2F?aclspec=user%3A027c28d5-c91d-49f0-98c5-d10134b169b3%3Arwx&op=MODIFYACLENTRIES&api-version=2016-11-01')
   .reply(200, "", { 'cache-control': 'no-cache, no-cache, no-store, max-age=0',
   pragma: 'no-cache',
   expires: '-1',
-  'x-ms-request-id': '4a77126b-d0e2-46aa-b9fd-9394e055ed64',
+  'x-ms-request-id': 'c8e3dd13-59a0-41f8-b99d-8524314fce50',
   contentlength: '0',
-  'x-ms-webhdfs-version': '16.07.18.01',
+  'x-ms-webhdfs-version': '16.12.19.00',
   status: '0x0',
   'x-content-type-options': 'nosniff',
   'strict-transport-security': 'max-age=15724800; includeSubDomains',
-  date: 'Fri, 11 Nov 2016 21:56:08 GMT',
+  date: 'Thu, 16 Mar 2017 23:40:45 GMT',
   connection: 'close',
   'content-length': '0' });
  return result; },
 function (nock) { 
 var result = 
-nock('https://xplattestadls2879.azuredatalakestore.net:443')
+nock('https://xplattestadls5855.azuredatalakestore.net:443')
   .put('/webhdfs/v1/%2F?aclspec=user%3A027c28d5-c91d-49f0-98c5-d10134b169b3%3Arwx&op=MODIFYACLENTRIES&api-version=2016-11-01')
   .reply(200, "", { 'cache-control': 'no-cache, no-cache, no-store, max-age=0',
   pragma: 'no-cache',
   expires: '-1',
-  'x-ms-request-id': '4a77126b-d0e2-46aa-b9fd-9394e055ed64',
+  'x-ms-request-id': 'c8e3dd13-59a0-41f8-b99d-8524314fce50',
   contentlength: '0',
-  'x-ms-webhdfs-version': '16.07.18.01',
+  'x-ms-webhdfs-version': '16.12.19.00',
   status: '0x0',
   'x-content-type-options': 'nosniff',
   'strict-transport-security': 'max-age=15724800; includeSubDomains',
-  date: 'Fri, 11 Nov 2016 21:56:08 GMT',
+  date: 'Thu, 16 Mar 2017 23:40:45 GMT',
   connection: 'close',
   'content-length': '0' });
  return result; },
 function (nock) { 
 var result = 
-nock('http://xplattestadls2879.azuredatalakestore.net:443')
-  .get('/webhdfs/v1/%2F?op=MSGETACLSTATUS&api-version=2016-11-01')
-  .reply(200, "{\"AclStatus\":{\"entries\":[\"user::rwx\",\"user:027c28d5-c91d-49f0-98c5-d10134b169b3:rwx\",\"group::rwx\",\"mask::rwx\",\"other::---\"],\"owner\":\"2e6c02d2-a364-4530-9137-d17403996cbf\",\"group\":\"2e6c02d2-a364-4530-9137-d17403996cbf\",\"permission\":\"770\",\"stickyBit\":false}}", { 'cache-control': 'no-cache, no-cache, no-store, max-age=0',
+nock('http://xplattestadls5855.azuredatalakestore.net:443')
+  .get('/webhdfs/v1/%2F?op=GETACLSTATUS&api-version=2016-11-01')
+  .reply(200, "{\"AclStatus\":{\"entries\":[\"user:027c28d5-c91d-49f0-98c5-d10134b169b3:rwx\",\"group::rwx\"],\"owner\":\"2e6c02d2-a364-4530-9137-d17403996cbf\",\"group\":\"2e6c02d2-a364-4530-9137-d17403996cbf\",\"permission\":\"770\",\"stickyBit\":false}}", { 'cache-control': 'no-cache, no-cache, no-store, max-age=0',
   pragma: 'no-cache',
   'content-type': 'application/json; charset=utf-8',
   expires: '-1',
-  'x-ms-request-id': '91339d21-7de1-4831-b829-c4d871369142',
-  'x-ms-webhdfs-version': '16.07.18.01',
+  'x-ms-request-id': 'c533475a-e6f5-4923-bbe2-bf1eebe813df',
+  'x-ms-webhdfs-version': '16.12.19.00',
   status: '0x0',
   'x-content-type-options': 'nosniff',
   'strict-transport-security': 'max-age=15724800; includeSubDomains',
-  date: 'Fri, 11 Nov 2016 21:56:09 GMT',
+  date: 'Thu, 16 Mar 2017 23:40:46 GMT',
   connection: 'close',
-  'content-length': '256' });
+  'content-length': '219' });
  return result; },
 function (nock) { 
 var result = 
-nock('https://xplattestadls2879.azuredatalakestore.net:443')
-  .get('/webhdfs/v1/%2F?op=MSGETACLSTATUS&api-version=2016-11-01')
-  .reply(200, "{\"AclStatus\":{\"entries\":[\"user::rwx\",\"user:027c28d5-c91d-49f0-98c5-d10134b169b3:rwx\",\"group::rwx\",\"mask::rwx\",\"other::---\"],\"owner\":\"2e6c02d2-a364-4530-9137-d17403996cbf\",\"group\":\"2e6c02d2-a364-4530-9137-d17403996cbf\",\"permission\":\"770\",\"stickyBit\":false}}", { 'cache-control': 'no-cache, no-cache, no-store, max-age=0',
+nock('https://xplattestadls5855.azuredatalakestore.net:443')
+  .get('/webhdfs/v1/%2F?op=GETACLSTATUS&api-version=2016-11-01')
+  .reply(200, "{\"AclStatus\":{\"entries\":[\"user:027c28d5-c91d-49f0-98c5-d10134b169b3:rwx\",\"group::rwx\"],\"owner\":\"2e6c02d2-a364-4530-9137-d17403996cbf\",\"group\":\"2e6c02d2-a364-4530-9137-d17403996cbf\",\"permission\":\"770\",\"stickyBit\":false}}", { 'cache-control': 'no-cache, no-cache, no-store, max-age=0',
   pragma: 'no-cache',
   'content-type': 'application/json; charset=utf-8',
   expires: '-1',
-  'x-ms-request-id': '91339d21-7de1-4831-b829-c4d871369142',
-  'x-ms-webhdfs-version': '16.07.18.01',
+  'x-ms-request-id': 'c533475a-e6f5-4923-bbe2-bf1eebe813df',
+  'x-ms-webhdfs-version': '16.12.19.00',
   status: '0x0',
   'x-content-type-options': 'nosniff',
   'strict-transport-security': 'max-age=15724800; includeSubDomains',
-  date: 'Fri, 11 Nov 2016 21:56:09 GMT',
+  date: 'Thu, 16 Mar 2017 23:40:46 GMT',
   connection: 'close',
-  'content-length': '256' });
+  'content-length': '219' });
  return result; },
 function (nock) { 
 var result = 
-nock('http://xplattestadls2879.azuredatalakestore.net:443')
+nock('http://xplattestadls5855.azuredatalakestore.net:443')
   .put('/webhdfs/v1/%2F?aclspec=user%3A027c28d5-c91d-49f0-98c5-d10134b169b3%3A-w-&op=MODIFYACLENTRIES&api-version=2016-11-01')
   .reply(200, "", { 'cache-control': 'no-cache, no-cache, no-store, max-age=0',
   pragma: 'no-cache',
   expires: '-1',
-  'x-ms-request-id': 'b1931d10-1ee7-404e-8c37-666060a2edd4',
+  'x-ms-request-id': '34e30e70-9dee-4b4b-aab5-132377de3fbd',
   contentlength: '0',
-  'x-ms-webhdfs-version': '16.07.18.01',
+  'x-ms-webhdfs-version': '16.12.19.00',
   status: '0x0',
   'x-content-type-options': 'nosniff',
   'strict-transport-security': 'max-age=15724800; includeSubDomains',
-  date: 'Fri, 11 Nov 2016 21:56:08 GMT',
+  date: 'Thu, 16 Mar 2017 23:40:47 GMT',
   connection: 'close',
   'content-length': '0' });
  return result; },
 function (nock) { 
 var result = 
-nock('https://xplattestadls2879.azuredatalakestore.net:443')
+nock('https://xplattestadls5855.azuredatalakestore.net:443')
   .put('/webhdfs/v1/%2F?aclspec=user%3A027c28d5-c91d-49f0-98c5-d10134b169b3%3A-w-&op=MODIFYACLENTRIES&api-version=2016-11-01')
   .reply(200, "", { 'cache-control': 'no-cache, no-cache, no-store, max-age=0',
   pragma: 'no-cache',
   expires: '-1',
-  'x-ms-request-id': 'b1931d10-1ee7-404e-8c37-666060a2edd4',
+  'x-ms-request-id': '34e30e70-9dee-4b4b-aab5-132377de3fbd',
   contentlength: '0',
-  'x-ms-webhdfs-version': '16.07.18.01',
+  'x-ms-webhdfs-version': '16.12.19.00',
   status: '0x0',
   'x-content-type-options': 'nosniff',
   'strict-transport-security': 'max-age=15724800; includeSubDomains',
-  date: 'Fri, 11 Nov 2016 21:56:08 GMT',
+  date: 'Thu, 16 Mar 2017 23:40:47 GMT',
   connection: 'close',
   'content-length': '0' });
  return result; },
 function (nock) { 
 var result = 
-nock('http://xplattestadls2879.azuredatalakestore.net:443')
-  .get('/webhdfs/v1/%2F?op=MSGETACLSTATUS&api-version=2016-11-01')
-  .reply(200, "{\"AclStatus\":{\"entries\":[\"user::rwx\",\"user:027c28d5-c91d-49f0-98c5-d10134b169b3:-w-\",\"group::rwx\",\"mask::rwx\",\"other::---\"],\"owner\":\"2e6c02d2-a364-4530-9137-d17403996cbf\",\"group\":\"2e6c02d2-a364-4530-9137-d17403996cbf\",\"permission\":\"770\",\"stickyBit\":false}}", { 'cache-control': 'no-cache, no-cache, no-store, max-age=0',
+nock('http://xplattestadls5855.azuredatalakestore.net:443')
+  .get('/webhdfs/v1/%2F?op=GETACLSTATUS&api-version=2016-11-01')
+  .reply(200, "{\"AclStatus\":{\"entries\":[\"user:027c28d5-c91d-49f0-98c5-d10134b169b3:-w-\",\"group::rwx\"],\"owner\":\"2e6c02d2-a364-4530-9137-d17403996cbf\",\"group\":\"2e6c02d2-a364-4530-9137-d17403996cbf\",\"permission\":\"770\",\"stickyBit\":false}}", { 'cache-control': 'no-cache, no-cache, no-store, max-age=0',
   pragma: 'no-cache',
   'content-type': 'application/json; charset=utf-8',
   expires: '-1',
-  'x-ms-request-id': '117b3544-4a1f-4696-90be-3c52ffbf95ba',
-  'x-ms-webhdfs-version': '16.07.18.01',
+  'x-ms-request-id': 'e27e76bb-85ce-42db-b2f7-2bcea86d0cfe',
+  'x-ms-webhdfs-version': '16.12.19.00',
   status: '0x0',
   'x-content-type-options': 'nosniff',
   'strict-transport-security': 'max-age=15724800; includeSubDomains',
-  date: 'Fri, 11 Nov 2016 21:56:10 GMT',
+  date: 'Thu, 16 Mar 2017 23:40:47 GMT',
   connection: 'close',
-  'content-length': '256' });
+  'content-length': '219' });
  return result; },
 function (nock) { 
 var result = 
-nock('https://xplattestadls2879.azuredatalakestore.net:443')
-  .get('/webhdfs/v1/%2F?op=MSGETACLSTATUS&api-version=2016-11-01')
-  .reply(200, "{\"AclStatus\":{\"entries\":[\"user::rwx\",\"user:027c28d5-c91d-49f0-98c5-d10134b169b3:-w-\",\"group::rwx\",\"mask::rwx\",\"other::---\"],\"owner\":\"2e6c02d2-a364-4530-9137-d17403996cbf\",\"group\":\"2e6c02d2-a364-4530-9137-d17403996cbf\",\"permission\":\"770\",\"stickyBit\":false}}", { 'cache-control': 'no-cache, no-cache, no-store, max-age=0',
+nock('https://xplattestadls5855.azuredatalakestore.net:443')
+  .get('/webhdfs/v1/%2F?op=GETACLSTATUS&api-version=2016-11-01')
+  .reply(200, "{\"AclStatus\":{\"entries\":[\"user:027c28d5-c91d-49f0-98c5-d10134b169b3:-w-\",\"group::rwx\"],\"owner\":\"2e6c02d2-a364-4530-9137-d17403996cbf\",\"group\":\"2e6c02d2-a364-4530-9137-d17403996cbf\",\"permission\":\"770\",\"stickyBit\":false}}", { 'cache-control': 'no-cache, no-cache, no-store, max-age=0',
   pragma: 'no-cache',
   'content-type': 'application/json; charset=utf-8',
   expires: '-1',
-  'x-ms-request-id': '117b3544-4a1f-4696-90be-3c52ffbf95ba',
-  'x-ms-webhdfs-version': '16.07.18.01',
+  'x-ms-request-id': 'e27e76bb-85ce-42db-b2f7-2bcea86d0cfe',
+  'x-ms-webhdfs-version': '16.12.19.00',
   status: '0x0',
   'x-content-type-options': 'nosniff',
   'strict-transport-security': 'max-age=15724800; includeSubDomains',
-  date: 'Fri, 11 Nov 2016 21:56:10 GMT',
+  date: 'Thu, 16 Mar 2017 23:40:47 GMT',
   connection: 'close',
-  'content-length': '256' });
+  'content-length': '219' });
  return result; },
 function (nock) { 
 var result = 
-nock('http://xplattestadls2879.azuredatalakestore.net:443')
+nock('http://xplattestadls5855.azuredatalakestore.net:443')
   .put('/webhdfs/v1/%2F?aclspec=user%3A027c28d5-c91d-49f0-98c5-d10134b169b3&op=REMOVEACLENTRIES&api-version=2016-11-01')
   .reply(200, "", { 'cache-control': 'no-cache, no-cache, no-store, max-age=0',
   pragma: 'no-cache',
   expires: '-1',
-  'x-ms-request-id': '7d78277a-41b2-49ff-b6f1-d0f4286594b3',
+  'x-ms-request-id': '836dd4ce-04b0-467a-87c6-2a940e7e4889',
   contentlength: '0',
-  'x-ms-webhdfs-version': '16.07.18.01',
+  'x-ms-webhdfs-version': '16.12.19.00',
   status: '0x0',
   'x-content-type-options': 'nosniff',
   'strict-transport-security': 'max-age=15724800; includeSubDomains',
-  date: 'Fri, 11 Nov 2016 21:56:10 GMT',
+  date: 'Thu, 16 Mar 2017 23:40:48 GMT',
   connection: 'close',
   'content-length': '0' });
  return result; },
 function (nock) { 
 var result = 
-nock('https://xplattestadls2879.azuredatalakestore.net:443')
+nock('https://xplattestadls5855.azuredatalakestore.net:443')
   .put('/webhdfs/v1/%2F?aclspec=user%3A027c28d5-c91d-49f0-98c5-d10134b169b3&op=REMOVEACLENTRIES&api-version=2016-11-01')
   .reply(200, "", { 'cache-control': 'no-cache, no-cache, no-store, max-age=0',
   pragma: 'no-cache',
   expires: '-1',
-  'x-ms-request-id': '7d78277a-41b2-49ff-b6f1-d0f4286594b3',
+  'x-ms-request-id': '836dd4ce-04b0-467a-87c6-2a940e7e4889',
   contentlength: '0',
-  'x-ms-webhdfs-version': '16.07.18.01',
+  'x-ms-webhdfs-version': '16.12.19.00',
   status: '0x0',
   'x-content-type-options': 'nosniff',
   'strict-transport-security': 'max-age=15724800; includeSubDomains',
-  date: 'Fri, 11 Nov 2016 21:56:10 GMT',
+  date: 'Thu, 16 Mar 2017 23:40:48 GMT',
   connection: 'close',
   'content-length': '0' });
  return result; },
 function (nock) { 
 var result = 
-nock('http://xplattestadls2879.azuredatalakestore.net:443')
-  .get('/webhdfs/v1/%2F?op=MSGETACLSTATUS&api-version=2016-11-01')
-  .reply(200, "{\"AclStatus\":{\"entries\":[\"user::rwx\",\"group::rwx\",\"mask::rwx\",\"other::---\"],\"owner\":\"2e6c02d2-a364-4530-9137-d17403996cbf\",\"group\":\"2e6c02d2-a364-4530-9137-d17403996cbf\",\"permission\":\"770\",\"stickyBit\":false}}", { 'cache-control': 'no-cache, no-cache, no-store, max-age=0',
+nock('http://xplattestadls5855.azuredatalakestore.net:443')
+  .get('/webhdfs/v1/%2F?op=GETACLSTATUS&api-version=2016-11-01')
+  .reply(200, "{\"AclStatus\":{\"entries\":[\"group::rwx\"],\"owner\":\"2e6c02d2-a364-4530-9137-d17403996cbf\",\"group\":\"2e6c02d2-a364-4530-9137-d17403996cbf\",\"permission\":\"770\",\"stickyBit\":false}}", { 'cache-control': 'no-cache, no-cache, no-store, max-age=0',
   pragma: 'no-cache',
   'content-type': 'application/json; charset=utf-8',
   expires: '-1',
-  'x-ms-request-id': 'b5ac900f-f911-4ed9-ad2a-ae00ff76013f',
-  'x-ms-webhdfs-version': '16.07.18.01',
+  'x-ms-request-id': '762845b3-a128-4c90-b510-14401a26f39b',
+  'x-ms-webhdfs-version': '16.12.19.00',
   status: '0x0',
   'x-content-type-options': 'nosniff',
   'strict-transport-security': 'max-age=15724800; includeSubDomains',
-  date: 'Fri, 11 Nov 2016 21:56:10 GMT',
+  date: 'Thu, 16 Mar 2017 23:40:48 GMT',
   connection: 'close',
-  'content-length': '208' });
+  'content-length': '171' });
  return result; },
 function (nock) { 
 var result = 
-nock('https://xplattestadls2879.azuredatalakestore.net:443')
-  .get('/webhdfs/v1/%2F?op=MSGETACLSTATUS&api-version=2016-11-01')
-  .reply(200, "{\"AclStatus\":{\"entries\":[\"user::rwx\",\"group::rwx\",\"mask::rwx\",\"other::---\"],\"owner\":\"2e6c02d2-a364-4530-9137-d17403996cbf\",\"group\":\"2e6c02d2-a364-4530-9137-d17403996cbf\",\"permission\":\"770\",\"stickyBit\":false}}", { 'cache-control': 'no-cache, no-cache, no-store, max-age=0',
+nock('https://xplattestadls5855.azuredatalakestore.net:443')
+  .get('/webhdfs/v1/%2F?op=GETACLSTATUS&api-version=2016-11-01')
+  .reply(200, "{\"AclStatus\":{\"entries\":[\"group::rwx\"],\"owner\":\"2e6c02d2-a364-4530-9137-d17403996cbf\",\"group\":\"2e6c02d2-a364-4530-9137-d17403996cbf\",\"permission\":\"770\",\"stickyBit\":false}}", { 'cache-control': 'no-cache, no-cache, no-store, max-age=0',
   pragma: 'no-cache',
   'content-type': 'application/json; charset=utf-8',
   expires: '-1',
-  'x-ms-request-id': 'b5ac900f-f911-4ed9-ad2a-ae00ff76013f',
-  'x-ms-webhdfs-version': '16.07.18.01',
+  'x-ms-request-id': '762845b3-a128-4c90-b510-14401a26f39b',
+  'x-ms-webhdfs-version': '16.12.19.00',
   status: '0x0',
   'x-content-type-options': 'nosniff',
   'strict-transport-security': 'max-age=15724800; includeSubDomains',
-  date: 'Fri, 11 Nov 2016 21:56:10 GMT',
+  date: 'Thu, 16 Mar 2017 23:40:48 GMT',
   connection: 'close',
-  'content-length': '208' });
+  'content-length': '171' });
  return result; }]];
\ No newline at end of file
diff --git a/test/recordings/arm-datalake-store-tests/Data_Lake_Store_Clients_Account_and_Filesystem_Data_Lake_Store_FileSystem_Permissions_show_set_and_delete_full_ACL_commands_should_work.nock.js b/test/recordings/arm-datalake-store-tests/Data_Lake_Store_Clients_Account_and_Filesystem_Data_Lake_Store_FileSystem_Permissions_show_set_and_delete_full_ACL_commands_should_work.nock.js
index c6da9df21c..bc26a9ff3b 100644
--- a/test/recordings/arm-datalake-store-tests/Data_Lake_Store_Clients_Account_and_Filesystem_Data_Lake_Store_FileSystem_Permissions_show_set_and_delete_full_ACL_commands_should_work.nock.js
+++ b/test/recordings/arm-datalake-store-tests/Data_Lake_Store_Clients_Account_and_Filesystem_Data_Lake_Store_FileSystem_Permissions_show_set_and_delete_full_ACL_commands_should_work.nock.js
@@ -8,103 +8,103 @@ exports.setEnvironment = function() {
 
 exports.scopes = [[function (nock) { 
 var result = 
-nock('http://xplattestadls2879.azuredatalakestore.net:443')
-  .get('/webhdfs/v1/%2F?op=MSGETACLSTATUS&api-version=2016-11-01')
-  .reply(200, "{\"AclStatus\":{\"entries\":[\"user::rwx\",\"group::rwx\",\"mask::rwx\",\"other::---\"],\"owner\":\"2e6c02d2-a364-4530-9137-d17403996cbf\",\"group\":\"2e6c02d2-a364-4530-9137-d17403996cbf\",\"permission\":\"770\",\"stickyBit\":false}}", { 'cache-control': 'no-cache, no-cache, no-store, max-age=0',
+nock('http://xplattestadls5855.azuredatalakestore.net:443')
+  .get('/webhdfs/v1/%2F?op=GETACLSTATUS&api-version=2016-11-01')
+  .reply(200, "{\"AclStatus\":{\"entries\":[\"group::rwx\"],\"owner\":\"2e6c02d2-a364-4530-9137-d17403996cbf\",\"group\":\"2e6c02d2-a364-4530-9137-d17403996cbf\",\"permission\":\"770\",\"stickyBit\":false}}", { 'cache-control': 'no-cache, no-cache, no-store, max-age=0',
   pragma: 'no-cache',
   'content-type': 'application/json; charset=utf-8',
   expires: '-1',
-  'x-ms-request-id': '28d855ec-b85b-4c7f-9491-3c36bf583243',
-  'x-ms-webhdfs-version': '16.07.18.01',
+  'x-ms-request-id': 'b097a26e-ce54-4576-8322-c130cd30bab5',
+  'x-ms-webhdfs-version': '16.12.19.00',
   status: '0x0',
   'x-content-type-options': 'nosniff',
   'strict-transport-security': 'max-age=15724800; includeSubDomains',
-  date: 'Fri, 11 Nov 2016 21:56:10 GMT',
+  date: 'Thu, 16 Mar 2017 23:40:48 GMT',
   connection: 'close',
-  'content-length': '208' });
+  'content-length': '171' });
  return result; },
 function (nock) { 
 var result = 
-nock('https://xplattestadls2879.azuredatalakestore.net:443')
-  .get('/webhdfs/v1/%2F?op=MSGETACLSTATUS&api-version=2016-11-01')
-  .reply(200, "{\"AclStatus\":{\"entries\":[\"user::rwx\",\"group::rwx\",\"mask::rwx\",\"other::---\"],\"owner\":\"2e6c02d2-a364-4530-9137-d17403996cbf\",\"group\":\"2e6c02d2-a364-4530-9137-d17403996cbf\",\"permission\":\"770\",\"stickyBit\":false}}", { 'cache-control': 'no-cache, no-cache, no-store, max-age=0',
+nock('https://xplattestadls5855.azuredatalakestore.net:443')
+  .get('/webhdfs/v1/%2F?op=GETACLSTATUS&api-version=2016-11-01')
+  .reply(200, "{\"AclStatus\":{\"entries\":[\"group::rwx\"],\"owner\":\"2e6c02d2-a364-4530-9137-d17403996cbf\",\"group\":\"2e6c02d2-a364-4530-9137-d17403996cbf\",\"permission\":\"770\",\"stickyBit\":false}}", { 'cache-control': 'no-cache, no-cache, no-store, max-age=0',
   pragma: 'no-cache',
   'content-type': 'application/json; charset=utf-8',
   expires: '-1',
-  'x-ms-request-id': '28d855ec-b85b-4c7f-9491-3c36bf583243',
-  'x-ms-webhdfs-version': '16.07.18.01',
+  'x-ms-request-id': 'b097a26e-ce54-4576-8322-c130cd30bab5',
+  'x-ms-webhdfs-version': '16.12.19.00',
   status: '0x0',
   'x-content-type-options': 'nosniff',
   'strict-transport-security': 'max-age=15724800; includeSubDomains',
-  date: 'Fri, 11 Nov 2016 21:56:10 GMT',
+  date: 'Thu, 16 Mar 2017 23:40:48 GMT',
   connection: 'close',
-  'content-length': '208' });
+  'content-length': '171' });
  return result; },
 function (nock) { 
 var result = 
-nock('http://xplattestadls2879.azuredatalakestore.net:443')
-  .put('/webhdfs/v1/%2F?aclspec=user%3A%3Arwx%2Cgroup%3A%3Arwx%2Cmask%3A%3Arwx%2Cother%3A%3A---%2Cdefault%3Auser%3A027c28d5-c91d-49f0-98c5-d10134b169b3%3Arwx&op=SETACL&api-version=2016-11-01')
+nock('http://xplattestadls5855.azuredatalakestore.net:443')
+  .put('/webhdfs/v1/%2F?aclspec=group%3A%3Arwx%2Cdefault%3Auser%3A027c28d5-c91d-49f0-98c5-d10134b169b3%3Arwx%2Cuser%3A%3Arwx%2Cother%3A%3A---%2Cmask%3A%3Arwx&op=SETACL&api-version=2016-11-01')
   .reply(200, "", { 'cache-control': 'no-cache, no-cache, no-store, max-age=0',
   pragma: 'no-cache',
   expires: '-1',
-  'x-ms-request-id': '21de302c-8052-495b-ab13-777af95c1af2',
+  'x-ms-request-id': 'dc4b2952-c23e-4596-83f8-4f9a28590014',
   contentlength: '0',
-  'x-ms-webhdfs-version': '16.07.18.01',
+  'x-ms-webhdfs-version': '16.12.19.00',
   status: '0x0',
   'x-content-type-options': 'nosniff',
   'strict-transport-security': 'max-age=15724800; includeSubDomains',
-  date: 'Fri, 11 Nov 2016 21:56:11 GMT',
+  date: 'Thu, 16 Mar 2017 23:40:48 GMT',
   connection: 'close',
   'content-length': '0' });
  return result; },
 function (nock) { 
 var result = 
-nock('https://xplattestadls2879.azuredatalakestore.net:443')
-  .put('/webhdfs/v1/%2F?aclspec=user%3A%3Arwx%2Cgroup%3A%3Arwx%2Cmask%3A%3Arwx%2Cother%3A%3A---%2Cdefault%3Auser%3A027c28d5-c91d-49f0-98c5-d10134b169b3%3Arwx&op=SETACL&api-version=2016-11-01')
+nock('https://xplattestadls5855.azuredatalakestore.net:443')
+  .put('/webhdfs/v1/%2F?aclspec=group%3A%3Arwx%2Cdefault%3Auser%3A027c28d5-c91d-49f0-98c5-d10134b169b3%3Arwx%2Cuser%3A%3Arwx%2Cother%3A%3A---%2Cmask%3A%3Arwx&op=SETACL&api-version=2016-11-01')
   .reply(200, "", { 'cache-control': 'no-cache, no-cache, no-store, max-age=0',
   pragma: 'no-cache',
   expires: '-1',
-  'x-ms-request-id': '21de302c-8052-495b-ab13-777af95c1af2',
+  'x-ms-request-id': 'dc4b2952-c23e-4596-83f8-4f9a28590014',
   contentlength: '0',
-  'x-ms-webhdfs-version': '16.07.18.01',
+  'x-ms-webhdfs-version': '16.12.19.00',
   status: '0x0',
   'x-content-type-options': 'nosniff',
   'strict-transport-security': 'max-age=15724800; includeSubDomains',
-  date: 'Fri, 11 Nov 2016 21:56:11 GMT',
+  date: 'Thu, 16 Mar 2017 23:40:48 GMT',
   connection: 'close',
   'content-length': '0' });
  return result; },
 function (nock) { 
 var result = 
-nock('http://xplattestadls2879.azuredatalakestore.net:443')
-  .get('/webhdfs/v1/%2F?op=MSGETACLSTATUS&api-version=2016-11-01')
-  .reply(200, "{\"AclStatus\":{\"entries\":[\"user::rwx\",\"group::rwx\",\"mask::rwx\",\"other::---\",\"default:user::rwx\",\"default:user:027c28d5-c91d-49f0-98c5-d10134b169b3:rwx\",\"default:group::rwx\",\"default:mask::rwx\",\"default:other::---\"],\"owner\":\"2e6c02d2-a364-4530-9137-d17403996cbf\",\"group\":\"2e6c02d2-a364-4530-9137-d17403996cbf\",\"permission\":\"770\",\"stickyBit\":false}}", { 'cache-control': 'no-cache, no-cache, no-store, max-age=0',
+nock('http://xplattestadls5855.azuredatalakestore.net:443')
+  .get('/webhdfs/v1/%2F?op=GETACLSTATUS&api-version=2016-11-01')
+  .reply(200, "{\"AclStatus\":{\"entries\":[\"group::rwx\",\"default:user::rwx\",\"default:user:027c28d5-c91d-49f0-98c5-d10134b169b3:rwx\",\"default:group::rwx\",\"default:mask::rwx\",\"default:other::---\"],\"owner\":\"2e6c02d2-a364-4530-9137-d17403996cbf\",\"group\":\"2e6c02d2-a364-4530-9137-d17403996cbf\",\"permission\":\"770\",\"stickyBit\":false}}", { 'cache-control': 'no-cache, no-cache, no-store, max-age=0',
   pragma: 'no-cache',
   'content-type': 'application/json; charset=utf-8',
   expires: '-1',
-  'x-ms-request-id': '941b19dc-637b-4ac2-b896-54e2820584cc',
-  'x-ms-webhdfs-version': '16.07.18.01',
+  'x-ms-request-id': '1be14e9e-020c-4c30-b1dc-f5e1fa728c52',
+  'x-ms-webhdfs-version': '16.12.19.00',
   status: '0x0',
   'x-content-type-options': 'nosniff',
   'strict-transport-security': 'max-age=15724800; includeSubDomains',
-  date: 'Fri, 11 Nov 2016 21:56:11 GMT',
+  date: 'Thu, 16 Mar 2017 23:40:49 GMT',
   connection: 'close',
-  'content-length': '346' });
+  'content-length': '309' });
  return result; },
 function (nock) { 
 var result = 
-nock('https://xplattestadls2879.azuredatalakestore.net:443')
-  .get('/webhdfs/v1/%2F?op=MSGETACLSTATUS&api-version=2016-11-01')
-  .reply(200, "{\"AclStatus\":{\"entries\":[\"user::rwx\",\"group::rwx\",\"mask::rwx\",\"other::---\",\"default:user::rwx\",\"default:user:027c28d5-c91d-49f0-98c5-d10134b169b3:rwx\",\"default:group::rwx\",\"default:mask::rwx\",\"default:other::---\"],\"owner\":\"2e6c02d2-a364-4530-9137-d17403996cbf\",\"group\":\"2e6c02d2-a364-4530-9137-d17403996cbf\",\"permission\":\"770\",\"stickyBit\":false}}", { 'cache-control': 'no-cache, no-cache, no-store, max-age=0',
+nock('https://xplattestadls5855.azuredatalakestore.net:443')
+  .get('/webhdfs/v1/%2F?op=GETACLSTATUS&api-version=2016-11-01')
+  .reply(200, "{\"AclStatus\":{\"entries\":[\"group::rwx\",\"default:user::rwx\",\"default:user:027c28d5-c91d-49f0-98c5-d10134b169b3:rwx\",\"default:group::rwx\",\"default:mask::rwx\",\"default:other::---\"],\"owner\":\"2e6c02d2-a364-4530-9137-d17403996cbf\",\"group\":\"2e6c02d2-a364-4530-9137-d17403996cbf\",\"permission\":\"770\",\"stickyBit\":false}}", { 'cache-control': 'no-cache, no-cache, no-store, max-age=0',
   pragma: 'no-cache',
   'content-type': 'application/json; charset=utf-8',
   expires: '-1',
-  'x-ms-request-id': '941b19dc-637b-4ac2-b896-54e2820584cc',
-  'x-ms-webhdfs-version': '16.07.18.01',
+  'x-ms-request-id': '1be14e9e-020c-4c30-b1dc-f5e1fa728c52',
+  'x-ms-webhdfs-version': '16.12.19.00',
   status: '0x0',
   'x-content-type-options': 'nosniff',
   'strict-transport-security': 'max-age=15724800; includeSubDomains',
-  date: 'Fri, 11 Nov 2016 21:56:11 GMT',
+  date: 'Thu, 16 Mar 2017 23:40:49 GMT',
   connection: 'close',
-  'content-length': '346' });
+  'content-length': '309' });
  return result; }]];
\ No newline at end of file
diff --git a/test/recordings/arm-datalake-store-tests/Data_Lake_Store_Clients_Account_and_Filesystem_Data_Lake_Store_FileSystem_add_content_should_work.nock.js b/test/recordings/arm-datalake-store-tests/Data_Lake_Store_Clients_Account_and_Filesystem_Data_Lake_Store_FileSystem_add_content_should_work.nock.js
index 3860e9e751..e73fb54233 100644
--- a/test/recordings/arm-datalake-store-tests/Data_Lake_Store_Clients_Account_and_Filesystem_Data_Lake_Store_FileSystem_add_content_should_work.nock.js
+++ b/test/recordings/arm-datalake-store-tests/Data_Lake_Store_Clients_Account_and_Filesystem_Data_Lake_Store_FileSystem_add_content_should_work.nock.js
@@ -8,69 +8,69 @@ exports.setEnvironment = function() {
 
 exports.scopes = [[function (nock) { 
 var result = 
-nock('http://xplattestadls2879.azuredatalakestore.net:443')
+nock('http://xplattestadls5855.azuredatalakestore.net:443')
   .filteringRequestBody(function (path) { return '*';})
 .post('/webhdfs/v1/adlssdkfolder01%2Femptyfile.txt?syncFlag=CLOSE&op=APPEND&append=true&api-version=2016-11-01', '*')
   .reply(200, "", { 'cache-control': 'no-cache, no-cache, no-store, max-age=0',
   pragma: 'no-cache',
   expires: '-1',
-  'x-ms-request-id': '79595853-b4f7-4d5a-afac-e133093b2a30',
-  'x-ms-webhdfs-version': '16.07.18.01',
+  'x-ms-request-id': 'f047fb37-fd5f-46a4-83cd-f98711c1d1d8',
+  'x-ms-webhdfs-version': '16.12.19.00',
   status: '0x0',
   'x-content-type-options': 'nosniff',
   'strict-transport-security': 'max-age=15724800; includeSubDomains',
-  date: 'Fri, 11 Nov 2016 21:55:56 GMT',
+  date: 'Thu, 16 Mar 2017 23:40:31 GMT',
   connection: 'close',
   'content-length': '0' });
  return result; },
 function (nock) { 
 var result = 
-nock('https://xplattestadls2879.azuredatalakestore.net:443')
+nock('https://xplattestadls5855.azuredatalakestore.net:443')
   .filteringRequestBody(function (path) { return '*';})
 .post('/webhdfs/v1/adlssdkfolder01%2Femptyfile.txt?syncFlag=CLOSE&op=APPEND&append=true&api-version=2016-11-01', '*')
   .reply(200, "", { 'cache-control': 'no-cache, no-cache, no-store, max-age=0',
   pragma: 'no-cache',
   expires: '-1',
-  'x-ms-request-id': '79595853-b4f7-4d5a-afac-e133093b2a30',
-  'x-ms-webhdfs-version': '16.07.18.01',
+  'x-ms-request-id': 'f047fb37-fd5f-46a4-83cd-f98711c1d1d8',
+  'x-ms-webhdfs-version': '16.12.19.00',
   status: '0x0',
   'x-content-type-options': 'nosniff',
   'strict-transport-security': 'max-age=15724800; includeSubDomains',
-  date: 'Fri, 11 Nov 2016 21:55:56 GMT',
+  date: 'Thu, 16 Mar 2017 23:40:31 GMT',
   connection: 'close',
   'content-length': '0' });
  return result; },
 function (nock) { 
 var result = 
-nock('http://xplattestadls2879.azuredatalakestore.net:443')
-  .get('/webhdfs/v1/adlssdkfolder01%2Femptyfile.txt?op=MSGETFILESTATUS&api-version=2016-11-01')
-  .reply(200, "{\"FileStatus\":{\"length\":22,\"pathSuffix\":\"\",\"type\":\"FILE\",\"blockSize\":268435456,\"accessTime\":1478901354204,\"modificationTime\":1478901356618,\"replication\":1,\"permission\":\"770\",\"owner\":\"2e6c02d2-a364-4530-9137-d17403996cbf\",\"group\":\"2e6c02d2-a364-4530-9137-d17403996cbf\",\"expirationTime\":0}}", { 'cache-control': 'no-cache, no-cache, no-store, max-age=0',
+nock('http://xplattestadls5855.azuredatalakestore.net:443')
+  .get('/webhdfs/v1/adlssdkfolder01%2Femptyfile.txt?op=GETFILESTATUS&api-version=2016-11-01')
+  .reply(200, "{\"FileStatus\":{\"length\":22,\"pathSuffix\":\"\",\"type\":\"FILE\",\"blockSize\":268435456,\"accessTime\":1489707629330,\"modificationTime\":1489707632023,\"replication\":1,\"permission\":\"770\",\"owner\":\"2e6c02d2-a364-4530-9137-d17403996cbf\",\"group\":\"2e6c02d2-a364-4530-9137-d17403996cbf\",\"msExpirationTime\":0,\"aclBit\":false}}", { 'cache-control': 'no-cache, no-cache, no-store, max-age=0',
   pragma: 'no-cache',
   'content-type': 'application/json; charset=utf-8',
   expires: '-1',
-  'x-ms-request-id': 'c5b15c44-7c32-4fa3-81c3-b8ad4e2c8795',
-  'x-ms-webhdfs-version': '16.07.18.01',
+  'x-ms-request-id': 'e88fad1c-43ab-48bb-862d-a83d27f4424f',
+  'x-ms-webhdfs-version': '16.12.19.00',
   status: '0x0',
   'x-content-type-options': 'nosniff',
   'strict-transport-security': 'max-age=15724800; includeSubDomains',
-  date: 'Fri, 11 Nov 2016 21:55:56 GMT',
+  date: 'Thu, 16 Mar 2017 23:40:31 GMT',
   connection: 'close',
-  'content-length': '288' });
+  'content-length': '305' });
  return result; },
 function (nock) { 
 var result = 
-nock('https://xplattestadls2879.azuredatalakestore.net:443')
-  .get('/webhdfs/v1/adlssdkfolder01%2Femptyfile.txt?op=MSGETFILESTATUS&api-version=2016-11-01')
-  .reply(200, "{\"FileStatus\":{\"length\":22,\"pathSuffix\":\"\",\"type\":\"FILE\",\"blockSize\":268435456,\"accessTime\":1478901354204,\"modificationTime\":1478901356618,\"replication\":1,\"permission\":\"770\",\"owner\":\"2e6c02d2-a364-4530-9137-d17403996cbf\",\"group\":\"2e6c02d2-a364-4530-9137-d17403996cbf\",\"expirationTime\":0}}", { 'cache-control': 'no-cache, no-cache, no-store, max-age=0',
+nock('https://xplattestadls5855.azuredatalakestore.net:443')
+  .get('/webhdfs/v1/adlssdkfolder01%2Femptyfile.txt?op=GETFILESTATUS&api-version=2016-11-01')
+  .reply(200, "{\"FileStatus\":{\"length\":22,\"pathSuffix\":\"\",\"type\":\"FILE\",\"blockSize\":268435456,\"accessTime\":1489707629330,\"modificationTime\":1489707632023,\"replication\":1,\"permission\":\"770\",\"owner\":\"2e6c02d2-a364-4530-9137-d17403996cbf\",\"group\":\"2e6c02d2-a364-4530-9137-d17403996cbf\",\"msExpirationTime\":0,\"aclBit\":false}}", { 'cache-control': 'no-cache, no-cache, no-store, max-age=0',
   pragma: 'no-cache',
   'content-type': 'application/json; charset=utf-8',
   expires: '-1',
-  'x-ms-request-id': 'c5b15c44-7c32-4fa3-81c3-b8ad4e2c8795',
-  'x-ms-webhdfs-version': '16.07.18.01',
+  'x-ms-request-id': 'e88fad1c-43ab-48bb-862d-a83d27f4424f',
+  'x-ms-webhdfs-version': '16.12.19.00',
   status: '0x0',
   'x-content-type-options': 'nosniff',
   'strict-transport-security': 'max-age=15724800; includeSubDomains',
-  date: 'Fri, 11 Nov 2016 21:55:56 GMT',
+  date: 'Thu, 16 Mar 2017 23:40:31 GMT',
   connection: 'close',
-  'content-length': '288' });
+  'content-length': '305' });
  return result; }]];
\ No newline at end of file
diff --git a/test/recordings/arm-datalake-store-tests/Data_Lake_Store_Clients_Account_and_Filesystem_Data_Lake_Store_FileSystem_concat_should_work.nock.js b/test/recordings/arm-datalake-store-tests/Data_Lake_Store_Clients_Account_and_Filesystem_Data_Lake_Store_FileSystem_concat_should_work.nock.js
index c6e1f089d7..a062ed92fc 100644
--- a/test/recordings/arm-datalake-store-tests/Data_Lake_Store_Clients_Account_and_Filesystem_Data_Lake_Store_FileSystem_concat_should_work.nock.js
+++ b/test/recordings/arm-datalake-store-tests/Data_Lake_Store_Clients_Account_and_Filesystem_Data_Lake_Store_FileSystem_concat_should_work.nock.js
@@ -8,67 +8,67 @@ exports.setEnvironment = function() {
 
 exports.scopes = [[function (nock) { 
 var result = 
-nock('http://xplattestadls2879.azuredatalakestore.net:443')
+nock('http://xplattestadls5855.azuredatalakestore.net:443')
   .post('/webhdfs/v1/adlssdkfolder01%2Fconcatfile.txt?sources=adlssdkfolder01%2Femptyfile.txt%2Cadlssdkfolder01%2Fcontentfile.txt&op=CONCAT&api-version=2016-11-01')
   .reply(200, "", { 'cache-control': 'no-cache, no-cache, no-store, max-age=0',
   pragma: 'no-cache',
   expires: '-1',
-  'x-ms-request-id': '02918e41-543f-4c60-bd55-684db7ccab0b',
-  'x-ms-webhdfs-version': '16.07.18.01',
+  'x-ms-request-id': '462987d8-beba-4acf-a494-eb2c0e9fab36',
+  'x-ms-webhdfs-version': '16.12.19.00',
   status: '0x0',
   'x-content-type-options': 'nosniff',
   'strict-transport-security': 'max-age=15724800; includeSubDomains',
-  date: 'Fri, 11 Nov 2016 21:55:56 GMT',
+  date: 'Thu, 16 Mar 2017 23:40:32 GMT',
   connection: 'close',
   'content-length': '0' });
  return result; },
 function (nock) { 
 var result = 
-nock('https://xplattestadls2879.azuredatalakestore.net:443')
+nock('https://xplattestadls5855.azuredatalakestore.net:443')
   .post('/webhdfs/v1/adlssdkfolder01%2Fconcatfile.txt?sources=adlssdkfolder01%2Femptyfile.txt%2Cadlssdkfolder01%2Fcontentfile.txt&op=CONCAT&api-version=2016-11-01')
   .reply(200, "", { 'cache-control': 'no-cache, no-cache, no-store, max-age=0',
   pragma: 'no-cache',
   expires: '-1',
-  'x-ms-request-id': '02918e41-543f-4c60-bd55-684db7ccab0b',
-  'x-ms-webhdfs-version': '16.07.18.01',
+  'x-ms-request-id': '462987d8-beba-4acf-a494-eb2c0e9fab36',
+  'x-ms-webhdfs-version': '16.12.19.00',
   status: '0x0',
   'x-content-type-options': 'nosniff',
   'strict-transport-security': 'max-age=15724800; includeSubDomains',
-  date: 'Fri, 11 Nov 2016 21:55:56 GMT',
+  date: 'Thu, 16 Mar 2017 23:40:32 GMT',
   connection: 'close',
   'content-length': '0' });
  return result; },
 function (nock) { 
 var result = 
-nock('http://xplattestadls2879.azuredatalakestore.net:443')
-  .get('/webhdfs/v1/adlssdkfolder01%2Fconcatfile.txt?op=MSGETFILESTATUS&api-version=2016-11-01')
-  .reply(200, "{\"FileStatus\":{\"length\":44,\"pathSuffix\":\"\",\"type\":\"FILE\",\"blockSize\":268435456,\"accessTime\":1478901357503,\"modificationTime\":1478901357550,\"replication\":1,\"permission\":\"770\",\"owner\":\"2e6c02d2-a364-4530-9137-d17403996cbf\",\"group\":\"2e6c02d2-a364-4530-9137-d17403996cbf\",\"expirationTime\":0}}", { 'cache-control': 'no-cache, no-cache, no-store, max-age=0',
+nock('http://xplattestadls5855.azuredatalakestore.net:443')
+  .get('/webhdfs/v1/adlssdkfolder01%2Fconcatfile.txt?op=GETFILESTATUS&api-version=2016-11-01')
+  .reply(200, "{\"FileStatus\":{\"length\":44,\"pathSuffix\":\"\",\"type\":\"FILE\",\"blockSize\":268435456,\"accessTime\":1489707633123,\"modificationTime\":1489707633154,\"replication\":1,\"permission\":\"770\",\"owner\":\"2e6c02d2-a364-4530-9137-d17403996cbf\",\"group\":\"2e6c02d2-a364-4530-9137-d17403996cbf\",\"msExpirationTime\":0,\"aclBit\":false}}", { 'cache-control': 'no-cache, no-cache, no-store, max-age=0',
   pragma: 'no-cache',
   'content-type': 'application/json; charset=utf-8',
   expires: '-1',
-  'x-ms-request-id': 'e8bc8eae-59be-4b21-b951-60f583233992',
-  'x-ms-webhdfs-version': '16.07.18.01',
+  'x-ms-request-id': '507605a8-af3d-4b7e-8f7f-75adc8ef6746',
+  'x-ms-webhdfs-version': '16.12.19.00',
   status: '0x0',
   'x-content-type-options': 'nosniff',
   'strict-transport-security': 'max-age=15724800; includeSubDomains',
-  date: 'Fri, 11 Nov 2016 21:55:57 GMT',
+  date: 'Thu, 16 Mar 2017 23:40:32 GMT',
   connection: 'close',
-  'content-length': '288' });
+  'content-length': '305' });
  return result; },
 function (nock) { 
 var result = 
-nock('https://xplattestadls2879.azuredatalakestore.net:443')
-  .get('/webhdfs/v1/adlssdkfolder01%2Fconcatfile.txt?op=MSGETFILESTATUS&api-version=2016-11-01')
-  .reply(200, "{\"FileStatus\":{\"length\":44,\"pathSuffix\":\"\",\"type\":\"FILE\",\"blockSize\":268435456,\"accessTime\":1478901357503,\"modificationTime\":1478901357550,\"replication\":1,\"permission\":\"770\",\"owner\":\"2e6c02d2-a364-4530-9137-d17403996cbf\",\"group\":\"2e6c02d2-a364-4530-9137-d17403996cbf\",\"expirationTime\":0}}", { 'cache-control': 'no-cache, no-cache, no-store, max-age=0',
+nock('https://xplattestadls5855.azuredatalakestore.net:443')
+  .get('/webhdfs/v1/adlssdkfolder01%2Fconcatfile.txt?op=GETFILESTATUS&api-version=2016-11-01')
+  .reply(200, "{\"FileStatus\":{\"length\":44,\"pathSuffix\":\"\",\"type\":\"FILE\",\"blockSize\":268435456,\"accessTime\":1489707633123,\"modificationTime\":1489707633154,\"replication\":1,\"permission\":\"770\",\"owner\":\"2e6c02d2-a364-4530-9137-d17403996cbf\",\"group\":\"2e6c02d2-a364-4530-9137-d17403996cbf\",\"msExpirationTime\":0,\"aclBit\":false}}", { 'cache-control': 'no-cache, no-cache, no-store, max-age=0',
   pragma: 'no-cache',
   'content-type': 'application/json; charset=utf-8',
   expires: '-1',
-  'x-ms-request-id': 'e8bc8eae-59be-4b21-b951-60f583233992',
-  'x-ms-webhdfs-version': '16.07.18.01',
+  'x-ms-request-id': '507605a8-af3d-4b7e-8f7f-75adc8ef6746',
+  'x-ms-webhdfs-version': '16.12.19.00',
   status: '0x0',
   'x-content-type-options': 'nosniff',
   'strict-transport-security': 'max-age=15724800; includeSubDomains',
-  date: 'Fri, 11 Nov 2016 21:55:57 GMT',
+  date: 'Thu, 16 Mar 2017 23:40:32 GMT',
   connection: 'close',
-  'content-length': '288' });
+  'content-length': '305' });
  return result; }]];
\ No newline at end of file
diff --git a/test/recordings/arm-datalake-store-tests/Data_Lake_Store_Clients_Account_and_Filesystem_Data_Lake_Store_FileSystem_create_and_show_commands_should_work.nock.js b/test/recordings/arm-datalake-store-tests/Data_Lake_Store_Clients_Account_and_Filesystem_Data_Lake_Store_FileSystem_create_and_show_commands_should_work.nock.js
index 08d211019c..81b4ee8a70 100644
--- a/test/recordings/arm-datalake-store-tests/Data_Lake_Store_Clients_Account_and_Filesystem_Data_Lake_Store_FileSystem_create_and_show_commands_should_work.nock.js
+++ b/test/recordings/arm-datalake-store-tests/Data_Lake_Store_Clients_Account_and_Filesystem_Data_Lake_Store_FileSystem_create_and_show_commands_should_work.nock.js
@@ -8,245 +8,245 @@ exports.setEnvironment = function() {
 
 exports.scopes = [[function (nock) { 
 var result = 
-nock('http://xplattestadls2879.azuredatalakestore.net:443')
+nock('http://xplattestadls5855.azuredatalakestore.net:443')
   .put('/webhdfs/v1/adlssdkfolder01?op=MKDIRS&api-version=2016-11-01')
   .reply(200, "{\"boolean\":true}", { 'cache-control': 'no-cache, no-cache, no-store, max-age=0',
   pragma: 'no-cache',
   'content-type': 'application/json; charset=utf-8',
   expires: '-1',
-  'x-ms-request-id': '4d69efb1-b7d7-4b03-8bdc-d2db20e1830d',
-  'x-ms-webhdfs-version': '16.07.18.01',
+  'x-ms-request-id': 'f7c3136e-1de2-444d-a99c-f44c750943e5',
+  'x-ms-webhdfs-version': '16.12.19.00',
   status: '0x0',
   'x-content-type-options': 'nosniff',
   'strict-transport-security': 'max-age=15724800; includeSubDomains',
-  date: 'Fri, 11 Nov 2016 21:55:53 GMT',
+  date: 'Thu, 16 Mar 2017 23:40:28 GMT',
   connection: 'close',
   'content-length': '16' });
  return result; },
 function (nock) { 
 var result = 
-nock('https://xplattestadls2879.azuredatalakestore.net:443')
+nock('https://xplattestadls5855.azuredatalakestore.net:443')
   .put('/webhdfs/v1/adlssdkfolder01?op=MKDIRS&api-version=2016-11-01')
   .reply(200, "{\"boolean\":true}", { 'cache-control': 'no-cache, no-cache, no-store, max-age=0',
   pragma: 'no-cache',
   'content-type': 'application/json; charset=utf-8',
   expires: '-1',
-  'x-ms-request-id': '4d69efb1-b7d7-4b03-8bdc-d2db20e1830d',
-  'x-ms-webhdfs-version': '16.07.18.01',
+  'x-ms-request-id': 'f7c3136e-1de2-444d-a99c-f44c750943e5',
+  'x-ms-webhdfs-version': '16.12.19.00',
   status: '0x0',
   'x-content-type-options': 'nosniff',
   'strict-transport-security': 'max-age=15724800; includeSubDomains',
-  date: 'Fri, 11 Nov 2016 21:55:53 GMT',
+  date: 'Thu, 16 Mar 2017 23:40:28 GMT',
   connection: 'close',
   'content-length': '16' });
  return result; },
 function (nock) { 
 var result = 
-nock('http://xplattestadls2879.azuredatalakestore.net:443')
-  .get('/webhdfs/v1/adlssdkfolder01?op=MSGETFILESTATUS&api-version=2016-11-01')
-  .reply(200, "{\"FileStatus\":{\"length\":0,\"pathSuffix\":\"\",\"type\":\"DIRECTORY\",\"blockSize\":0,\"accessTime\":1478901353564,\"modificationTime\":1478901353564,\"replication\":0,\"permission\":\"770\",\"owner\":\"2e6c02d2-a364-4530-9137-d17403996cbf\",\"group\":\"2e6c02d2-a364-4530-9137-d17403996cbf\"}}", { 'cache-control': 'no-cache, no-cache, no-store, max-age=0',
+nock('http://xplattestadls5855.azuredatalakestore.net:443')
+  .get('/webhdfs/v1/adlssdkfolder01?op=GETFILESTATUS&api-version=2016-11-01')
+  .reply(200, "{\"FileStatus\":{\"length\":0,\"pathSuffix\":\"\",\"type\":\"DIRECTORY\",\"blockSize\":0,\"accessTime\":1489707628577,\"modificationTime\":1489707628577,\"replication\":0,\"permission\":\"770\",\"owner\":\"2e6c02d2-a364-4530-9137-d17403996cbf\",\"group\":\"2e6c02d2-a364-4530-9137-d17403996cbf\",\"aclBit\":false}}", { 'cache-control': 'no-cache, no-cache, no-store, max-age=0',
   pragma: 'no-cache',
   'content-type': 'application/json; charset=utf-8',
   expires: '-1',
-  'x-ms-request-id': '5f7f1ef1-d29b-48fd-b400-634d1b3b31f5',
-  'x-ms-webhdfs-version': '16.07.18.01',
+  'x-ms-request-id': '192d7765-e24b-4cde-9fbd-297ad9b386cf',
+  'x-ms-webhdfs-version': '16.12.19.00',
   status: '0x0',
   'x-content-type-options': 'nosniff',
   'strict-transport-security': 'max-age=15724800; includeSubDomains',
-  date: 'Fri, 11 Nov 2016 21:55:53 GMT',
+  date: 'Thu, 16 Mar 2017 23:40:28 GMT',
   connection: 'close',
-  'content-length': '265' });
+  'content-length': '280' });
  return result; },
 function (nock) { 
 var result = 
-nock('https://xplattestadls2879.azuredatalakestore.net:443')
-  .get('/webhdfs/v1/adlssdkfolder01?op=MSGETFILESTATUS&api-version=2016-11-01')
-  .reply(200, "{\"FileStatus\":{\"length\":0,\"pathSuffix\":\"\",\"type\":\"DIRECTORY\",\"blockSize\":0,\"accessTime\":1478901353564,\"modificationTime\":1478901353564,\"replication\":0,\"permission\":\"770\",\"owner\":\"2e6c02d2-a364-4530-9137-d17403996cbf\",\"group\":\"2e6c02d2-a364-4530-9137-d17403996cbf\"}}", { 'cache-control': 'no-cache, no-cache, no-store, max-age=0',
+nock('https://xplattestadls5855.azuredatalakestore.net:443')
+  .get('/webhdfs/v1/adlssdkfolder01?op=GETFILESTATUS&api-version=2016-11-01')
+  .reply(200, "{\"FileStatus\":{\"length\":0,\"pathSuffix\":\"\",\"type\":\"DIRECTORY\",\"blockSize\":0,\"accessTime\":1489707628577,\"modificationTime\":1489707628577,\"replication\":0,\"permission\":\"770\",\"owner\":\"2e6c02d2-a364-4530-9137-d17403996cbf\",\"group\":\"2e6c02d2-a364-4530-9137-d17403996cbf\",\"aclBit\":false}}", { 'cache-control': 'no-cache, no-cache, no-store, max-age=0',
   pragma: 'no-cache',
   'content-type': 'application/json; charset=utf-8',
   expires: '-1',
-  'x-ms-request-id': '5f7f1ef1-d29b-48fd-b400-634d1b3b31f5',
-  'x-ms-webhdfs-version': '16.07.18.01',
+  'x-ms-request-id': '192d7765-e24b-4cde-9fbd-297ad9b386cf',
+  'x-ms-webhdfs-version': '16.12.19.00',
   status: '0x0',
   'x-content-type-options': 'nosniff',
   'strict-transport-security': 'max-age=15724800; includeSubDomains',
-  date: 'Fri, 11 Nov 2016 21:55:53 GMT',
+  date: 'Thu, 16 Mar 2017 23:40:28 GMT',
   connection: 'close',
-  'content-length': '265' });
+  'content-length': '280' });
  return result; },
 function (nock) { 
 var result = 
-nock('http://xplattestadls2879.azuredatalakestore.net:443')
+nock('http://xplattestadls5855.azuredatalakestore.net:443')
   .put('/webhdfs/v1/adlssdkfolder01%2Femptyfile.txt?syncFlag=CLOSE&op=CREATE&write=true&api-version=2016-11-01')
   .reply(201, "", { 'cache-control': 'no-cache, no-cache, no-store, max-age=0',
   pragma: 'no-cache',
   expires: '-1',
-  location: 'https://xplattestadls2879.azuredatalakestore.net/webhdfs/v1/adlssdkfolder01/emptyfile.txt?syncFlag=CLOSE&op=CREATE&write=true&api-version=2016-11-01',
-  'x-ms-request-id': '8f177382-209c-4f92-9ffa-2ab20286ebc9',
+  location: 'https://xplattestadls5855.azuredatalakestore.net/webhdfs/v1/adlssdkfolder01/emptyfile.txt?syncFlag=CLOSE&op=CREATE&write=true&api-version=2016-11-01',
+  'x-ms-request-id': '0663e0f2-0e47-4253-b92a-17f6f082ee4e',
   contentlength: '0',
-  'x-ms-webhdfs-version': '16.07.18.01',
+  'x-ms-webhdfs-version': '16.12.19.00',
   status: '0x0',
   'x-content-type-options': 'nosniff',
   'strict-transport-security': 'max-age=15724800; includeSubDomains',
-  date: 'Fri, 11 Nov 2016 21:55:53 GMT',
+  date: 'Thu, 16 Mar 2017 23:40:28 GMT',
   connection: 'close',
   'content-length': '0' });
  return result; },
 function (nock) { 
 var result = 
-nock('https://xplattestadls2879.azuredatalakestore.net:443')
+nock('https://xplattestadls5855.azuredatalakestore.net:443')
   .put('/webhdfs/v1/adlssdkfolder01%2Femptyfile.txt?syncFlag=CLOSE&op=CREATE&write=true&api-version=2016-11-01')
   .reply(201, "", { 'cache-control': 'no-cache, no-cache, no-store, max-age=0',
   pragma: 'no-cache',
   expires: '-1',
-  location: 'https://xplattestadls2879.azuredatalakestore.net/webhdfs/v1/adlssdkfolder01/emptyfile.txt?syncFlag=CLOSE&op=CREATE&write=true&api-version=2016-11-01',
-  'x-ms-request-id': '8f177382-209c-4f92-9ffa-2ab20286ebc9',
+  location: 'https://xplattestadls5855.azuredatalakestore.net/webhdfs/v1/adlssdkfolder01/emptyfile.txt?syncFlag=CLOSE&op=CREATE&write=true&api-version=2016-11-01',
+  'x-ms-request-id': '0663e0f2-0e47-4253-b92a-17f6f082ee4e',
   contentlength: '0',
-  'x-ms-webhdfs-version': '16.07.18.01',
+  'x-ms-webhdfs-version': '16.12.19.00',
   status: '0x0',
   'x-content-type-options': 'nosniff',
   'strict-transport-security': 'max-age=15724800; includeSubDomains',
-  date: 'Fri, 11 Nov 2016 21:55:53 GMT',
+  date: 'Thu, 16 Mar 2017 23:40:28 GMT',
   connection: 'close',
   'content-length': '0' });
  return result; },
 function (nock) { 
 var result = 
-nock('http://xplattestadls2879.azuredatalakestore.net:443')
-  .get('/webhdfs/v1/adlssdkfolder01%2Femptyfile.txt?op=MSGETFILESTATUS&api-version=2016-11-01')
-  .reply(200, "{\"FileStatus\":{\"length\":0,\"pathSuffix\":\"\",\"type\":\"FILE\",\"blockSize\":268435456,\"accessTime\":1478901354204,\"modificationTime\":1478901354204,\"replication\":1,\"permission\":\"770\",\"owner\":\"2e6c02d2-a364-4530-9137-d17403996cbf\",\"group\":\"2e6c02d2-a364-4530-9137-d17403996cbf\",\"expirationTime\":0}}", { 'cache-control': 'no-cache, no-cache, no-store, max-age=0',
+nock('http://xplattestadls5855.azuredatalakestore.net:443')
+  .get('/webhdfs/v1/adlssdkfolder01%2Femptyfile.txt?op=GETFILESTATUS&api-version=2016-11-01')
+  .reply(200, "{\"FileStatus\":{\"length\":0,\"pathSuffix\":\"\",\"type\":\"FILE\",\"blockSize\":268435456,\"accessTime\":1489707629330,\"modificationTime\":1489707629330,\"replication\":1,\"permission\":\"770\",\"owner\":\"2e6c02d2-a364-4530-9137-d17403996cbf\",\"group\":\"2e6c02d2-a364-4530-9137-d17403996cbf\",\"msExpirationTime\":0,\"aclBit\":false}}", { 'cache-control': 'no-cache, no-cache, no-store, max-age=0',
   pragma: 'no-cache',
   'content-type': 'application/json; charset=utf-8',
   expires: '-1',
-  'x-ms-request-id': '3cff594b-74ab-40e2-8033-d826a28f80b0',
-  'x-ms-webhdfs-version': '16.07.18.01',
+  'x-ms-request-id': 'f0b95f96-d072-46d0-8739-593b707ae38b',
+  'x-ms-webhdfs-version': '16.12.19.00',
   status: '0x0',
   'x-content-type-options': 'nosniff',
   'strict-transport-security': 'max-age=15724800; includeSubDomains',
-  date: 'Fri, 11 Nov 2016 21:55:53 GMT',
+  date: 'Thu, 16 Mar 2017 23:40:28 GMT',
   connection: 'close',
-  'content-length': '287' });
+  'content-length': '304' });
  return result; },
 function (nock) { 
 var result = 
-nock('https://xplattestadls2879.azuredatalakestore.net:443')
-  .get('/webhdfs/v1/adlssdkfolder01%2Femptyfile.txt?op=MSGETFILESTATUS&api-version=2016-11-01')
-  .reply(200, "{\"FileStatus\":{\"length\":0,\"pathSuffix\":\"\",\"type\":\"FILE\",\"blockSize\":268435456,\"accessTime\":1478901354204,\"modificationTime\":1478901354204,\"replication\":1,\"permission\":\"770\",\"owner\":\"2e6c02d2-a364-4530-9137-d17403996cbf\",\"group\":\"2e6c02d2-a364-4530-9137-d17403996cbf\",\"expirationTime\":0}}", { 'cache-control': 'no-cache, no-cache, no-store, max-age=0',
+nock('https://xplattestadls5855.azuredatalakestore.net:443')
+  .get('/webhdfs/v1/adlssdkfolder01%2Femptyfile.txt?op=GETFILESTATUS&api-version=2016-11-01')
+  .reply(200, "{\"FileStatus\":{\"length\":0,\"pathSuffix\":\"\",\"type\":\"FILE\",\"blockSize\":268435456,\"accessTime\":1489707629330,\"modificationTime\":1489707629330,\"replication\":1,\"permission\":\"770\",\"owner\":\"2e6c02d2-a364-4530-9137-d17403996cbf\",\"group\":\"2e6c02d2-a364-4530-9137-d17403996cbf\",\"msExpirationTime\":0,\"aclBit\":false}}", { 'cache-control': 'no-cache, no-cache, no-store, max-age=0',
   pragma: 'no-cache',
   'content-type': 'application/json; charset=utf-8',
   expires: '-1',
-  'x-ms-request-id': '3cff594b-74ab-40e2-8033-d826a28f80b0',
-  'x-ms-webhdfs-version': '16.07.18.01',
+  'x-ms-request-id': 'f0b95f96-d072-46d0-8739-593b707ae38b',
+  'x-ms-webhdfs-version': '16.12.19.00',
   status: '0x0',
   'x-content-type-options': 'nosniff',
   'strict-transport-security': 'max-age=15724800; includeSubDomains',
-  date: 'Fri, 11 Nov 2016 21:55:53 GMT',
+  date: 'Thu, 16 Mar 2017 23:40:28 GMT',
   connection: 'close',
-  'content-length': '287' });
+  'content-length': '304' });
  return result; },
 function (nock) { 
 var result = 
-nock('http://xplattestadls2879.azuredatalakestore.net:443')
+nock('http://xplattestadls5855.azuredatalakestore.net:443')
   .filteringRequestBody(function (path) { return '*';})
 .put('/webhdfs/v1/adlssdkfolder01%2Fcontentfile.txt?syncFlag=CLOSE&op=CREATE&write=true&api-version=2016-11-01', '*')
   .reply(201, "", { 'cache-control': 'no-cache, no-cache, no-store, max-age=0',
   pragma: 'no-cache',
   expires: '-1',
-  location: 'https://xplattestadls2879.azuredatalakestore.net/webhdfs/v1/adlssdkfolder01/contentfile.txt?syncFlag=CLOSE&op=CREATE&write=true&api-version=2016-11-01',
-  'x-ms-request-id': '5754926d-7d87-4777-9c9d-21f3f85a59a9',
+  location: 'https://xplattestadls5855.azuredatalakestore.net/webhdfs/v1/adlssdkfolder01/contentfile.txt?syncFlag=CLOSE&op=CREATE&write=true&api-version=2016-11-01',
+  'x-ms-request-id': '6a33d890-e020-4f1c-bb1b-f1c41ebb3f7b',
   contentlength: '0',
-  'x-ms-webhdfs-version': '16.07.18.01',
+  'x-ms-webhdfs-version': '16.12.19.00',
   status: '0x0',
   'x-content-type-options': 'nosniff',
   'strict-transport-security': 'max-age=15724800; includeSubDomains',
-  date: 'Fri, 11 Nov 2016 21:55:55 GMT',
+  date: 'Thu, 16 Mar 2017 23:40:30 GMT',
   connection: 'close',
   'content-length': '0' });
  return result; },
 function (nock) { 
 var result = 
-nock('https://xplattestadls2879.azuredatalakestore.net:443')
+nock('https://xplattestadls5855.azuredatalakestore.net:443')
   .filteringRequestBody(function (path) { return '*';})
 .put('/webhdfs/v1/adlssdkfolder01%2Fcontentfile.txt?syncFlag=CLOSE&op=CREATE&write=true&api-version=2016-11-01', '*')
   .reply(201, "", { 'cache-control': 'no-cache, no-cache, no-store, max-age=0',
   pragma: 'no-cache',
   expires: '-1',
-  location: 'https://xplattestadls2879.azuredatalakestore.net/webhdfs/v1/adlssdkfolder01/contentfile.txt?syncFlag=CLOSE&op=CREATE&write=true&api-version=2016-11-01',
-  'x-ms-request-id': '5754926d-7d87-4777-9c9d-21f3f85a59a9',
+  location: 'https://xplattestadls5855.azuredatalakestore.net/webhdfs/v1/adlssdkfolder01/contentfile.txt?syncFlag=CLOSE&op=CREATE&write=true&api-version=2016-11-01',
+  'x-ms-request-id': '6a33d890-e020-4f1c-bb1b-f1c41ebb3f7b',
   contentlength: '0',
-  'x-ms-webhdfs-version': '16.07.18.01',
+  'x-ms-webhdfs-version': '16.12.19.00',
   status: '0x0',
   'x-content-type-options': 'nosniff',
   'strict-transport-security': 'max-age=15724800; includeSubDomains',
-  date: 'Fri, 11 Nov 2016 21:55:55 GMT',
+  date: 'Thu, 16 Mar 2017 23:40:30 GMT',
   connection: 'close',
   'content-length': '0' });
  return result; },
 function (nock) { 
 var result = 
-nock('http://xplattestadls2879.azuredatalakestore.net:443')
-  .get('/webhdfs/v1/adlssdkfolder01%2Fcontentfile.txt?op=MSGETFILESTATUS&api-version=2016-11-01')
-  .reply(200, "{\"FileStatus\":{\"length\":22,\"pathSuffix\":\"\",\"type\":\"FILE\",\"blockSize\":268435456,\"accessTime\":1478901354941,\"modificationTime\":1478901355036,\"replication\":1,\"permission\":\"770\",\"owner\":\"2e6c02d2-a364-4530-9137-d17403996cbf\",\"group\":\"2e6c02d2-a364-4530-9137-d17403996cbf\",\"expirationTime\":0}}", { 'cache-control': 'no-cache, no-cache, no-store, max-age=0',
+nock('http://xplattestadls5855.azuredatalakestore.net:443')
+  .get('/webhdfs/v1/adlssdkfolder01%2Fcontentfile.txt?op=GETFILESTATUS&api-version=2016-11-01')
+  .reply(200, "{\"FileStatus\":{\"length\":22,\"pathSuffix\":\"\",\"type\":\"FILE\",\"blockSize\":268435456,\"accessTime\":1489707630456,\"modificationTime\":1489707630522,\"replication\":1,\"permission\":\"770\",\"owner\":\"2e6c02d2-a364-4530-9137-d17403996cbf\",\"group\":\"2e6c02d2-a364-4530-9137-d17403996cbf\",\"msExpirationTime\":0,\"aclBit\":false}}", { 'cache-control': 'no-cache, no-cache, no-store, max-age=0',
   pragma: 'no-cache',
   'content-type': 'application/json; charset=utf-8',
   expires: '-1',
-  'x-ms-request-id': '124234ad-a0ad-43eb-ad00-2607d1ec1c65',
-  'x-ms-webhdfs-version': '16.07.18.01',
+  'x-ms-request-id': '3782deed-a8fc-4c87-b29c-c5a3227dd0b7',
+  'x-ms-webhdfs-version': '16.12.19.00',
   status: '0x0',
   'x-content-type-options': 'nosniff',
   'strict-transport-security': 'max-age=15724800; includeSubDomains',
-  date: 'Fri, 11 Nov 2016 21:55:55 GMT',
+  date: 'Thu, 16 Mar 2017 23:40:30 GMT',
   connection: 'close',
-  'content-length': '288' });
+  'content-length': '305' });
  return result; },
 function (nock) { 
 var result = 
-nock('https://xplattestadls2879.azuredatalakestore.net:443')
-  .get('/webhdfs/v1/adlssdkfolder01%2Fcontentfile.txt?op=MSGETFILESTATUS&api-version=2016-11-01')
-  .reply(200, "{\"FileStatus\":{\"length\":22,\"pathSuffix\":\"\",\"type\":\"FILE\",\"blockSize\":268435456,\"accessTime\":1478901354941,\"modificationTime\":1478901355036,\"replication\":1,\"permission\":\"770\",\"owner\":\"2e6c02d2-a364-4530-9137-d17403996cbf\",\"group\":\"2e6c02d2-a364-4530-9137-d17403996cbf\",\"expirationTime\":0}}", { 'cache-control': 'no-cache, no-cache, no-store, max-age=0',
+nock('https://xplattestadls5855.azuredatalakestore.net:443')
+  .get('/webhdfs/v1/adlssdkfolder01%2Fcontentfile.txt?op=GETFILESTATUS&api-version=2016-11-01')
+  .reply(200, "{\"FileStatus\":{\"length\":22,\"pathSuffix\":\"\",\"type\":\"FILE\",\"blockSize\":268435456,\"accessTime\":1489707630456,\"modificationTime\":1489707630522,\"replication\":1,\"permission\":\"770\",\"owner\":\"2e6c02d2-a364-4530-9137-d17403996cbf\",\"group\":\"2e6c02d2-a364-4530-9137-d17403996cbf\",\"msExpirationTime\":0,\"aclBit\":false}}", { 'cache-control': 'no-cache, no-cache, no-store, max-age=0',
   pragma: 'no-cache',
   'content-type': 'application/json; charset=utf-8',
   expires: '-1',
-  'x-ms-request-id': '124234ad-a0ad-43eb-ad00-2607d1ec1c65',
-  'x-ms-webhdfs-version': '16.07.18.01',
+  'x-ms-request-id': '3782deed-a8fc-4c87-b29c-c5a3227dd0b7',
+  'x-ms-webhdfs-version': '16.12.19.00',
   status: '0x0',
   'x-content-type-options': 'nosniff',
   'strict-transport-security': 'max-age=15724800; includeSubDomains',
-  date: 'Fri, 11 Nov 2016 21:55:55 GMT',
+  date: 'Thu, 16 Mar 2017 23:40:30 GMT',
   connection: 'close',
-  'content-length': '288' });
+  'content-length': '305' });
  return result; },
 function (nock) { 
 var result = 
-nock('http://xplattestadls2879.azuredatalakestore.net:443')
-  .get('/webhdfs/v1/adlssdkfolder01?op=MSLISTSTATUS&api-version=2016-11-01')
-  .reply(200, "{\"FileStatuses\":{\"FileStatus\":[{\"length\":22,\"pathSuffix\":\"contentfile.txt\",\"type\":\"FILE\",\"blockSize\":268435456,\"accessTime\":1478901354941,\"modificationTime\":1478901355036,\"replication\":1,\"permission\":\"770\",\"owner\":\"2e6c02d2-a364-4530-9137-d17403996cbf\",\"group\":\"2e6c02d2-a364-4530-9137-d17403996cbf\",\"expirationTime\":0},{\"length\":0,\"pathSuffix\":\"emptyfile.txt\",\"type\":\"FILE\",\"blockSize\":268435456,\"accessTime\":1478901354204,\"modificationTime\":1478901354204,\"replication\":1,\"permission\":\"770\",\"owner\":\"2e6c02d2-a364-4530-9137-d17403996cbf\",\"group\":\"2e6c02d2-a364-4530-9137-d17403996cbf\",\"expirationTime\":0}]}}", { 'cache-control': 'no-cache, no-cache, no-store, max-age=0',
+nock('http://xplattestadls5855.azuredatalakestore.net:443')
+  .get('/webhdfs/v1/adlssdkfolder01?op=LISTSTATUS&api-version=2016-11-01')
+  .reply(200, "{\"FileStatuses\":{\"FileStatus\":[{\"length\":22,\"pathSuffix\":\"contentfile.txt\",\"type\":\"FILE\",\"blockSize\":268435456,\"accessTime\":1489707630456,\"modificationTime\":1489707630522,\"replication\":1,\"permission\":\"770\",\"owner\":\"2e6c02d2-a364-4530-9137-d17403996cbf\",\"group\":\"2e6c02d2-a364-4530-9137-d17403996cbf\",\"msExpirationTime\":0,\"aclBit\":false},{\"length\":0,\"pathSuffix\":\"emptyfile.txt\",\"type\":\"FILE\",\"blockSize\":268435456,\"accessTime\":1489707629330,\"modificationTime\":1489707629330,\"replication\":1,\"permission\":\"770\",\"owner\":\"2e6c02d2-a364-4530-9137-d17403996cbf\",\"group\":\"2e6c02d2-a364-4530-9137-d17403996cbf\",\"msExpirationTime\":0,\"aclBit\":false}]}}", { 'cache-control': 'no-cache, no-cache, no-store, max-age=0',
   pragma: 'no-cache',
   'content-type': 'application/json; charset=utf-8',
   expires: '-1',
-  'x-ms-request-id': 'eb64f367-cc7c-4ae2-be5e-6b62473bd07e',
-  'x-ms-webhdfs-version': '16.07.18.01',
+  'x-ms-request-id': '7016fe65-a086-46f7-b6dd-030cad1fdcda',
+  'x-ms-webhdfs-version': '16.12.19.00',
   status: '0x0',
   'x-content-type-options': 'nosniff',
   'strict-transport-security': 'max-age=15724800; includeSubDomains',
-  date: 'Fri, 11 Nov 2016 21:55:55 GMT',
+  date: 'Thu, 16 Mar 2017 23:40:30 GMT',
   connection: 'close',
-  'content-length': '608' });
+  'content-length': '642' });
  return result; },
 function (nock) { 
 var result = 
-nock('https://xplattestadls2879.azuredatalakestore.net:443')
-  .get('/webhdfs/v1/adlssdkfolder01?op=MSLISTSTATUS&api-version=2016-11-01')
-  .reply(200, "{\"FileStatuses\":{\"FileStatus\":[{\"length\":22,\"pathSuffix\":\"contentfile.txt\",\"type\":\"FILE\",\"blockSize\":268435456,\"accessTime\":1478901354941,\"modificationTime\":1478901355036,\"replication\":1,\"permission\":\"770\",\"owner\":\"2e6c02d2-a364-4530-9137-d17403996cbf\",\"group\":\"2e6c02d2-a364-4530-9137-d17403996cbf\",\"expirationTime\":0},{\"length\":0,\"pathSuffix\":\"emptyfile.txt\",\"type\":\"FILE\",\"blockSize\":268435456,\"accessTime\":1478901354204,\"modificationTime\":1478901354204,\"replication\":1,\"permission\":\"770\",\"owner\":\"2e6c02d2-a364-4530-9137-d17403996cbf\",\"group\":\"2e6c02d2-a364-4530-9137-d17403996cbf\",\"expirationTime\":0}]}}", { 'cache-control': 'no-cache, no-cache, no-store, max-age=0',
+nock('https://xplattestadls5855.azuredatalakestore.net:443')
+  .get('/webhdfs/v1/adlssdkfolder01?op=LISTSTATUS&api-version=2016-11-01')
+  .reply(200, "{\"FileStatuses\":{\"FileStatus\":[{\"length\":22,\"pathSuffix\":\"contentfile.txt\",\"type\":\"FILE\",\"blockSize\":268435456,\"accessTime\":1489707630456,\"modificationTime\":1489707630522,\"replication\":1,\"permission\":\"770\",\"owner\":\"2e6c02d2-a364-4530-9137-d17403996cbf\",\"group\":\"2e6c02d2-a364-4530-9137-d17403996cbf\",\"msExpirationTime\":0,\"aclBit\":false},{\"length\":0,\"pathSuffix\":\"emptyfile.txt\",\"type\":\"FILE\",\"blockSize\":268435456,\"accessTime\":1489707629330,\"modificationTime\":1489707629330,\"replication\":1,\"permission\":\"770\",\"owner\":\"2e6c02d2-a364-4530-9137-d17403996cbf\",\"group\":\"2e6c02d2-a364-4530-9137-d17403996cbf\",\"msExpirationTime\":0,\"aclBit\":false}]}}", { 'cache-control': 'no-cache, no-cache, no-store, max-age=0',
   pragma: 'no-cache',
   'content-type': 'application/json; charset=utf-8',
   expires: '-1',
-  'x-ms-request-id': 'eb64f367-cc7c-4ae2-be5e-6b62473bd07e',
-  'x-ms-webhdfs-version': '16.07.18.01',
+  'x-ms-request-id': '7016fe65-a086-46f7-b6dd-030cad1fdcda',
+  'x-ms-webhdfs-version': '16.12.19.00',
   status: '0x0',
   'x-content-type-options': 'nosniff',
   'strict-transport-security': 'max-age=15724800; includeSubDomains',
-  date: 'Fri, 11 Nov 2016 21:55:55 GMT',
+  date: 'Thu, 16 Mar 2017 23:40:30 GMT',
   connection: 'close',
-  'content-length': '608' });
+  'content-length': '642' });
  return result; }]];
\ No newline at end of file
diff --git a/test/recordings/arm-datalake-store-tests/Data_Lake_Store_Clients_Account_and_Filesystem_Data_Lake_Store_FileSystem_delete_commands_should_work.nock.js b/test/recordings/arm-datalake-store-tests/Data_Lake_Store_Clients_Account_and_Filesystem_Data_Lake_Store_FileSystem_delete_commands_should_work.nock.js
index 880d270f0b..2a81759f80 100644
--- a/test/recordings/arm-datalake-store-tests/Data_Lake_Store_Clients_Account_and_Filesystem_Data_Lake_Store_FileSystem_delete_commands_should_work.nock.js
+++ b/test/recordings/arm-datalake-store-tests/Data_Lake_Store_Clients_Account_and_Filesystem_Data_Lake_Store_FileSystem_delete_commands_should_work.nock.js
@@ -8,137 +8,137 @@ exports.setEnvironment = function() {
 
 exports.scopes = [[function (nock) { 
 var result = 
-nock('http://xplattestadls2879.azuredatalakestore.net:443')
+nock('http://xplattestadls5855.azuredatalakestore.net:443')
   .delete('/webhdfs/v1/adlssdkfolder01%2Fmovefile.txt?op=DELETE&api-version=2016-11-01')
   .reply(200, "{\"boolean\":false}", { 'cache-control': 'no-cache, no-cache, no-store, max-age=0',
   pragma: 'no-cache',
   'content-type': 'application/json; charset=utf-8',
   expires: '-1',
-  'x-ms-request-id': '20dfe647-1299-4254-b34e-96c57cadbe32',
-  'x-ms-webhdfs-version': '16.07.18.01',
+  'x-ms-request-id': 'e690ecd3-821c-4613-b76a-9435b8a5cda6',
+  'x-ms-webhdfs-version': '16.12.19.00',
   status: '0x8309000A',
   'x-content-type-options': 'nosniff',
   'strict-transport-security': 'max-age=15724800; includeSubDomains',
-  date: 'Fri, 11 Nov 2016 21:56:06 GMT',
+  date: 'Thu, 16 Mar 2017 23:40:44 GMT',
   connection: 'close',
   'content-length': '17' });
  return result; },
 function (nock) { 
 var result = 
-nock('https://xplattestadls2879.azuredatalakestore.net:443')
+nock('https://xplattestadls5855.azuredatalakestore.net:443')
   .delete('/webhdfs/v1/adlssdkfolder01%2Fmovefile.txt?op=DELETE&api-version=2016-11-01')
   .reply(200, "{\"boolean\":false}", { 'cache-control': 'no-cache, no-cache, no-store, max-age=0',
   pragma: 'no-cache',
   'content-type': 'application/json; charset=utf-8',
   expires: '-1',
-  'x-ms-request-id': '20dfe647-1299-4254-b34e-96c57cadbe32',
-  'x-ms-webhdfs-version': '16.07.18.01',
+  'x-ms-request-id': 'e690ecd3-821c-4613-b76a-9435b8a5cda6',
+  'x-ms-webhdfs-version': '16.12.19.00',
   status: '0x8309000A',
   'x-content-type-options': 'nosniff',
   'strict-transport-security': 'max-age=15724800; includeSubDomains',
-  date: 'Fri, 11 Nov 2016 21:56:06 GMT',
+  date: 'Thu, 16 Mar 2017 23:40:44 GMT',
   connection: 'close',
   'content-length': '17' });
  return result; },
 function (nock) { 
 var result = 
-nock('http://xplattestadls2879.azuredatalakestore.net:443')
-  .get('/webhdfs/v1/adlssdkfolder01%2Fmovefile.txt?op=MSGETFILESTATUS&api-version=2016-11-01')
-  .reply(404, "{\"RemoteException\":{\"exception\":\"FileNotFoundException\",\"message\":\"File/Folder does not exist: /adlssdkfolder01/movefile.txt [f5313207-50c3-4ee1-b6bb-081f24ba54b1][2016-11-11T13:56:07.1873641-08:00]\",\"javaClassName\":\"java.io.FileNotFoundException\"}}", { 'cache-control': 'no-cache, no-cache, no-store, max-age=0',
+nock('http://xplattestadls5855.azuredatalakestore.net:443')
+  .get('/webhdfs/v1/adlssdkfolder01%2Fmovefile.txt?op=GETFILESTATUS&api-version=2016-11-01')
+  .reply(404, "{\"RemoteException\":{\"exception\":\"FileNotFoundException\",\"message\":\"File/Folder does not exist: /adlssdkfolder01/movefile.txt [73e7012c-f1ef-4231-bdbc-1b2fdc4e899a][2017-03-16T16:40:44.4927789-07:00]\",\"javaClassName\":\"java.io.FileNotFoundException\"}}", { 'cache-control': 'no-cache, no-cache, no-store, max-age=0',
   pragma: 'no-cache',
   'content-type': 'application/json; charset=utf-8',
   expires: '-1',
-  'x-ms-request-id': 'f5313207-50c3-4ee1-b6bb-081f24ba54b1',
-  'x-ms-webhdfs-version': '16.07.18.01',
+  'x-ms-request-id': '73e7012c-f1ef-4231-bdbc-1b2fdc4e899a',
+  'x-ms-webhdfs-version': '16.12.19.00',
   status: '0x8309000A',
   'x-content-type-options': 'nosniff',
   'strict-transport-security': 'max-age=15724800; includeSubDomains',
-  date: 'Fri, 11 Nov 2016 21:56:06 GMT',
+  date: 'Thu, 16 Mar 2017 23:40:43 GMT',
   connection: 'close',
   'content-length': '249' });
  return result; },
 function (nock) { 
 var result = 
-nock('https://xplattestadls2879.azuredatalakestore.net:443')
-  .get('/webhdfs/v1/adlssdkfolder01%2Fmovefile.txt?op=MSGETFILESTATUS&api-version=2016-11-01')
-  .reply(404, "{\"RemoteException\":{\"exception\":\"FileNotFoundException\",\"message\":\"File/Folder does not exist: /adlssdkfolder01/movefile.txt [f5313207-50c3-4ee1-b6bb-081f24ba54b1][2016-11-11T13:56:07.1873641-08:00]\",\"javaClassName\":\"java.io.FileNotFoundException\"}}", { 'cache-control': 'no-cache, no-cache, no-store, max-age=0',
+nock('https://xplattestadls5855.azuredatalakestore.net:443')
+  .get('/webhdfs/v1/adlssdkfolder01%2Fmovefile.txt?op=GETFILESTATUS&api-version=2016-11-01')
+  .reply(404, "{\"RemoteException\":{\"exception\":\"FileNotFoundException\",\"message\":\"File/Folder does not exist: /adlssdkfolder01/movefile.txt [73e7012c-f1ef-4231-bdbc-1b2fdc4e899a][2017-03-16T16:40:44.4927789-07:00]\",\"javaClassName\":\"java.io.FileNotFoundException\"}}", { 'cache-control': 'no-cache, no-cache, no-store, max-age=0',
   pragma: 'no-cache',
   'content-type': 'application/json; charset=utf-8',
   expires: '-1',
-  'x-ms-request-id': 'f5313207-50c3-4ee1-b6bb-081f24ba54b1',
-  'x-ms-webhdfs-version': '16.07.18.01',
+  'x-ms-request-id': '73e7012c-f1ef-4231-bdbc-1b2fdc4e899a',
+  'x-ms-webhdfs-version': '16.12.19.00',
   status: '0x8309000A',
   'x-content-type-options': 'nosniff',
   'strict-transport-security': 'max-age=15724800; includeSubDomains',
-  date: 'Fri, 11 Nov 2016 21:56:06 GMT',
+  date: 'Thu, 16 Mar 2017 23:40:43 GMT',
   connection: 'close',
   'content-length': '249' });
  return result; },
 function (nock) { 
 var result = 
-nock('http://xplattestadls2879.azuredatalakestore.net:443')
+nock('http://xplattestadls5855.azuredatalakestore.net:443')
   .delete('/webhdfs/v1/adlssdkfolder02?recursive=true&op=DELETE&api-version=2016-11-01')
   .reply(200, "{\"boolean\":true}", { 'cache-control': 'no-cache, no-cache, no-store, max-age=0',
   pragma: 'no-cache',
   'content-type': 'application/json; charset=utf-8',
   expires: '-1',
-  'x-ms-request-id': 'c2a54bdf-b32b-4644-aff5-d4b0e73b8e64',
-  'x-ms-webhdfs-version': '16.07.18.01',
+  'x-ms-request-id': 'f1dd36d6-8aaa-4eaa-9128-0b3c7570e6ab',
+  'x-ms-webhdfs-version': '16.12.19.00',
   status: '0x0',
   'x-content-type-options': 'nosniff',
   'strict-transport-security': 'max-age=15724800; includeSubDomains',
-  date: 'Fri, 11 Nov 2016 21:56:07 GMT',
+  date: 'Thu, 16 Mar 2017 23:40:44 GMT',
   connection: 'close',
   'content-length': '16' });
  return result; },
 function (nock) { 
 var result = 
-nock('https://xplattestadls2879.azuredatalakestore.net:443')
+nock('https://xplattestadls5855.azuredatalakestore.net:443')
   .delete('/webhdfs/v1/adlssdkfolder02?recursive=true&op=DELETE&api-version=2016-11-01')
   .reply(200, "{\"boolean\":true}", { 'cache-control': 'no-cache, no-cache, no-store, max-age=0',
   pragma: 'no-cache',
   'content-type': 'application/json; charset=utf-8',
   expires: '-1',
-  'x-ms-request-id': 'c2a54bdf-b32b-4644-aff5-d4b0e73b8e64',
-  'x-ms-webhdfs-version': '16.07.18.01',
+  'x-ms-request-id': 'f1dd36d6-8aaa-4eaa-9128-0b3c7570e6ab',
+  'x-ms-webhdfs-version': '16.12.19.00',
   status: '0x0',
   'x-content-type-options': 'nosniff',
   'strict-transport-security': 'max-age=15724800; includeSubDomains',
-  date: 'Fri, 11 Nov 2016 21:56:07 GMT',
+  date: 'Thu, 16 Mar 2017 23:40:44 GMT',
   connection: 'close',
   'content-length': '16' });
  return result; },
 function (nock) { 
 var result = 
-nock('http://xplattestadls2879.azuredatalakestore.net:443')
-  .get('/webhdfs/v1/adlssdkfolder02?op=MSGETFILESTATUS&api-version=2016-11-01')
-  .reply(404, "{\"RemoteException\":{\"exception\":\"FileNotFoundException\",\"message\":\"File/Folder does not exist: /adlssdkfolder02 [75a78f51-4829-49ef-ac69-7296600d8683][2016-11-11T13:56:08.0758372-08:00]\",\"javaClassName\":\"java.io.FileNotFoundException\"}}", { 'cache-control': 'no-cache, no-cache, no-store, max-age=0',
+nock('http://xplattestadls5855.azuredatalakestore.net:443')
+  .get('/webhdfs/v1/adlssdkfolder02?op=GETFILESTATUS&api-version=2016-11-01')
+  .reply(404, "{\"RemoteException\":{\"exception\":\"FileNotFoundException\",\"message\":\"File/Folder does not exist: /adlssdkfolder02 [32a085af-d072-489e-9899-290c86fc5521][2017-03-16T16:40:45.6409641-07:00]\",\"javaClassName\":\"java.io.FileNotFoundException\"}}", { 'cache-control': 'no-cache, no-cache, no-store, max-age=0',
   pragma: 'no-cache',
   'content-type': 'application/json; charset=utf-8',
   expires: '-1',
-  'x-ms-request-id': '75a78f51-4829-49ef-ac69-7296600d8683',
-  'x-ms-webhdfs-version': '16.07.18.01',
+  'x-ms-request-id': '32a085af-d072-489e-9899-290c86fc5521',
+  'x-ms-webhdfs-version': '16.12.19.00',
   status: '0x8309000A',
   'x-content-type-options': 'nosniff',
   'strict-transport-security': 'max-age=15724800; includeSubDomains',
-  date: 'Fri, 11 Nov 2016 21:56:07 GMT',
+  date: 'Thu, 16 Mar 2017 23:40:45 GMT',
   connection: 'close',
   'content-length': '236' });
  return result; },
 function (nock) { 
 var result = 
-nock('https://xplattestadls2879.azuredatalakestore.net:443')
-  .get('/webhdfs/v1/adlssdkfolder02?op=MSGETFILESTATUS&api-version=2016-11-01')
-  .reply(404, "{\"RemoteException\":{\"exception\":\"FileNotFoundException\",\"message\":\"File/Folder does not exist: /adlssdkfolder02 [75a78f51-4829-49ef-ac69-7296600d8683][2016-11-11T13:56:08.0758372-08:00]\",\"javaClassName\":\"java.io.FileNotFoundException\"}}", { 'cache-control': 'no-cache, no-cache, no-store, max-age=0',
+nock('https://xplattestadls5855.azuredatalakestore.net:443')
+  .get('/webhdfs/v1/adlssdkfolder02?op=GETFILESTATUS&api-version=2016-11-01')
+  .reply(404, "{\"RemoteException\":{\"exception\":\"FileNotFoundException\",\"message\":\"File/Folder does not exist: /adlssdkfolder02 [32a085af-d072-489e-9899-290c86fc5521][2017-03-16T16:40:45.6409641-07:00]\",\"javaClassName\":\"java.io.FileNotFoundException\"}}", { 'cache-control': 'no-cache, no-cache, no-store, max-age=0',
   pragma: 'no-cache',
   'content-type': 'application/json; charset=utf-8',
   expires: '-1',
-  'x-ms-request-id': '75a78f51-4829-49ef-ac69-7296600d8683',
-  'x-ms-webhdfs-version': '16.07.18.01',
+  'x-ms-request-id': '32a085af-d072-489e-9899-290c86fc5521',
+  'x-ms-webhdfs-version': '16.12.19.00',
   status: '0x8309000A',
   'x-content-type-options': 'nosniff',
   'strict-transport-security': 'max-age=15724800; includeSubDomains',
-  date: 'Fri, 11 Nov 2016 21:56:07 GMT',
+  date: 'Thu, 16 Mar 2017 23:40:45 GMT',
   connection: 'close',
   'content-length': '236' });
  return result; }]];
\ No newline at end of file
diff --git a/test/recordings/arm-datalake-store-tests/Data_Lake_Store_Clients_Account_and_Filesystem_Data_Lake_Store_FileSystem_file_expiry_commands_should_work.nock.js b/test/recordings/arm-datalake-store-tests/Data_Lake_Store_Clients_Account_and_Filesystem_Data_Lake_Store_FileSystem_file_expiry_commands_should_work.nock.js
index 012f22c037..817a9c4f0b 100644
--- a/test/recordings/arm-datalake-store-tests/Data_Lake_Store_Clients_Account_and_Filesystem_Data_Lake_Store_FileSystem_file_expiry_commands_should_work.nock.js
+++ b/test/recordings/arm-datalake-store-tests/Data_Lake_Store_Clients_Account_and_Filesystem_Data_Lake_Store_FileSystem_file_expiry_commands_should_work.nock.js
@@ -8,320 +8,320 @@ exports.setEnvironment = function() {
 
 exports.scopes = [[function (nock) { 
 var result = 
-nock('http://xplattestadls2879.azuredatalakestore.net:443')
+nock('http://xplattestadls5855.azuredatalakestore.net:443')
   .put('/webhdfs/v1/adlssdkfolder01%2Femptyfile.txt.expire?syncFlag=CLOSE&op=CREATE&write=true&api-version=2016-11-01')
   .reply(201, "", { 'cache-control': 'no-cache, no-cache, no-store, max-age=0',
   pragma: 'no-cache',
   expires: '-1',
-  location: 'https://xplattestadls2879.azuredatalakestore.net/webhdfs/v1/adlssdkfolder01/emptyfile.txt.expire?syncFlag=CLOSE&op=CREATE&write=true&api-version=2016-11-01',
-  'x-ms-request-id': '352dc91b-592e-4a28-b9a5-9d811effdebe',
+  location: 'https://xplattestadls5855.azuredatalakestore.net/webhdfs/v1/adlssdkfolder01/emptyfile.txt.expire?syncFlag=CLOSE&op=CREATE&write=true&api-version=2016-11-01',
+  'x-ms-request-id': '1e9eda0c-02ee-4b4d-9bf8-afade9947924',
   contentlength: '0',
-  'x-ms-webhdfs-version': '16.07.18.01',
+  'x-ms-webhdfs-version': '16.12.19.00',
   status: '0x0',
   'x-content-type-options': 'nosniff',
   'strict-transport-security': 'max-age=15724800; includeSubDomains',
-  date: 'Fri, 11 Nov 2016 21:56:02 GMT',
+  date: 'Thu, 16 Mar 2017 23:40:39 GMT',
   connection: 'close',
   'content-length': '0' });
  return result; },
 function (nock) { 
 var result = 
-nock('https://xplattestadls2879.azuredatalakestore.net:443')
+nock('https://xplattestadls5855.azuredatalakestore.net:443')
   .put('/webhdfs/v1/adlssdkfolder01%2Femptyfile.txt.expire?syncFlag=CLOSE&op=CREATE&write=true&api-version=2016-11-01')
   .reply(201, "", { 'cache-control': 'no-cache, no-cache, no-store, max-age=0',
   pragma: 'no-cache',
   expires: '-1',
-  location: 'https://xplattestadls2879.azuredatalakestore.net/webhdfs/v1/adlssdkfolder01/emptyfile.txt.expire?syncFlag=CLOSE&op=CREATE&write=true&api-version=2016-11-01',
-  'x-ms-request-id': '352dc91b-592e-4a28-b9a5-9d811effdebe',
+  location: 'https://xplattestadls5855.azuredatalakestore.net/webhdfs/v1/adlssdkfolder01/emptyfile.txt.expire?syncFlag=CLOSE&op=CREATE&write=true&api-version=2016-11-01',
+  'x-ms-request-id': '1e9eda0c-02ee-4b4d-9bf8-afade9947924',
   contentlength: '0',
-  'x-ms-webhdfs-version': '16.07.18.01',
+  'x-ms-webhdfs-version': '16.12.19.00',
   status: '0x0',
   'x-content-type-options': 'nosniff',
   'strict-transport-security': 'max-age=15724800; includeSubDomains',
-  date: 'Fri, 11 Nov 2016 21:56:02 GMT',
+  date: 'Thu, 16 Mar 2017 23:40:39 GMT',
   connection: 'close',
   'content-length': '0' });
  return result; },
 function (nock) { 
 var result = 
-nock('http://xplattestadls2879.azuredatalakestore.net:443')
-  .get('/webhdfs/v1/adlssdkfolder01%2Femptyfile.txt.expire?op=MSGETFILESTATUS&api-version=2016-11-01')
-  .reply(200, "{\"FileStatus\":{\"length\":0,\"pathSuffix\":\"\",\"type\":\"FILE\",\"blockSize\":268435456,\"accessTime\":1478901362643,\"modificationTime\":1478901362643,\"replication\":1,\"permission\":\"770\",\"owner\":\"2e6c02d2-a364-4530-9137-d17403996cbf\",\"group\":\"2e6c02d2-a364-4530-9137-d17403996cbf\",\"expirationTime\":0}}", { 'cache-control': 'no-cache, no-cache, no-store, max-age=0',
+nock('http://xplattestadls5855.azuredatalakestore.net:443')
+  .get('/webhdfs/v1/adlssdkfolder01%2Femptyfile.txt.expire?op=GETFILESTATUS&api-version=2016-11-01')
+  .reply(200, "{\"FileStatus\":{\"length\":0,\"pathSuffix\":\"\",\"type\":\"FILE\",\"blockSize\":268435456,\"accessTime\":1489707639205,\"modificationTime\":1489707639205,\"replication\":1,\"permission\":\"770\",\"owner\":\"2e6c02d2-a364-4530-9137-d17403996cbf\",\"group\":\"2e6c02d2-a364-4530-9137-d17403996cbf\",\"msExpirationTime\":0,\"aclBit\":false}}", { 'cache-control': 'no-cache, no-cache, no-store, max-age=0',
   pragma: 'no-cache',
   'content-type': 'application/json; charset=utf-8',
   expires: '-1',
-  'x-ms-request-id': '1359ef9e-b27a-4a20-8b2f-d54b213b6080',
-  'x-ms-webhdfs-version': '16.07.18.01',
+  'x-ms-request-id': 'b5fb3723-1e4e-4b74-80db-f00be88df9c8',
+  'x-ms-webhdfs-version': '16.12.19.00',
   status: '0x0',
   'x-content-type-options': 'nosniff',
   'strict-transport-security': 'max-age=15724800; includeSubDomains',
-  date: 'Fri, 11 Nov 2016 21:56:02 GMT',
+  date: 'Thu, 16 Mar 2017 23:40:38 GMT',
   connection: 'close',
-  'content-length': '287' });
+  'content-length': '304' });
  return result; },
 function (nock) { 
 var result = 
-nock('https://xplattestadls2879.azuredatalakestore.net:443')
-  .get('/webhdfs/v1/adlssdkfolder01%2Femptyfile.txt.expire?op=MSGETFILESTATUS&api-version=2016-11-01')
-  .reply(200, "{\"FileStatus\":{\"length\":0,\"pathSuffix\":\"\",\"type\":\"FILE\",\"blockSize\":268435456,\"accessTime\":1478901362643,\"modificationTime\":1478901362643,\"replication\":1,\"permission\":\"770\",\"owner\":\"2e6c02d2-a364-4530-9137-d17403996cbf\",\"group\":\"2e6c02d2-a364-4530-9137-d17403996cbf\",\"expirationTime\":0}}", { 'cache-control': 'no-cache, no-cache, no-store, max-age=0',
+nock('https://xplattestadls5855.azuredatalakestore.net:443')
+  .get('/webhdfs/v1/adlssdkfolder01%2Femptyfile.txt.expire?op=GETFILESTATUS&api-version=2016-11-01')
+  .reply(200, "{\"FileStatus\":{\"length\":0,\"pathSuffix\":\"\",\"type\":\"FILE\",\"blockSize\":268435456,\"accessTime\":1489707639205,\"modificationTime\":1489707639205,\"replication\":1,\"permission\":\"770\",\"owner\":\"2e6c02d2-a364-4530-9137-d17403996cbf\",\"group\":\"2e6c02d2-a364-4530-9137-d17403996cbf\",\"msExpirationTime\":0,\"aclBit\":false}}", { 'cache-control': 'no-cache, no-cache, no-store, max-age=0',
   pragma: 'no-cache',
   'content-type': 'application/json; charset=utf-8',
   expires: '-1',
-  'x-ms-request-id': '1359ef9e-b27a-4a20-8b2f-d54b213b6080',
-  'x-ms-webhdfs-version': '16.07.18.01',
+  'x-ms-request-id': 'b5fb3723-1e4e-4b74-80db-f00be88df9c8',
+  'x-ms-webhdfs-version': '16.12.19.00',
   status: '0x0',
   'x-content-type-options': 'nosniff',
   'strict-transport-security': 'max-age=15724800; includeSubDomains',
-  date: 'Fri, 11 Nov 2016 21:56:02 GMT',
+  date: 'Thu, 16 Mar 2017 23:40:38 GMT',
   connection: 'close',
-  'content-length': '287' });
+  'content-length': '304' });
  return result; },
 function (nock) { 
 var result = 
-nock('http://xplattestadls2879.azuredatalakestore.net:443')
-  .put('/WebHdfsExt/adlssdkfolder01%2Femptyfile.txt.expire?expiryOption=Absolute&expireTime=1478901482643&op=SETEXPIRY&api-version=2016-11-01')
+nock('http://xplattestadls5855.azuredatalakestore.net:443')
+  .put('/WebHdfsExt/adlssdkfolder01%2Femptyfile.txt.expire?expiryOption=Absolute&expireTime=1489707759205&op=SETEXPIRY&api-version=2016-11-01')
   .reply(200, "", { 'cache-control': 'no-cache, no-cache, no-store, max-age=0',
   pragma: 'no-cache',
   expires: '-1',
-  'x-ms-request-id': '776ea6b0-74ba-4ee5-9001-3e9bb3844cf1',
+  'x-ms-request-id': '2804ac81-5c5e-4ca2-888f-097e77cb6c7c',
   'x-content-type-options': 'nosniff',
   'strict-transport-security': 'max-age=15724800; includeSubDomains',
-  date: 'Fri, 11 Nov 2016 21:56:02 GMT',
+  date: 'Thu, 16 Mar 2017 23:40:39 GMT',
   connection: 'close',
   'content-length': '0' });
  return result; },
 function (nock) { 
 var result = 
-nock('https://xplattestadls2879.azuredatalakestore.net:443')
-  .put('/WebHdfsExt/adlssdkfolder01%2Femptyfile.txt.expire?expiryOption=Absolute&expireTime=1478901482643&op=SETEXPIRY&api-version=2016-11-01')
+nock('https://xplattestadls5855.azuredatalakestore.net:443')
+  .put('/WebHdfsExt/adlssdkfolder01%2Femptyfile.txt.expire?expiryOption=Absolute&expireTime=1489707759205&op=SETEXPIRY&api-version=2016-11-01')
   .reply(200, "", { 'cache-control': 'no-cache, no-cache, no-store, max-age=0',
   pragma: 'no-cache',
   expires: '-1',
-  'x-ms-request-id': '776ea6b0-74ba-4ee5-9001-3e9bb3844cf1',
+  'x-ms-request-id': '2804ac81-5c5e-4ca2-888f-097e77cb6c7c',
   'x-content-type-options': 'nosniff',
   'strict-transport-security': 'max-age=15724800; includeSubDomains',
-  date: 'Fri, 11 Nov 2016 21:56:02 GMT',
+  date: 'Thu, 16 Mar 2017 23:40:39 GMT',
   connection: 'close',
   'content-length': '0' });
  return result; },
 function (nock) { 
 var result = 
-nock('http://xplattestadls2879.azuredatalakestore.net:443')
-  .get('/webhdfs/v1/adlssdkfolder01%2Femptyfile.txt.expire?op=MSGETFILESTATUS&api-version=2016-11-01')
-  .reply(200, "{\"FileStatus\":{\"length\":0,\"pathSuffix\":\"\",\"type\":\"FILE\",\"blockSize\":268435456,\"accessTime\":1478901362643,\"modificationTime\":1478901362643,\"replication\":1,\"permission\":\"770\",\"owner\":\"2e6c02d2-a364-4530-9137-d17403996cbf\",\"group\":\"2e6c02d2-a364-4530-9137-d17403996cbf\",\"expirationTime\":1478901482643}}", { 'cache-control': 'no-cache, no-cache, no-store, max-age=0',
+nock('http://xplattestadls5855.azuredatalakestore.net:443')
+  .get('/webhdfs/v1/adlssdkfolder01%2Femptyfile.txt.expire?op=GETFILESTATUS&api-version=2016-11-01')
+  .reply(200, "{\"FileStatus\":{\"length\":0,\"pathSuffix\":\"\",\"type\":\"FILE\",\"blockSize\":268435456,\"accessTime\":1489707639205,\"modificationTime\":1489707639205,\"replication\":1,\"permission\":\"770\",\"owner\":\"2e6c02d2-a364-4530-9137-d17403996cbf\",\"group\":\"2e6c02d2-a364-4530-9137-d17403996cbf\",\"msExpirationTime\":1489707759205,\"aclBit\":false}}", { 'cache-control': 'no-cache, no-cache, no-store, max-age=0',
   pragma: 'no-cache',
   'content-type': 'application/json; charset=utf-8',
   expires: '-1',
-  'x-ms-request-id': 'fa1ff4de-0fcd-4a0f-bb71-25bb6a8312cb',
-  'x-ms-webhdfs-version': '16.07.18.01',
+  'x-ms-request-id': '3b40d519-f3bf-4710-8618-68b8d5887963',
+  'x-ms-webhdfs-version': '16.12.19.00',
   status: '0x0',
   'x-content-type-options': 'nosniff',
   'strict-transport-security': 'max-age=15724800; includeSubDomains',
-  date: 'Fri, 11 Nov 2016 21:56:03 GMT',
+  date: 'Thu, 16 Mar 2017 23:40:40 GMT',
   connection: 'close',
-  'content-length': '299' });
+  'content-length': '316' });
  return result; },
 function (nock) { 
 var result = 
-nock('https://xplattestadls2879.azuredatalakestore.net:443')
-  .get('/webhdfs/v1/adlssdkfolder01%2Femptyfile.txt.expire?op=MSGETFILESTATUS&api-version=2016-11-01')
-  .reply(200, "{\"FileStatus\":{\"length\":0,\"pathSuffix\":\"\",\"type\":\"FILE\",\"blockSize\":268435456,\"accessTime\":1478901362643,\"modificationTime\":1478901362643,\"replication\":1,\"permission\":\"770\",\"owner\":\"2e6c02d2-a364-4530-9137-d17403996cbf\",\"group\":\"2e6c02d2-a364-4530-9137-d17403996cbf\",\"expirationTime\":1478901482643}}", { 'cache-control': 'no-cache, no-cache, no-store, max-age=0',
+nock('https://xplattestadls5855.azuredatalakestore.net:443')
+  .get('/webhdfs/v1/adlssdkfolder01%2Femptyfile.txt.expire?op=GETFILESTATUS&api-version=2016-11-01')
+  .reply(200, "{\"FileStatus\":{\"length\":0,\"pathSuffix\":\"\",\"type\":\"FILE\",\"blockSize\":268435456,\"accessTime\":1489707639205,\"modificationTime\":1489707639205,\"replication\":1,\"permission\":\"770\",\"owner\":\"2e6c02d2-a364-4530-9137-d17403996cbf\",\"group\":\"2e6c02d2-a364-4530-9137-d17403996cbf\",\"msExpirationTime\":1489707759205,\"aclBit\":false}}", { 'cache-control': 'no-cache, no-cache, no-store, max-age=0',
   pragma: 'no-cache',
   'content-type': 'application/json; charset=utf-8',
   expires: '-1',
-  'x-ms-request-id': 'fa1ff4de-0fcd-4a0f-bb71-25bb6a8312cb',
-  'x-ms-webhdfs-version': '16.07.18.01',
+  'x-ms-request-id': '3b40d519-f3bf-4710-8618-68b8d5887963',
+  'x-ms-webhdfs-version': '16.12.19.00',
   status: '0x0',
   'x-content-type-options': 'nosniff',
   'strict-transport-security': 'max-age=15724800; includeSubDomains',
-  date: 'Fri, 11 Nov 2016 21:56:03 GMT',
+  date: 'Thu, 16 Mar 2017 23:40:40 GMT',
   connection: 'close',
-  'content-length': '299' });
+  'content-length': '316' });
  return result; },
 function (nock) { 
 var result = 
-nock('http://xplattestadls2879.azuredatalakestore.net:443')
+nock('http://xplattestadls5855.azuredatalakestore.net:443')
   .put('/WebHdfsExt/adlssdkfolder01%2Femptyfile.txt.expire?expiryOption=RelativeToCreationDate&expireTime=120000&op=SETEXPIRY&api-version=2016-11-01')
   .reply(200, "", { 'cache-control': 'no-cache, no-cache, no-store, max-age=0',
   pragma: 'no-cache',
   expires: '-1',
-  'x-ms-request-id': '92e67087-62d3-4666-85cd-5485b09a88e5',
+  'x-ms-request-id': '19f228fe-57f9-4604-96aa-970b0e98bc92',
   'x-content-type-options': 'nosniff',
   'strict-transport-security': 'max-age=15724800; includeSubDomains',
-  date: 'Fri, 11 Nov 2016 21:56:04 GMT',
+  date: 'Thu, 16 Mar 2017 23:40:40 GMT',
   connection: 'close',
   'content-length': '0' });
  return result; },
 function (nock) { 
 var result = 
-nock('https://xplattestadls2879.azuredatalakestore.net:443')
+nock('https://xplattestadls5855.azuredatalakestore.net:443')
   .put('/WebHdfsExt/adlssdkfolder01%2Femptyfile.txt.expire?expiryOption=RelativeToCreationDate&expireTime=120000&op=SETEXPIRY&api-version=2016-11-01')
   .reply(200, "", { 'cache-control': 'no-cache, no-cache, no-store, max-age=0',
   pragma: 'no-cache',
   expires: '-1',
-  'x-ms-request-id': '92e67087-62d3-4666-85cd-5485b09a88e5',
+  'x-ms-request-id': '19f228fe-57f9-4604-96aa-970b0e98bc92',
   'x-content-type-options': 'nosniff',
   'strict-transport-security': 'max-age=15724800; includeSubDomains',
-  date: 'Fri, 11 Nov 2016 21:56:04 GMT',
+  date: 'Thu, 16 Mar 2017 23:40:40 GMT',
   connection: 'close',
   'content-length': '0' });
  return result; },
 function (nock) { 
 var result = 
-nock('http://xplattestadls2879.azuredatalakestore.net:443')
-  .get('/webhdfs/v1/adlssdkfolder01%2Femptyfile.txt.expire?op=MSGETFILESTATUS&api-version=2016-11-01')
-  .reply(200, "{\"FileStatus\":{\"length\":0,\"pathSuffix\":\"\",\"type\":\"FILE\",\"blockSize\":268435456,\"accessTime\":1478901362643,\"modificationTime\":1478901362643,\"replication\":1,\"permission\":\"770\",\"owner\":\"2e6c02d2-a364-4530-9137-d17403996cbf\",\"group\":\"2e6c02d2-a364-4530-9137-d17403996cbf\",\"expirationTime\":1478901482643}}", { 'cache-control': 'no-cache, no-cache, no-store, max-age=0',
+nock('http://xplattestadls5855.azuredatalakestore.net:443')
+  .get('/webhdfs/v1/adlssdkfolder01%2Femptyfile.txt.expire?op=GETFILESTATUS&api-version=2016-11-01')
+  .reply(200, "{\"FileStatus\":{\"length\":0,\"pathSuffix\":\"\",\"type\":\"FILE\",\"blockSize\":268435456,\"accessTime\":1489707639205,\"modificationTime\":1489707639205,\"replication\":1,\"permission\":\"770\",\"owner\":\"2e6c02d2-a364-4530-9137-d17403996cbf\",\"group\":\"2e6c02d2-a364-4530-9137-d17403996cbf\",\"msExpirationTime\":1489707759205,\"aclBit\":false}}", { 'cache-control': 'no-cache, no-cache, no-store, max-age=0',
   pragma: 'no-cache',
   'content-type': 'application/json; charset=utf-8',
   expires: '-1',
-  'x-ms-request-id': 'a7b10be3-e5c9-40ed-a5f2-d6e458923a5b',
-  'x-ms-webhdfs-version': '16.07.18.01',
+  'x-ms-request-id': 'dff63b73-e2b6-4245-97d4-6e54b2bbba7b',
+  'x-ms-webhdfs-version': '16.12.19.00',
   status: '0x0',
   'x-content-type-options': 'nosniff',
   'strict-transport-security': 'max-age=15724800; includeSubDomains',
-  date: 'Fri, 11 Nov 2016 21:56:03 GMT',
+  date: 'Thu, 16 Mar 2017 23:40:40 GMT',
   connection: 'close',
-  'content-length': '299' });
+  'content-length': '316' });
  return result; },
 function (nock) { 
 var result = 
-nock('https://xplattestadls2879.azuredatalakestore.net:443')
-  .get('/webhdfs/v1/adlssdkfolder01%2Femptyfile.txt.expire?op=MSGETFILESTATUS&api-version=2016-11-01')
-  .reply(200, "{\"FileStatus\":{\"length\":0,\"pathSuffix\":\"\",\"type\":\"FILE\",\"blockSize\":268435456,\"accessTime\":1478901362643,\"modificationTime\":1478901362643,\"replication\":1,\"permission\":\"770\",\"owner\":\"2e6c02d2-a364-4530-9137-d17403996cbf\",\"group\":\"2e6c02d2-a364-4530-9137-d17403996cbf\",\"expirationTime\":1478901482643}}", { 'cache-control': 'no-cache, no-cache, no-store, max-age=0',
+nock('https://xplattestadls5855.azuredatalakestore.net:443')
+  .get('/webhdfs/v1/adlssdkfolder01%2Femptyfile.txt.expire?op=GETFILESTATUS&api-version=2016-11-01')
+  .reply(200, "{\"FileStatus\":{\"length\":0,\"pathSuffix\":\"\",\"type\":\"FILE\",\"blockSize\":268435456,\"accessTime\":1489707639205,\"modificationTime\":1489707639205,\"replication\":1,\"permission\":\"770\",\"owner\":\"2e6c02d2-a364-4530-9137-d17403996cbf\",\"group\":\"2e6c02d2-a364-4530-9137-d17403996cbf\",\"msExpirationTime\":1489707759205,\"aclBit\":false}}", { 'cache-control': 'no-cache, no-cache, no-store, max-age=0',
   pragma: 'no-cache',
   'content-type': 'application/json; charset=utf-8',
   expires: '-1',
-  'x-ms-request-id': 'a7b10be3-e5c9-40ed-a5f2-d6e458923a5b',
-  'x-ms-webhdfs-version': '16.07.18.01',
+  'x-ms-request-id': 'dff63b73-e2b6-4245-97d4-6e54b2bbba7b',
+  'x-ms-webhdfs-version': '16.12.19.00',
   status: '0x0',
   'x-content-type-options': 'nosniff',
   'strict-transport-security': 'max-age=15724800; includeSubDomains',
-  date: 'Fri, 11 Nov 2016 21:56:03 GMT',
+  date: 'Thu, 16 Mar 2017 23:40:40 GMT',
   connection: 'close',
-  'content-length': '299' });
+  'content-length': '316' });
  return result; },
 function (nock) { 
 var result = 
-nock('http://xplattestadls2879.azuredatalakestore.net:443')
+nock('http://xplattestadls5855.azuredatalakestore.net:443')
   .put('/WebHdfsExt/adlssdkfolder01%2Femptyfile.txt.expire?expiryOption=RelativeToNow&expireTime=120000&op=SETEXPIRY&api-version=2016-11-01')
   .reply(200, "", { 'cache-control': 'no-cache, no-cache, no-store, max-age=0',
   pragma: 'no-cache',
   expires: '-1',
-  'x-ms-request-id': '27c8083f-9208-4531-9aa6-276c7c22abbb',
+  'x-ms-request-id': '7ce921ca-db52-4159-a596-eeeacf729b18',
   'x-content-type-options': 'nosniff',
   'strict-transport-security': 'max-age=15724800; includeSubDomains',
-  date: 'Fri, 11 Nov 2016 21:56:05 GMT',
+  date: 'Thu, 16 Mar 2017 23:40:41 GMT',
   connection: 'close',
   'content-length': '0' });
  return result; },
 function (nock) { 
 var result = 
-nock('https://xplattestadls2879.azuredatalakestore.net:443')
+nock('https://xplattestadls5855.azuredatalakestore.net:443')
   .put('/WebHdfsExt/adlssdkfolder01%2Femptyfile.txt.expire?expiryOption=RelativeToNow&expireTime=120000&op=SETEXPIRY&api-version=2016-11-01')
   .reply(200, "", { 'cache-control': 'no-cache, no-cache, no-store, max-age=0',
   pragma: 'no-cache',
   expires: '-1',
-  'x-ms-request-id': '27c8083f-9208-4531-9aa6-276c7c22abbb',
+  'x-ms-request-id': '7ce921ca-db52-4159-a596-eeeacf729b18',
   'x-content-type-options': 'nosniff',
   'strict-transport-security': 'max-age=15724800; includeSubDomains',
-  date: 'Fri, 11 Nov 2016 21:56:05 GMT',
+  date: 'Thu, 16 Mar 2017 23:40:41 GMT',
   connection: 'close',
   'content-length': '0' });
  return result; },
 function (nock) { 
 var result = 
-nock('http://xplattestadls2879.azuredatalakestore.net:443')
-  .get('/webhdfs/v1/adlssdkfolder01%2Femptyfile.txt.expire?op=MSGETFILESTATUS&api-version=2016-11-01')
-  .reply(200, "{\"FileStatus\":{\"length\":0,\"pathSuffix\":\"\",\"type\":\"FILE\",\"blockSize\":268435456,\"accessTime\":1478901362643,\"modificationTime\":1478901362643,\"replication\":1,\"permission\":\"770\",\"owner\":\"2e6c02d2-a364-4530-9137-d17403996cbf\",\"group\":\"2e6c02d2-a364-4530-9137-d17403996cbf\",\"expirationTime\":1478901485197}}", { 'cache-control': 'no-cache, no-cache, no-store, max-age=0',
+nock('http://xplattestadls5855.azuredatalakestore.net:443')
+  .get('/webhdfs/v1/adlssdkfolder01%2Femptyfile.txt.expire?op=GETFILESTATUS&api-version=2016-11-01')
+  .reply(200, "{\"FileStatus\":{\"length\":0,\"pathSuffix\":\"\",\"type\":\"FILE\",\"blockSize\":268435456,\"accessTime\":1489707639205,\"modificationTime\":1489707639205,\"replication\":1,\"permission\":\"770\",\"owner\":\"2e6c02d2-a364-4530-9137-d17403996cbf\",\"group\":\"2e6c02d2-a364-4530-9137-d17403996cbf\",\"msExpirationTime\":1489707762141,\"aclBit\":false}}", { 'cache-control': 'no-cache, no-cache, no-store, max-age=0',
   pragma: 'no-cache',
   'content-type': 'application/json; charset=utf-8',
   expires: '-1',
-  'x-ms-request-id': '58f05a23-f008-4450-a4e1-34f2904e321d',
-  'x-ms-webhdfs-version': '16.07.18.01',
+  'x-ms-request-id': '05fe6c96-1734-45a7-9854-540a94a0f533',
+  'x-ms-webhdfs-version': '16.12.19.00',
   status: '0x0',
   'x-content-type-options': 'nosniff',
   'strict-transport-security': 'max-age=15724800; includeSubDomains',
-  date: 'Fri, 11 Nov 2016 21:56:04 GMT',
+  date: 'Thu, 16 Mar 2017 23:40:41 GMT',
   connection: 'close',
-  'content-length': '299' });
+  'content-length': '316' });
  return result; },
 function (nock) { 
 var result = 
-nock('https://xplattestadls2879.azuredatalakestore.net:443')
-  .get('/webhdfs/v1/adlssdkfolder01%2Femptyfile.txt.expire?op=MSGETFILESTATUS&api-version=2016-11-01')
-  .reply(200, "{\"FileStatus\":{\"length\":0,\"pathSuffix\":\"\",\"type\":\"FILE\",\"blockSize\":268435456,\"accessTime\":1478901362643,\"modificationTime\":1478901362643,\"replication\":1,\"permission\":\"770\",\"owner\":\"2e6c02d2-a364-4530-9137-d17403996cbf\",\"group\":\"2e6c02d2-a364-4530-9137-d17403996cbf\",\"expirationTime\":1478901485197}}", { 'cache-control': 'no-cache, no-cache, no-store, max-age=0',
+nock('https://xplattestadls5855.azuredatalakestore.net:443')
+  .get('/webhdfs/v1/adlssdkfolder01%2Femptyfile.txt.expire?op=GETFILESTATUS&api-version=2016-11-01')
+  .reply(200, "{\"FileStatus\":{\"length\":0,\"pathSuffix\":\"\",\"type\":\"FILE\",\"blockSize\":268435456,\"accessTime\":1489707639205,\"modificationTime\":1489707639205,\"replication\":1,\"permission\":\"770\",\"owner\":\"2e6c02d2-a364-4530-9137-d17403996cbf\",\"group\":\"2e6c02d2-a364-4530-9137-d17403996cbf\",\"msExpirationTime\":1489707762141,\"aclBit\":false}}", { 'cache-control': 'no-cache, no-cache, no-store, max-age=0',
   pragma: 'no-cache',
   'content-type': 'application/json; charset=utf-8',
   expires: '-1',
-  'x-ms-request-id': '58f05a23-f008-4450-a4e1-34f2904e321d',
-  'x-ms-webhdfs-version': '16.07.18.01',
+  'x-ms-request-id': '05fe6c96-1734-45a7-9854-540a94a0f533',
+  'x-ms-webhdfs-version': '16.12.19.00',
   status: '0x0',
   'x-content-type-options': 'nosniff',
   'strict-transport-security': 'max-age=15724800; includeSubDomains',
-  date: 'Fri, 11 Nov 2016 21:56:04 GMT',
+  date: 'Thu, 16 Mar 2017 23:40:41 GMT',
   connection: 'close',
-  'content-length': '299' });
+  'content-length': '316' });
  return result; },
 function (nock) { 
 var result = 
-nock('http://xplattestadls2879.azuredatalakestore.net:443')
+nock('http://xplattestadls5855.azuredatalakestore.net:443')
   .put('/WebHdfsExt/adlssdkfolder01%2Femptyfile.txt.expire?expiryOption=NeverExpire&expireTime=120000&op=SETEXPIRY&api-version=2016-11-01')
   .reply(200, "", { 'cache-control': 'no-cache, no-cache, no-store, max-age=0',
   pragma: 'no-cache',
   expires: '-1',
-  'x-ms-request-id': 'fac3665a-344f-42c7-b3d2-9be73ec57529',
+  'x-ms-request-id': '740c029d-0556-4684-b6b1-e10a3723b271',
   'x-content-type-options': 'nosniff',
   'strict-transport-security': 'max-age=15724800; includeSubDomains',
-  date: 'Fri, 11 Nov 2016 21:56:06 GMT',
+  date: 'Thu, 16 Mar 2017 23:40:42 GMT',
   connection: 'close',
   'content-length': '0' });
  return result; },
 function (nock) { 
 var result = 
-nock('https://xplattestadls2879.azuredatalakestore.net:443')
+nock('https://xplattestadls5855.azuredatalakestore.net:443')
   .put('/WebHdfsExt/adlssdkfolder01%2Femptyfile.txt.expire?expiryOption=NeverExpire&expireTime=120000&op=SETEXPIRY&api-version=2016-11-01')
   .reply(200, "", { 'cache-control': 'no-cache, no-cache, no-store, max-age=0',
   pragma: 'no-cache',
   expires: '-1',
-  'x-ms-request-id': 'fac3665a-344f-42c7-b3d2-9be73ec57529',
+  'x-ms-request-id': '740c029d-0556-4684-b6b1-e10a3723b271',
   'x-content-type-options': 'nosniff',
   'strict-transport-security': 'max-age=15724800; includeSubDomains',
-  date: 'Fri, 11 Nov 2016 21:56:06 GMT',
+  date: 'Thu, 16 Mar 2017 23:40:42 GMT',
   connection: 'close',
   'content-length': '0' });
  return result; },
 function (nock) { 
 var result = 
-nock('http://xplattestadls2879.azuredatalakestore.net:443')
-  .get('/webhdfs/v1/adlssdkfolder01%2Femptyfile.txt.expire?op=MSGETFILESTATUS&api-version=2016-11-01')
-  .reply(200, "{\"FileStatus\":{\"length\":0,\"pathSuffix\":\"\",\"type\":\"FILE\",\"blockSize\":268435456,\"accessTime\":1478901362643,\"modificationTime\":1478901362643,\"replication\":1,\"permission\":\"770\",\"owner\":\"2e6c02d2-a364-4530-9137-d17403996cbf\",\"group\":\"2e6c02d2-a364-4530-9137-d17403996cbf\",\"expirationTime\":0}}", { 'cache-control': 'no-cache, no-cache, no-store, max-age=0',
+nock('http://xplattestadls5855.azuredatalakestore.net:443')
+  .get('/webhdfs/v1/adlssdkfolder01%2Femptyfile.txt.expire?op=GETFILESTATUS&api-version=2016-11-01')
+  .reply(200, "{\"FileStatus\":{\"length\":0,\"pathSuffix\":\"\",\"type\":\"FILE\",\"blockSize\":268435456,\"accessTime\":1489707639205,\"modificationTime\":1489707639205,\"replication\":1,\"permission\":\"770\",\"owner\":\"2e6c02d2-a364-4530-9137-d17403996cbf\",\"group\":\"2e6c02d2-a364-4530-9137-d17403996cbf\",\"msExpirationTime\":0,\"aclBit\":false}}", { 'cache-control': 'no-cache, no-cache, no-store, max-age=0',
   pragma: 'no-cache',
   'content-type': 'application/json; charset=utf-8',
   expires: '-1',
-  'x-ms-request-id': '0cd15bf3-c792-421c-b0ca-19482033d68e',
-  'x-ms-webhdfs-version': '16.07.18.01',
+  'x-ms-request-id': 'a7e599cf-ee31-4edc-8d7b-6530039b40f0',
+  'x-ms-webhdfs-version': '16.12.19.00',
   status: '0x0',
   'x-content-type-options': 'nosniff',
   'strict-transport-security': 'max-age=15724800; includeSubDomains',
-  date: 'Fri, 11 Nov 2016 21:56:05 GMT',
+  date: 'Thu, 16 Mar 2017 23:40:42 GMT',
   connection: 'close',
-  'content-length': '287' });
+  'content-length': '304' });
  return result; },
 function (nock) { 
 var result = 
-nock('https://xplattestadls2879.azuredatalakestore.net:443')
-  .get('/webhdfs/v1/adlssdkfolder01%2Femptyfile.txt.expire?op=MSGETFILESTATUS&api-version=2016-11-01')
-  .reply(200, "{\"FileStatus\":{\"length\":0,\"pathSuffix\":\"\",\"type\":\"FILE\",\"blockSize\":268435456,\"accessTime\":1478901362643,\"modificationTime\":1478901362643,\"replication\":1,\"permission\":\"770\",\"owner\":\"2e6c02d2-a364-4530-9137-d17403996cbf\",\"group\":\"2e6c02d2-a364-4530-9137-d17403996cbf\",\"expirationTime\":0}}", { 'cache-control': 'no-cache, no-cache, no-store, max-age=0',
+nock('https://xplattestadls5855.azuredatalakestore.net:443')
+  .get('/webhdfs/v1/adlssdkfolder01%2Femptyfile.txt.expire?op=GETFILESTATUS&api-version=2016-11-01')
+  .reply(200, "{\"FileStatus\":{\"length\":0,\"pathSuffix\":\"\",\"type\":\"FILE\",\"blockSize\":268435456,\"accessTime\":1489707639205,\"modificationTime\":1489707639205,\"replication\":1,\"permission\":\"770\",\"owner\":\"2e6c02d2-a364-4530-9137-d17403996cbf\",\"group\":\"2e6c02d2-a364-4530-9137-d17403996cbf\",\"msExpirationTime\":0,\"aclBit\":false}}", { 'cache-control': 'no-cache, no-cache, no-store, max-age=0',
   pragma: 'no-cache',
   'content-type': 'application/json; charset=utf-8',
   expires: '-1',
-  'x-ms-request-id': '0cd15bf3-c792-421c-b0ca-19482033d68e',
-  'x-ms-webhdfs-version': '16.07.18.01',
+  'x-ms-request-id': 'a7e599cf-ee31-4edc-8d7b-6530039b40f0',
+  'x-ms-webhdfs-version': '16.12.19.00',
   status: '0x0',
   'x-content-type-options': 'nosniff',
   'strict-transport-security': 'max-age=15724800; includeSubDomains',
-  date: 'Fri, 11 Nov 2016 21:56:05 GMT',
+  date: 'Thu, 16 Mar 2017 23:40:42 GMT',
   connection: 'close',
-  'content-length': '287' });
+  'content-length': '304' });
  return result; }]];
- exports.mockVariables = function() { return {"nowPlusOffset":1478901484824}; };
\ No newline at end of file
+ exports.mockVariables = function() { return {"nowPlusOffset":1489707761660}; };
\ No newline at end of file
diff --git a/test/recordings/arm-datalake-store-tests/Data_Lake_Store_Clients_Account_and_Filesystem_Data_Lake_Store_FileSystem_move_commands_should_work.nock.js b/test/recordings/arm-datalake-store-tests/Data_Lake_Store_Clients_Account_and_Filesystem_Data_Lake_Store_FileSystem_move_commands_should_work.nock.js
index 9c1f475012..2eb14ae492 100644
--- a/test/recordings/arm-datalake-store-tests/Data_Lake_Store_Clients_Account_and_Filesystem_Data_Lake_Store_FileSystem_move_commands_should_work.nock.js
+++ b/test/recordings/arm-datalake-store-tests/Data_Lake_Store_Clients_Account_and_Filesystem_Data_Lake_Store_FileSystem_move_commands_should_work.nock.js
@@ -8,239 +8,239 @@ exports.setEnvironment = function() {
 
 exports.scopes = [[function (nock) { 
 var result = 
-nock('http://xplattestadls2879.azuredatalakestore.net:443')
+nock('http://xplattestadls5855.azuredatalakestore.net:443')
   .put('/webhdfs/v1/adlssdkfolder01%2Fconcatfile.txt?destination=adlssdkfolder01%2Fmovefile.txt&op=RENAME&api-version=2016-11-01')
   .reply(200, "{\"boolean\":true}", { 'cache-control': 'no-cache, no-cache, no-store, max-age=0',
   pragma: 'no-cache',
   'content-type': 'application/json; charset=utf-8',
   expires: '-1',
-  'x-ms-request-id': 'dee8f891-ca75-4674-8157-03199348900e',
-  'x-ms-webhdfs-version': '16.07.18.01',
+  'x-ms-request-id': '34fc3d58-ee3d-4d63-b8e3-0c87c82c5693',
+  'x-ms-webhdfs-version': '16.12.19.00',
   status: '0x0',
   'x-content-type-options': 'nosniff',
   'strict-transport-security': 'max-age=15724800; includeSubDomains',
-  date: 'Fri, 11 Nov 2016 21:55:59 GMT',
+  date: 'Thu, 16 Mar 2017 23:40:34 GMT',
   connection: 'close',
   'content-length': '16' });
  return result; },
 function (nock) { 
 var result = 
-nock('https://xplattestadls2879.azuredatalakestore.net:443')
+nock('https://xplattestadls5855.azuredatalakestore.net:443')
   .put('/webhdfs/v1/adlssdkfolder01%2Fconcatfile.txt?destination=adlssdkfolder01%2Fmovefile.txt&op=RENAME&api-version=2016-11-01')
   .reply(200, "{\"boolean\":true}", { 'cache-control': 'no-cache, no-cache, no-store, max-age=0',
   pragma: 'no-cache',
   'content-type': 'application/json; charset=utf-8',
   expires: '-1',
-  'x-ms-request-id': 'dee8f891-ca75-4674-8157-03199348900e',
-  'x-ms-webhdfs-version': '16.07.18.01',
+  'x-ms-request-id': '34fc3d58-ee3d-4d63-b8e3-0c87c82c5693',
+  'x-ms-webhdfs-version': '16.12.19.00',
   status: '0x0',
   'x-content-type-options': 'nosniff',
   'strict-transport-security': 'max-age=15724800; includeSubDomains',
-  date: 'Fri, 11 Nov 2016 21:55:59 GMT',
+  date: 'Thu, 16 Mar 2017 23:40:34 GMT',
   connection: 'close',
   'content-length': '16' });
  return result; },
 function (nock) { 
 var result = 
-nock('http://xplattestadls2879.azuredatalakestore.net:443')
-  .get('/webhdfs/v1/adlssdkfolder01%2Fmovefile.txt?op=MSGETFILESTATUS&api-version=2016-11-01')
-  .reply(200, "{\"FileStatus\":{\"length\":44,\"pathSuffix\":\"\",\"type\":\"FILE\",\"blockSize\":268435456,\"accessTime\":1478901358470,\"modificationTime\":1478901358539,\"replication\":1,\"permission\":\"770\",\"owner\":\"2e6c02d2-a364-4530-9137-d17403996cbf\",\"group\":\"2e6c02d2-a364-4530-9137-d17403996cbf\",\"expirationTime\":0}}", { 'cache-control': 'no-cache, no-cache, no-store, max-age=0',
+nock('http://xplattestadls5855.azuredatalakestore.net:443')
+  .get('/webhdfs/v1/adlssdkfolder01%2Fmovefile.txt?op=GETFILESTATUS&api-version=2016-11-01')
+  .reply(200, "{\"FileStatus\":{\"length\":44,\"pathSuffix\":\"\",\"type\":\"FILE\",\"blockSize\":268435456,\"accessTime\":1489707634295,\"modificationTime\":1489707634349,\"replication\":1,\"permission\":\"770\",\"owner\":\"2e6c02d2-a364-4530-9137-d17403996cbf\",\"group\":\"2e6c02d2-a364-4530-9137-d17403996cbf\",\"msExpirationTime\":0,\"aclBit\":false}}", { 'cache-control': 'no-cache, no-cache, no-store, max-age=0',
   pragma: 'no-cache',
   'content-type': 'application/json; charset=utf-8',
   expires: '-1',
-  'x-ms-request-id': 'd6b9fdd1-3f97-420d-b018-99e4dcde3a2a',
-  'x-ms-webhdfs-version': '16.07.18.01',
+  'x-ms-request-id': '1f6f7941-43b4-4ce4-a2f1-8070665a5203',
+  'x-ms-webhdfs-version': '16.12.19.00',
   status: '0x0',
   'x-content-type-options': 'nosniff',
   'strict-transport-security': 'max-age=15724800; includeSubDomains',
-  date: 'Fri, 11 Nov 2016 21:55:59 GMT',
+  date: 'Thu, 16 Mar 2017 23:40:35 GMT',
   connection: 'close',
-  'content-length': '288' });
+  'content-length': '305' });
  return result; },
 function (nock) { 
 var result = 
-nock('https://xplattestadls2879.azuredatalakestore.net:443')
-  .get('/webhdfs/v1/adlssdkfolder01%2Fmovefile.txt?op=MSGETFILESTATUS&api-version=2016-11-01')
-  .reply(200, "{\"FileStatus\":{\"length\":44,\"pathSuffix\":\"\",\"type\":\"FILE\",\"blockSize\":268435456,\"accessTime\":1478901358470,\"modificationTime\":1478901358539,\"replication\":1,\"permission\":\"770\",\"owner\":\"2e6c02d2-a364-4530-9137-d17403996cbf\",\"group\":\"2e6c02d2-a364-4530-9137-d17403996cbf\",\"expirationTime\":0}}", { 'cache-control': 'no-cache, no-cache, no-store, max-age=0',
+nock('https://xplattestadls5855.azuredatalakestore.net:443')
+  .get('/webhdfs/v1/adlssdkfolder01%2Fmovefile.txt?op=GETFILESTATUS&api-version=2016-11-01')
+  .reply(200, "{\"FileStatus\":{\"length\":44,\"pathSuffix\":\"\",\"type\":\"FILE\",\"blockSize\":268435456,\"accessTime\":1489707634295,\"modificationTime\":1489707634349,\"replication\":1,\"permission\":\"770\",\"owner\":\"2e6c02d2-a364-4530-9137-d17403996cbf\",\"group\":\"2e6c02d2-a364-4530-9137-d17403996cbf\",\"msExpirationTime\":0,\"aclBit\":false}}", { 'cache-control': 'no-cache, no-cache, no-store, max-age=0',
   pragma: 'no-cache',
   'content-type': 'application/json; charset=utf-8',
   expires: '-1',
-  'x-ms-request-id': 'd6b9fdd1-3f97-420d-b018-99e4dcde3a2a',
-  'x-ms-webhdfs-version': '16.07.18.01',
+  'x-ms-request-id': '1f6f7941-43b4-4ce4-a2f1-8070665a5203',
+  'x-ms-webhdfs-version': '16.12.19.00',
   status: '0x0',
   'x-content-type-options': 'nosniff',
   'strict-transport-security': 'max-age=15724800; includeSubDomains',
-  date: 'Fri, 11 Nov 2016 21:55:59 GMT',
+  date: 'Thu, 16 Mar 2017 23:40:35 GMT',
   connection: 'close',
-  'content-length': '288' });
+  'content-length': '305' });
  return result; },
 function (nock) { 
 var result = 
-nock('http://xplattestadls2879.azuredatalakestore.net:443')
-  .get('/webhdfs/v1/adlssdkfolder01%2Fconcatfile.txt?op=MSGETFILESTATUS&api-version=2016-11-01')
-  .reply(404, "{\"RemoteException\":{\"exception\":\"FileNotFoundException\",\"message\":\"File/Folder does not exist: /adlssdkfolder01/concatfile.txt [71d25892-353e-4352-ae95-3d1432f20ede][2016-11-11T13:56:00.3591499-08:00]\",\"javaClassName\":\"java.io.FileNotFoundException\"}}", { 'cache-control': 'no-cache, no-cache, no-store, max-age=0',
+nock('http://xplattestadls5855.azuredatalakestore.net:443')
+  .get('/webhdfs/v1/adlssdkfolder01%2Fconcatfile.txt?op=GETFILESTATUS&api-version=2016-11-01')
+  .reply(404, "{\"RemoteException\":{\"exception\":\"FileNotFoundException\",\"message\":\"File/Folder does not exist: /adlssdkfolder01/concatfile.txt [30ab564b-65b4-4ab2-8ae8-6063acd18695][2017-03-16T16:40:36.2939601-07:00]\",\"javaClassName\":\"java.io.FileNotFoundException\"}}", { 'cache-control': 'no-cache, no-cache, no-store, max-age=0',
   pragma: 'no-cache',
   'content-type': 'application/json; charset=utf-8',
   expires: '-1',
-  'x-ms-request-id': '71d25892-353e-4352-ae95-3d1432f20ede',
-  'x-ms-webhdfs-version': '16.07.18.01',
+  'x-ms-request-id': '30ab564b-65b4-4ab2-8ae8-6063acd18695',
+  'x-ms-webhdfs-version': '16.12.19.00',
   status: '0x8309000A',
   'x-content-type-options': 'nosniff',
   'strict-transport-security': 'max-age=15724800; includeSubDomains',
-  date: 'Fri, 11 Nov 2016 21:56:00 GMT',
+  date: 'Thu, 16 Mar 2017 23:40:35 GMT',
   connection: 'close',
   'content-length': '251' });
  return result; },
 function (nock) { 
 var result = 
-nock('https://xplattestadls2879.azuredatalakestore.net:443')
-  .get('/webhdfs/v1/adlssdkfolder01%2Fconcatfile.txt?op=MSGETFILESTATUS&api-version=2016-11-01')
-  .reply(404, "{\"RemoteException\":{\"exception\":\"FileNotFoundException\",\"message\":\"File/Folder does not exist: /adlssdkfolder01/concatfile.txt [71d25892-353e-4352-ae95-3d1432f20ede][2016-11-11T13:56:00.3591499-08:00]\",\"javaClassName\":\"java.io.FileNotFoundException\"}}", { 'cache-control': 'no-cache, no-cache, no-store, max-age=0',
+nock('https://xplattestadls5855.azuredatalakestore.net:443')
+  .get('/webhdfs/v1/adlssdkfolder01%2Fconcatfile.txt?op=GETFILESTATUS&api-version=2016-11-01')
+  .reply(404, "{\"RemoteException\":{\"exception\":\"FileNotFoundException\",\"message\":\"File/Folder does not exist: /adlssdkfolder01/concatfile.txt [30ab564b-65b4-4ab2-8ae8-6063acd18695][2017-03-16T16:40:36.2939601-07:00]\",\"javaClassName\":\"java.io.FileNotFoundException\"}}", { 'cache-control': 'no-cache, no-cache, no-store, max-age=0',
   pragma: 'no-cache',
   'content-type': 'application/json; charset=utf-8',
   expires: '-1',
-  'x-ms-request-id': '71d25892-353e-4352-ae95-3d1432f20ede',
-  'x-ms-webhdfs-version': '16.07.18.01',
+  'x-ms-request-id': '30ab564b-65b4-4ab2-8ae8-6063acd18695',
+  'x-ms-webhdfs-version': '16.12.19.00',
   status: '0x8309000A',
   'x-content-type-options': 'nosniff',
   'strict-transport-security': 'max-age=15724800; includeSubDomains',
-  date: 'Fri, 11 Nov 2016 21:56:00 GMT',
+  date: 'Thu, 16 Mar 2017 23:40:35 GMT',
   connection: 'close',
   'content-length': '251' });
  return result; },
 function (nock) { 
 var result = 
-nock('http://xplattestadls2879.azuredatalakestore.net:443')
+nock('http://xplattestadls5855.azuredatalakestore.net:443')
   .put('/webhdfs/v1/adlssdkfolder01?destination=adlssdkfolder02&op=RENAME&api-version=2016-11-01')
   .reply(200, "{\"boolean\":true}", { 'cache-control': 'no-cache, no-cache, no-store, max-age=0',
   pragma: 'no-cache',
   'content-type': 'application/json; charset=utf-8',
   expires: '-1',
-  'x-ms-request-id': 'ec4588c0-98df-47ed-a3e8-e5d18fe86f92',
-  'x-ms-webhdfs-version': '16.07.18.01',
+  'x-ms-request-id': '33a40e58-33fd-45e0-b854-d543c99619ef',
+  'x-ms-webhdfs-version': '16.12.19.00',
   status: '0x0',
   'x-content-type-options': 'nosniff',
   'strict-transport-security': 'max-age=15724800; includeSubDomains',
-  date: 'Fri, 11 Nov 2016 21:56:00 GMT',
+  date: 'Thu, 16 Mar 2017 23:40:37 GMT',
   connection: 'close',
   'content-length': '16' });
  return result; },
 function (nock) { 
 var result = 
-nock('https://xplattestadls2879.azuredatalakestore.net:443')
+nock('https://xplattestadls5855.azuredatalakestore.net:443')
   .put('/webhdfs/v1/adlssdkfolder01?destination=adlssdkfolder02&op=RENAME&api-version=2016-11-01')
   .reply(200, "{\"boolean\":true}", { 'cache-control': 'no-cache, no-cache, no-store, max-age=0',
   pragma: 'no-cache',
   'content-type': 'application/json; charset=utf-8',
   expires: '-1',
-  'x-ms-request-id': 'ec4588c0-98df-47ed-a3e8-e5d18fe86f92',
-  'x-ms-webhdfs-version': '16.07.18.01',
+  'x-ms-request-id': '33a40e58-33fd-45e0-b854-d543c99619ef',
+  'x-ms-webhdfs-version': '16.12.19.00',
   status: '0x0',
   'x-content-type-options': 'nosniff',
   'strict-transport-security': 'max-age=15724800; includeSubDomains',
-  date: 'Fri, 11 Nov 2016 21:56:00 GMT',
+  date: 'Thu, 16 Mar 2017 23:40:37 GMT',
   connection: 'close',
   'content-length': '16' });
  return result; },
 function (nock) { 
 var result = 
-nock('http://xplattestadls2879.azuredatalakestore.net:443')
-  .get('/webhdfs/v1/adlssdkfolder02?op=MSGETFILESTATUS&api-version=2016-11-01')
-  .reply(200, "{\"FileStatus\":{\"length\":0,\"pathSuffix\":\"\",\"type\":\"DIRECTORY\",\"blockSize\":0,\"accessTime\":1478901353564,\"modificationTime\":1478901359650,\"replication\":0,\"permission\":\"770\",\"owner\":\"2e6c02d2-a364-4530-9137-d17403996cbf\",\"group\":\"2e6c02d2-a364-4530-9137-d17403996cbf\"}}", { 'cache-control': 'no-cache, no-cache, no-store, max-age=0',
+nock('http://xplattestadls5855.azuredatalakestore.net:443')
+  .get('/webhdfs/v1/adlssdkfolder02?op=GETFILESTATUS&api-version=2016-11-01')
+  .reply(200, "{\"FileStatus\":{\"length\":0,\"pathSuffix\":\"\",\"type\":\"DIRECTORY\",\"blockSize\":0,\"accessTime\":1489707628577,\"modificationTime\":1489707635382,\"replication\":0,\"permission\":\"770\",\"owner\":\"2e6c02d2-a364-4530-9137-d17403996cbf\",\"group\":\"2e6c02d2-a364-4530-9137-d17403996cbf\",\"aclBit\":false}}", { 'cache-control': 'no-cache, no-cache, no-store, max-age=0',
   pragma: 'no-cache',
   'content-type': 'application/json; charset=utf-8',
   expires: '-1',
-  'x-ms-request-id': '8bb3cc5a-680a-4630-8a75-fba7542bf4ee',
-  'x-ms-webhdfs-version': '16.07.18.01',
+  'x-ms-request-id': '9bf9bc54-0d21-4ca0-a66c-5e739a1437e7',
+  'x-ms-webhdfs-version': '16.12.19.00',
   status: '0x0',
   'x-content-type-options': 'nosniff',
   'strict-transport-security': 'max-age=15724800; includeSubDomains',
-  date: 'Fri, 11 Nov 2016 21:56:00 GMT',
+  date: 'Thu, 16 Mar 2017 23:40:37 GMT',
   connection: 'close',
-  'content-length': '265' });
+  'content-length': '280' });
  return result; },
 function (nock) { 
 var result = 
-nock('https://xplattestadls2879.azuredatalakestore.net:443')
-  .get('/webhdfs/v1/adlssdkfolder02?op=MSGETFILESTATUS&api-version=2016-11-01')
-  .reply(200, "{\"FileStatus\":{\"length\":0,\"pathSuffix\":\"\",\"type\":\"DIRECTORY\",\"blockSize\":0,\"accessTime\":1478901353564,\"modificationTime\":1478901359650,\"replication\":0,\"permission\":\"770\",\"owner\":\"2e6c02d2-a364-4530-9137-d17403996cbf\",\"group\":\"2e6c02d2-a364-4530-9137-d17403996cbf\"}}", { 'cache-control': 'no-cache, no-cache, no-store, max-age=0',
+nock('https://xplattestadls5855.azuredatalakestore.net:443')
+  .get('/webhdfs/v1/adlssdkfolder02?op=GETFILESTATUS&api-version=2016-11-01')
+  .reply(200, "{\"FileStatus\":{\"length\":0,\"pathSuffix\":\"\",\"type\":\"DIRECTORY\",\"blockSize\":0,\"accessTime\":1489707628577,\"modificationTime\":1489707635382,\"replication\":0,\"permission\":\"770\",\"owner\":\"2e6c02d2-a364-4530-9137-d17403996cbf\",\"group\":\"2e6c02d2-a364-4530-9137-d17403996cbf\",\"aclBit\":false}}", { 'cache-control': 'no-cache, no-cache, no-store, max-age=0',
   pragma: 'no-cache',
   'content-type': 'application/json; charset=utf-8',
   expires: '-1',
-  'x-ms-request-id': '8bb3cc5a-680a-4630-8a75-fba7542bf4ee',
-  'x-ms-webhdfs-version': '16.07.18.01',
+  'x-ms-request-id': '9bf9bc54-0d21-4ca0-a66c-5e739a1437e7',
+  'x-ms-webhdfs-version': '16.12.19.00',
   status: '0x0',
   'x-content-type-options': 'nosniff',
   'strict-transport-security': 'max-age=15724800; includeSubDomains',
-  date: 'Fri, 11 Nov 2016 21:56:00 GMT',
+  date: 'Thu, 16 Mar 2017 23:40:37 GMT',
   connection: 'close',
-  'content-length': '265' });
+  'content-length': '280' });
  return result; },
 function (nock) { 
 var result = 
-nock('http://xplattestadls2879.azuredatalakestore.net:443')
-  .get('/webhdfs/v1/adlssdkfolder01?op=MSGETFILESTATUS&api-version=2016-11-01')
-  .reply(404, "{\"RemoteException\":{\"exception\":\"FileNotFoundException\",\"message\":\"File/Folder does not exist: /adlssdkfolder01 [994154f8-c1d9-44b5-9411-3b558dc9db56][2016-11-11T13:56:01.5724958-08:00]\",\"javaClassName\":\"java.io.FileNotFoundException\"}}", { 'cache-control': 'no-cache, no-cache, no-store, max-age=0',
+nock('http://xplattestadls5855.azuredatalakestore.net:443')
+  .get('/webhdfs/v1/adlssdkfolder01?op=GETFILESTATUS&api-version=2016-11-01')
+  .reply(404, "{\"RemoteException\":{\"exception\":\"FileNotFoundException\",\"message\":\"File/Folder does not exist: /adlssdkfolder01 [e7b3eccb-1fd7-4cc5-bdb2-ace84a855aee][2017-03-16T16:40:37.9370703-07:00]\",\"javaClassName\":\"java.io.FileNotFoundException\"}}", { 'cache-control': 'no-cache, no-cache, no-store, max-age=0',
   pragma: 'no-cache',
   'content-type': 'application/json; charset=utf-8',
   expires: '-1',
-  'x-ms-request-id': '994154f8-c1d9-44b5-9411-3b558dc9db56',
-  'x-ms-webhdfs-version': '16.07.18.01',
+  'x-ms-request-id': 'e7b3eccb-1fd7-4cc5-bdb2-ace84a855aee',
+  'x-ms-webhdfs-version': '16.12.19.00',
   status: '0x8309000A',
   'x-content-type-options': 'nosniff',
   'strict-transport-security': 'max-age=15724800; includeSubDomains',
-  date: 'Fri, 11 Nov 2016 21:56:01 GMT',
+  date: 'Thu, 16 Mar 2017 23:40:37 GMT',
   connection: 'close',
   'content-length': '236' });
  return result; },
 function (nock) { 
 var result = 
-nock('https://xplattestadls2879.azuredatalakestore.net:443')
-  .get('/webhdfs/v1/adlssdkfolder01?op=MSGETFILESTATUS&api-version=2016-11-01')
-  .reply(404, "{\"RemoteException\":{\"exception\":\"FileNotFoundException\",\"message\":\"File/Folder does not exist: /adlssdkfolder01 [994154f8-c1d9-44b5-9411-3b558dc9db56][2016-11-11T13:56:01.5724958-08:00]\",\"javaClassName\":\"java.io.FileNotFoundException\"}}", { 'cache-control': 'no-cache, no-cache, no-store, max-age=0',
+nock('https://xplattestadls5855.azuredatalakestore.net:443')
+  .get('/webhdfs/v1/adlssdkfolder01?op=GETFILESTATUS&api-version=2016-11-01')
+  .reply(404, "{\"RemoteException\":{\"exception\":\"FileNotFoundException\",\"message\":\"File/Folder does not exist: /adlssdkfolder01 [e7b3eccb-1fd7-4cc5-bdb2-ace84a855aee][2017-03-16T16:40:37.9370703-07:00]\",\"javaClassName\":\"java.io.FileNotFoundException\"}}", { 'cache-control': 'no-cache, no-cache, no-store, max-age=0',
   pragma: 'no-cache',
   'content-type': 'application/json; charset=utf-8',
   expires: '-1',
-  'x-ms-request-id': '994154f8-c1d9-44b5-9411-3b558dc9db56',
-  'x-ms-webhdfs-version': '16.07.18.01',
+  'x-ms-request-id': 'e7b3eccb-1fd7-4cc5-bdb2-ace84a855aee',
+  'x-ms-webhdfs-version': '16.12.19.00',
   status: '0x8309000A',
   'x-content-type-options': 'nosniff',
   'strict-transport-security': 'max-age=15724800; includeSubDomains',
-  date: 'Fri, 11 Nov 2016 21:56:01 GMT',
+  date: 'Thu, 16 Mar 2017 23:40:37 GMT',
   connection: 'close',
   'content-length': '236' });
  return result; },
 function (nock) { 
 var result = 
-nock('http://xplattestadls2879.azuredatalakestore.net:443')
-  .get('/webhdfs/v1/adlssdkfolder02?op=MSLISTSTATUS&api-version=2016-11-01')
-  .reply(200, "{\"FileStatuses\":{\"FileStatus\":[{\"length\":44,\"pathSuffix\":\"movefile.txt\",\"type\":\"FILE\",\"blockSize\":268435456,\"accessTime\":1478901358470,\"modificationTime\":1478901358539,\"replication\":1,\"permission\":\"770\",\"owner\":\"2e6c02d2-a364-4530-9137-d17403996cbf\",\"group\":\"2e6c02d2-a364-4530-9137-d17403996cbf\",\"expirationTime\":0}]}}", { 'cache-control': 'no-cache, no-cache, no-store, max-age=0',
+nock('http://xplattestadls5855.azuredatalakestore.net:443')
+  .get('/webhdfs/v1/adlssdkfolder02?op=LISTSTATUS&api-version=2016-11-01')
+  .reply(200, "{\"FileStatuses\":{\"FileStatus\":[{\"length\":44,\"pathSuffix\":\"movefile.txt\",\"type\":\"FILE\",\"blockSize\":268435456,\"accessTime\":1489707634295,\"modificationTime\":1489707634349,\"replication\":1,\"permission\":\"770\",\"owner\":\"2e6c02d2-a364-4530-9137-d17403996cbf\",\"group\":\"2e6c02d2-a364-4530-9137-d17403996cbf\",\"msExpirationTime\":0,\"aclBit\":false}]}}", { 'cache-control': 'no-cache, no-cache, no-store, max-age=0',
   pragma: 'no-cache',
   'content-type': 'application/json; charset=utf-8',
   expires: '-1',
-  'x-ms-request-id': '31a2d3fc-8e26-4fcb-8843-f3ffb669c13f',
-  'x-ms-webhdfs-version': '16.07.18.01',
+  'x-ms-request-id': '3c4fd4e8-3a45-4645-a6de-5c8514f7591a',
+  'x-ms-webhdfs-version': '16.12.19.00',
   status: '0x0',
   'x-content-type-options': 'nosniff',
   'strict-transport-security': 'max-age=15724800; includeSubDomains',
-  date: 'Fri, 11 Nov 2016 21:56:02 GMT',
+  date: 'Thu, 16 Mar 2017 23:40:38 GMT',
   connection: 'close',
-  'content-length': '319' });
+  'content-length': '336' });
  return result; },
 function (nock) { 
 var result = 
-nock('https://xplattestadls2879.azuredatalakestore.net:443')
-  .get('/webhdfs/v1/adlssdkfolder02?op=MSLISTSTATUS&api-version=2016-11-01')
-  .reply(200, "{\"FileStatuses\":{\"FileStatus\":[{\"length\":44,\"pathSuffix\":\"movefile.txt\",\"type\":\"FILE\",\"blockSize\":268435456,\"accessTime\":1478901358470,\"modificationTime\":1478901358539,\"replication\":1,\"permission\":\"770\",\"owner\":\"2e6c02d2-a364-4530-9137-d17403996cbf\",\"group\":\"2e6c02d2-a364-4530-9137-d17403996cbf\",\"expirationTime\":0}]}}", { 'cache-control': 'no-cache, no-cache, no-store, max-age=0',
+nock('https://xplattestadls5855.azuredatalakestore.net:443')
+  .get('/webhdfs/v1/adlssdkfolder02?op=LISTSTATUS&api-version=2016-11-01')
+  .reply(200, "{\"FileStatuses\":{\"FileStatus\":[{\"length\":44,\"pathSuffix\":\"movefile.txt\",\"type\":\"FILE\",\"blockSize\":268435456,\"accessTime\":1489707634295,\"modificationTime\":1489707634349,\"replication\":1,\"permission\":\"770\",\"owner\":\"2e6c02d2-a364-4530-9137-d17403996cbf\",\"group\":\"2e6c02d2-a364-4530-9137-d17403996cbf\",\"msExpirationTime\":0,\"aclBit\":false}]}}", { 'cache-control': 'no-cache, no-cache, no-store, max-age=0',
   pragma: 'no-cache',
   'content-type': 'application/json; charset=utf-8',
   expires: '-1',
-  'x-ms-request-id': '31a2d3fc-8e26-4fcb-8843-f3ffb669c13f',
-  'x-ms-webhdfs-version': '16.07.18.01',
+  'x-ms-request-id': '3c4fd4e8-3a45-4645-a6de-5c8514f7591a',
+  'x-ms-webhdfs-version': '16.12.19.00',
   status: '0x0',
   'x-content-type-options': 'nosniff',
   'strict-transport-security': 'max-age=15724800; includeSubDomains',
-  date: 'Fri, 11 Nov 2016 21:56:02 GMT',
+  date: 'Thu, 16 Mar 2017 23:40:38 GMT',
   connection: 'close',
-  'content-length': '319' });
+  'content-length': '336' });
  return result; }]];
\ No newline at end of file
diff --git a/test/recordings/arm-datalake-store-tests/Data_Lake_Store_Clients_Account_and_Filesystem_Data_Lake_Store_FileSystem_read_should_work.nock.js b/test/recordings/arm-datalake-store-tests/Data_Lake_Store_Clients_Account_and_Filesystem_Data_Lake_Store_FileSystem_read_should_work.nock.js
index 737d036ecf..ff91e98a8b 100644
--- a/test/recordings/arm-datalake-store-tests/Data_Lake_Store_Clients_Account_and_Filesystem_Data_Lake_Store_FileSystem_read_should_work.nock.js
+++ b/test/recordings/arm-datalake-store-tests/Data_Lake_Store_Clients_Account_and_Filesystem_Data_Lake_Store_FileSystem_read_should_work.nock.js
@@ -8,73 +8,73 @@ exports.setEnvironment = function() {
 
 exports.scopes = [[function (nock) { 
 var result = 
-nock('http://xplattestadls2879.azuredatalakestore.net:443')
+nock('http://xplattestadls5855.azuredatalakestore.net:443')
   .filteringRequestBody(function (path) { return '*';})
 .put('/webhdfs/v1/adlssdkfolder01%2Fconcatfile.txt?overwrite=true&syncFlag=CLOSE&op=CREATE&write=true&api-version=2016-11-01', '*')
   .reply(201, "", { 'cache-control': 'no-cache, no-cache, no-store, max-age=0',
   pragma: 'no-cache',
   expires: '-1',
-  location: 'https://xplattestadls2879.azuredatalakestore.net/webhdfs/v1/adlssdkfolder01/concatfile.txt?overwrite=true&syncFlag=CLOSE&op=CREATE&write=true&api-version=2016-11-01',
-  'x-ms-request-id': 'da02f141-2702-4654-ad58-63c4f97c20e7',
+  location: 'https://xplattestadls5855.azuredatalakestore.net/webhdfs/v1/adlssdkfolder01/concatfile.txt?overwrite=true&syncFlag=CLOSE&op=CREATE&write=true&api-version=2016-11-01',
+  'x-ms-request-id': '1482062c-550d-401e-8a4e-3f86bbe2ff82',
   contentlength: '0',
-  'x-ms-webhdfs-version': '16.07.18.01',
+  'x-ms-webhdfs-version': '16.12.19.00',
   status: '0x0',
   'x-content-type-options': 'nosniff',
   'strict-transport-security': 'max-age=15724800; includeSubDomains',
-  date: 'Fri, 11 Nov 2016 21:55:58 GMT',
+  date: 'Thu, 16 Mar 2017 23:40:34 GMT',
   connection: 'close',
   'content-length': '0' });
  return result; },
 function (nock) { 
 var result = 
-nock('https://xplattestadls2879.azuredatalakestore.net:443')
+nock('https://xplattestadls5855.azuredatalakestore.net:443')
   .filteringRequestBody(function (path) { return '*';})
 .put('/webhdfs/v1/adlssdkfolder01%2Fconcatfile.txt?overwrite=true&syncFlag=CLOSE&op=CREATE&write=true&api-version=2016-11-01', '*')
   .reply(201, "", { 'cache-control': 'no-cache, no-cache, no-store, max-age=0',
   pragma: 'no-cache',
   expires: '-1',
-  location: 'https://xplattestadls2879.azuredatalakestore.net/webhdfs/v1/adlssdkfolder01/concatfile.txt?overwrite=true&syncFlag=CLOSE&op=CREATE&write=true&api-version=2016-11-01',
-  'x-ms-request-id': 'da02f141-2702-4654-ad58-63c4f97c20e7',
+  location: 'https://xplattestadls5855.azuredatalakestore.net/webhdfs/v1/adlssdkfolder01/concatfile.txt?overwrite=true&syncFlag=CLOSE&op=CREATE&write=true&api-version=2016-11-01',
+  'x-ms-request-id': '1482062c-550d-401e-8a4e-3f86bbe2ff82',
   contentlength: '0',
-  'x-ms-webhdfs-version': '16.07.18.01',
+  'x-ms-webhdfs-version': '16.12.19.00',
   status: '0x0',
   'x-content-type-options': 'nosniff',
   'strict-transport-security': 'max-age=15724800; includeSubDomains',
-  date: 'Fri, 11 Nov 2016 21:55:58 GMT',
+  date: 'Thu, 16 Mar 2017 23:40:34 GMT',
   connection: 'close',
   'content-length': '0' });
  return result; },
 function (nock) { 
 var result = 
-nock('http://xplattestadls2879.azuredatalakestore.net:443')
+nock('http://xplattestadls5855.azuredatalakestore.net:443')
   .get('/webhdfs/v1/adlssdkfolder01%2Fconcatfile.txt?length=23&offset=0&op=OPEN&read=true&api-version=2016-11-01')
   .reply(200, "adls sdk test content!a", { 'cache-control': 'no-cache, no-cache, no-store, max-age=0',
   pragma: 'no-cache',
   'transfer-encoding': 'chunked',
   'content-type': 'application/octet-stream',
   expires: '-1',
-  'x-ms-request-id': 'd6c4c156-dd4f-47a5-b62b-3e275492bdc7',
-  'x-ms-webhdfs-version': '16.07.18.01',
+  'x-ms-request-id': '7fcf0c07-241c-4b5c-9ee9-5fc127af44ed',
+  'x-ms-webhdfs-version': '16.12.19.00',
   status: '0x0',
   'x-content-type-options': 'nosniff',
   'strict-transport-security': 'max-age=15724800; includeSubDomains',
-  date: 'Fri, 11 Nov 2016 21:55:59 GMT',
+  date: 'Thu, 16 Mar 2017 23:40:34 GMT',
   connection: 'close' });
  return result; },
 function (nock) { 
 var result = 
-nock('https://xplattestadls2879.azuredatalakestore.net:443')
+nock('https://xplattestadls5855.azuredatalakestore.net:443')
   .get('/webhdfs/v1/adlssdkfolder01%2Fconcatfile.txt?length=23&offset=0&op=OPEN&read=true&api-version=2016-11-01')
   .reply(200, "adls sdk test content!a", { 'cache-control': 'no-cache, no-cache, no-store, max-age=0',
   pragma: 'no-cache',
   'transfer-encoding': 'chunked',
   'content-type': 'application/octet-stream',
   expires: '-1',
-  'x-ms-request-id': 'd6c4c156-dd4f-47a5-b62b-3e275492bdc7',
-  'x-ms-webhdfs-version': '16.07.18.01',
+  'x-ms-request-id': '7fcf0c07-241c-4b5c-9ee9-5fc127af44ed',
+  'x-ms-webhdfs-version': '16.12.19.00',
   status: '0x0',
   'x-content-type-options': 'nosniff',
   'strict-transport-security': 'max-age=15724800; includeSubDomains',
-  date: 'Fri, 11 Nov 2016 21:55:59 GMT',
+  date: 'Thu, 16 Mar 2017 23:40:34 GMT',
   connection: 'close' });
  return result; }]];
\ No newline at end of file
diff --git a/test/recordings/arm-datalake-store-tests/suite.arm-datalake-store-tests.nock.js b/test/recordings/arm-datalake-store-tests/suite.arm-datalake-store-tests.nock.js
index 18c1cee35d..775a353dd2 100644
--- a/test/recordings/arm-datalake-store-tests/suite.arm-datalake-store-tests.nock.js
+++ b/test/recordings/arm-datalake-store-tests/suite.arm-datalake-store-tests.nock.js
@@ -8,4 +8,4 @@ exports.setEnvironment = function() {
 
 exports.scopes = [];
 
- exports.randomTestIdsGenerated = function() { return ['xplattestadls9869','xplattestadls3113','xplattestadls2879'];};
\ No newline at end of file
+ exports.randomTestIdsGenerated = function() { return ['xplattestadls1164','xplattestadls7774','xplattestadls5855'];};
\ No newline at end of file
diff --git a/test/services/dataLakeStoreManagement/dataLakeStoreManagementClient-tests.js b/test/services/dataLakeStoreManagement/dataLakeStoreManagementClient-tests.js
index 3e56b1c9ad..837694c9ff 100644
--- a/test/services/dataLakeStoreManagement/dataLakeStoreManagementClient-tests.js
+++ b/test/services/dataLakeStoreManagement/dataLakeStoreManagementClient-tests.js
@@ -621,8 +621,7 @@ describe('Data Lake Store Clients (Account and Filesystem)', function () {
                     should.not.exist(err);
                     should.exist(result);
                     response.statusCode.should.equal(200);
-                    // add one because the mask is not removed when the user is removed
-                    result.aclStatus.entries.length.should.be.equal(initialEntryNum + 1);
+                    result.aclStatus.entries.length.should.be.equal(initialEntryNum);
                     done();
                   });
                 });
@@ -645,6 +644,37 @@ describe('Data Lake Store Clients (Account and Filesystem)', function () {
         var aclSpec = result.aclStatus.entries.toString();
         // now replace the ACL spec with the exact same ACL spec with the addition of one new user as the default user.
         aclSpec = aclSpec + ',default:' + permissionToSet;
+        
+        // we also need to add the default entries now:
+        permissionLength = result.aclStatus.permission.length
+        ownerOctal = result.aclStatus.permission.charAt(permissionLength - 3)
+        groupOctal = result.aclStatus.permission.charAt(permissionLength - 2)
+        otherOctal = result.aclStatus.permission.charAt(permissionLength - 1)
+        
+        ownerAce = 'user::'
+        ownerAce += ownerOctal & 4 ? 'r' : '-'
+        ownerAce += ownerOctal & 2 ? 'w' : '-'
+        ownerAce += ownerOctal & 1 ? 'x' : '-'
+        
+        otherAce = 'other::'
+        otherAce += otherOctal & 4 ? 'r' : '-'
+        otherAce += otherOctal & 2 ? 'w' : '-'
+        otherAce += otherOctal & 1 ? 'x' : '-'
+        
+        maskOrGroupAce = 'group::'
+        maskOrGroupAce += groupOctal & 4 ? 'r' : '-'
+        maskOrGroupAce += groupOctal & 2 ? 'w' : '-'
+        maskOrGroupAce += groupOctal & 1 ? 'x' : '-'
+        
+        if (result.aclStatus.entries[0].startsWith("group::")) {
+          maskOrGroupAce = 'mask::'
+          maskOrGroupAce += groupOctal & 4 ? 'r' : '-'
+          maskOrGroupAce += groupOctal & 2 ? 'w' : '-'
+          maskOrGroupAce += groupOctal & 1 ? 'x' : '-'
+        }
+        
+        aclSpec += ',' + ownerAce + ',' + otherAce + ',' + maskOrGroupAce
+        
         adlsFileSystemClient.fileSystem.setAcl(filesystemAccountName, permissionFolder, aclSpec, function (err, result, request, response) {
           should.not.exist(err);
           should.not.exist(result);