Repository: postmanlabs/postman-code-generators
Pull request #90 (2019-09-04 07:24:41)

Fixed binary file upload in shell-wget and added a comment stating wget doesn't support file upload via formdata


Patch:
diff --git a/codegens/csharp-restsharp/README.md b/codegens/csharp-restsharp/README.md
index f942fd0..1e68f54 100644
--- a/codegens/csharp-restsharp/README.md
+++ b/codegens/csharp-restsharp/README.md
@@ -14,9 +14,9 @@ Convert function will take three parameters
 
 * `options`- options is an object which can have following properties
     * `indentType`- Character used for indentation
-    * `indentCount`- The number of indentation characters to add per code level
+    * `indentCount`- Number of indentation characters to add per code level
     * `includeBoilerplate` - Include class definition and import statements in snippet
-    * `requestTimeout` : The number of milliseconds the request should wait for a response before timing out (use 0 for infinity)
+    * `requestTimeout` : How long the request should wait for a response before timing out (milliseconds)
     * `trimRequestBody` : Trim request body fields
     * `followRedirect` : Automatically follow HTTP redirects
 
diff --git a/codegens/csharp-restsharp/lib/parseRequest.js b/codegens/csharp-restsharp/lib/parseRequest.js
index 5ef8a0b..f2065a6 100644
--- a/codegens/csharp-restsharp/lib/parseRequest.js
+++ b/codegens/csharp-restsharp/lib/parseRequest.js
@@ -50,7 +50,7 @@ function parseContentType (request) {
  * @returns {String} code snippet of csharp-restsharp parsed from request object
  */
 function parseBody (request, trimFields) {
-  var requestBody = request.body ? request.body.toJSON() : {};
+  var requestBody = request.body.toJSON();
   if (!_.isEmpty(requestBody)) {
     switch (requestBody.mode) {
       case 'urlencoded':
diff --git a/codegens/csharp-restsharp/lib/restsharp.js b/codegens/csharp-restsharp/lib/restsharp.js
index a0280fd..9fb9f51 100644
--- a/codegens/csharp-restsharp/lib/restsharp.js
+++ b/codegens/csharp-restsharp/lib/restsharp.js
@@ -63,41 +63,40 @@ self = module.exports = {
         description: 'Include class definition and import statements in snippet'
       },
       {
-        name: 'Set indentation count',
+        name: 'Indent count',
         id: 'indentCount',
         type: 'positiveInteger',
         default: 2,
-        description: 'Set the number of indentation characters to add per code level'
+        description: 'Number of indentation characters to add per code level'
       },
       {
-        name: 'Set indentation type',
+        name: 'Indent type',
         id: 'indentType',
         type: 'enum',
         availableOptions: ['Tab', 'Space'],
         default: 'Space',
-        description: 'Select the character used to indent lines of code'
+        description: 'Character used for indentation'
       },
       {
-        name: 'Set request timeout',
+        name: 'Request timeout',
         id: 'requestTimeout',
         type: 'positiveInteger',
         default: 0,
-        description: 'Set number of milliseconds the request should wait for a response ' +
-          'before timing out (use 0 for infinity)'
+        description: 'How long the request should wait for a response before timing out (milliseconds)'
       },
       {
-        name: 'Follow redirects',
+        name: 'Follow redirect',
         id: 'followRedirect',
         type: 'boolean',
         default: true,
         description: 'Automatically follow HTTP redirects'
       },
       {
-        name: 'Trim request body fields',
+        name: 'Body trim',
         id: 'trimRequestBody',
         type: 'boolean',
-        default: false,
-        description: 'Remove white space and additional lines that may affect the server\'s response'
+        default: true,
+        description: 'Trim request body fields'
       }
     ];
   },
diff --git a/codegens/curl/README.md b/codegens/curl/README.md
index 32447f1..57f32a2 100644
--- a/codegens/curl/README.md
+++ b/codegens/curl/README.md
@@ -15,7 +15,7 @@ Convert function takes three parameters
 
 * `options` - options is an object which hsa following properties
     * `indentType` - String denoting type of indentation for code snippet. eg: 'Space', 'Tab'
-    * `indentCount` - The number of indentation characters to add per code level
+    * `indentCount` - Number of indentation characters to add per code level
     * `trimRequestBody` - Trim request body fields
     * `followRedirect` - Boolean denoting whether to redirect a request
     * `requestTimeout` - Integer denoting time after which the request will bail out in milli-seconds
diff --git a/codegens/curl/lib/index.js b/codegens/curl/lib/index.js
index d414455..88836d2 100644
--- a/codegens/curl/lib/index.js
+++ b/codegens/curl/lib/index.js
@@ -1,6 +1,5 @@
 var sanitize = require('./util').sanitize,
   sanitizeOptions = require('./util').sanitizeOptions,
-  getUrlStringfromUrlObject = require('./util').getUrlStringfromUrlObject,
   form = require('./util').form,
   _ = require('./lodash'),
   self;
@@ -13,7 +12,7 @@ self = module.exports = {
     }
     options = sanitizeOptions(options, self.getOptions());
 
-    var indent, trim, headersData, body, text, redirect, timeout, multiLine, format, snippet, silent, url;
+    var indent, trim, headersData, body, text, redirect, timeout, multiLine, format, snippet, silent;
     redirect = options.followRedirect;
     timeout = options.requestTimeout;
     multiLine = options.multiLine;
@@ -35,12 +34,12 @@ self = module.exports = {
     else {
       indent = ' ';
     }
-    url = getUrlStringfromUrlObject(request.url);
+
     if (request.method === 'HEAD') {
-      snippet += ` ${form('-I', format)} "${url}"`;
+      snippet += ` ${form('-I', format)} "${encodeURI(request.url.toString())}"`;
     }
     else {
-      snippet += ` ${form('-X', format)} ${request.method} "${url}"`;
+      snippet += ` ${form('-X', format)} ${request.method} "${encodeURI(request.url.toString())}"`;
     }
 
     headersData = request.getHeaders({ enabled: true });
@@ -93,14 +92,14 @@ self = module.exports = {
   getOptions: function () {
     return [
       {
-        name: 'Generate multiline snippet',
+        name: 'Multiline snippet',
         id: 'multiLine',
         type: 'boolean',
         default: true,
         description: 'Split cURL command across multiple lines'
       },
       {
-        name: 'Use long form options',
+        name: 'Long form options',
         id: 'longFormat',
         type: 'boolean',
         default: true,
@@ -112,37 +111,35 @@ self = module.exports = {
         availableOptions: ['\\', '^'],
         type: 'enum',
         default: '\\',
-        description: 'Set a character used to mark the continuation of a statement on the next line ' +
-          '(generally, \\ for OSX/Linux, ^ for Windows)'
+        description: 'Character that should be used to split lines in a multiline snippet'
       },
       {
-        name: 'Set request timeout',
+        name: 'Request timeout',
         id: 'requestTimeout',
         type: 'positiveInteger',
         default: 0,
-        description: 'Set number of milliseconds the request should wait for a response before ' +
-          'timing out (use 0 for infinity)'
+        description: 'How long the request should wait for a response before timing out (milliseconds)'
       },
       {
-        name: 'Follow redirects',
+        name: 'Follow redirect',
         id: 'followRedirect',
         type: 'boolean',
         default: true,
         description: 'Automatically follow HTTP redirects'
       },
       {
-        name: 'Trim request body fields',
+        name: 'Body trim',
         id: 'trimRequestBody',
         type: 'boolean',
         default: false,
-        description: 'Remove white space and additional lines that may affect the server\'s response'
+        description: 'Trim request body fields'
       },
       {
-        name: 'Use Silent Mode',
+        name: 'Silent',
         id: 'silent',
         type: 'boolean',
         default: false,
-        description: 'Display the requested data without showing the cURL progress meter or error messages'
+        description: 'Use cURL\'s silent mode in the generated snippet'
       }
     ];
   }
diff --git a/codegens/curl/lib/util.js b/codegens/curl/lib/util.js
index 21253f5..c3f9bc2 100644
--- a/codegens/curl/lib/util.js
+++ b/codegens/curl/lib/util.js
@@ -110,46 +110,5 @@ module.exports = {
       }
     }
     return result;
-  },
-
-  /**
- *
- * @param {*} urlObject The request sdk request.url object
- * @returns {String} The final string after parsing all the parameters of the url including 
- * protocol, auth, host, port, path, query, hash
- * This will be used because the url.toString() method returned the URL with non encoded query string
- * and hence a manual call is made to getQueryString() method with encode option set as true.
- */
-  getUrlStringfromUrlObject: function (urlObject) {
-    var url = '';
-    if (!urlObject) {
-      return url;
-    }
-    if (urlObject.protocol) {
-      url += (urlObject.protocol.endsWith('://') ? urlObject.protocol : urlObject.protocol + '://');
-    }
-    if (urlObject.auth && urlObject.auth.user) {
-      url = url + ((urlObject.auth.password) ?
-      // ==> username:password@
-        urlObject.auth.user + ':' + urlObject.auth.password : urlObject.auth.user) + '@';
-    }
-    if (urlObject.host) {
-      url += urlObject.getHost();
-    }
-    if (urlObject.port) {
-      url += ':' + urlObject.port.toString();
-    }
-    if (urlObject.path) {
-      url += urlObject.getPath();
-    }
-    if (urlObject.query && urlObject.query.count()) {
-      let queryString = urlObject.getQueryString({ ignoreDisabled: true, encode: true });
-      queryString && (url += '?' + queryString);
-    }
-    if (urlObject.hash) {
-      url += '#' + urlObject.hash;
-    }
-
-    return url;
   }
 };
diff --git a/codegens/golang/README.md b/codegens/golang/README.md
index 93642fa..e83bcfe 100644
--- a/codegens/golang/README.md
+++ b/codegens/golang/README.md
@@ -15,7 +15,7 @@ Convert function takes three parameters
 
 * `options` - options is an object which hsa following properties
     * `indentType` - String denoting type of indentation for code snippet. eg: 'Space', 'Tab'
-    * `indentCount` - The number of indentation characters to add per code level
+    * `indentCount` - Number of indentation characters to add per code level
     * `trimRequestBody` - Trim request body fields
     * `followRedirect` - Boolean denoting whether to redirect a request
     * `requestTimeout` - Integer denoting time after which the request will bail out in milli-seconds
diff --git a/codegens/golang/lib/index.js b/codegens/golang/lib/index.js
index 22ab895..7f9932c 100644
--- a/codegens/golang/lib/index.js
+++ b/codegens/golang/lib/index.js
@@ -211,41 +211,40 @@ self = module.exports = {
   },
   getOptions: function () {
     return [{
-      name: 'Set indentation count',
+      name: 'Indent count',
       id: 'indentCount',
       type: 'positiveInteger',
       default: 2,
-      description: 'Set the number of indentation characters to add per code level'
+      description: 'Number of indentation characters to add per code level'
     },
     {
-      name: 'Set indentation type',
+      name: 'Indent type',
       id: 'indentType',
       type: 'enum',
       availableOptions: ['Tab', 'Space'],
       default: 'Space',
-      description: 'Select the character used to indent lines of code'
+      description: 'Character used for indentation'
     },
     {
-      name: 'Set request timeout',
+      name: 'Request timeout',
       id: 'requestTimeout',
       type: 'positiveInteger',
       default: 0,
-      description: 'Set number of milliseconds the request should wait for a ' +
-        'response before timing out (use 0 for infinity)'
+      description: 'How long the request should wait for a response before timing out (milliseconds)'
     },
     {
-      name: 'Follow redirects',
+      name: 'Follow redirect',
       id: 'followRedirect',
       type: 'boolean',
       default: true,
       description: 'Automatically follow HTTP redirects'
     },
     {
-      name: 'Trim request body fields',
+      name: 'Body trim',
       id: 'trimRequestBody',
       type: 'boolean',
-      default: false,
-      description: 'Remove white space and additional lines that may affect the server\'s response'
+      default: true,
+      description: 'Trim request body fields'
     }];
   }
 };
diff --git a/codegens/http/lib/code-http-converter.js b/codegens/http/lib/code-http-converter.js
index cfa0edd..6e6b1a5 100644
--- a/codegens/http/lib/code-http-converter.js
+++ b/codegens/http/lib/code-http-converter.js
@@ -9,17 +9,17 @@ let utils = require('./util');
  */
 function getOptions () {
   return [{
-    name: 'Trim request body fields',
+    name: 'Body trim',
     id: 'trimRequestBody',
     type: 'boolean',
-    default: false,
-    description: 'Remove white space and additional lines that may affect the server\'s response'
+    default: true,
+    description: 'Trim request body fields'
   }];
 }
 
 /**
  * Converts a Postman SDK request to HTTP message
- *
+ * 
  * @param {Object} request - Postman SDK request
  * @param {Object} options - Options for converter
  * @param {Boolean} options.trimRequestBody - determines whether to trim the body or not
diff --git a/codegens/java-okhttp/lib/okhttp.js b/codegens/java-okhttp/lib/okhttp.js
index 64cb027..2b88830 100644
--- a/codegens/java-okhttp/lib/okhttp.js
+++ b/codegens/java-okhttp/lib/okhttp.js
@@ -67,41 +67,40 @@ function getOptions () {
       description: 'Include class definition and import statements in snippet'
     },
     {
-      name: 'Set indentation count',
+      name: 'Indent count',
       id: 'indentCount',
       type: 'positiveInteger',
       default: 2,
-      description: 'Set the number of indentation characters to add per code level'
+      description: 'Number of indentation characters to add per code level'
     },
     {
-      name: 'Set indentation type',
+      name: 'Indent type',
       id: 'indentType',
       type: 'enum',
       availableOptions: ['Tab', 'Space'],
       default: 'Space',
-      description: 'Select the character used to indent lines of code'
+      description: 'Character used for indentation'
     },
     {
-      name: 'Set request timeout',
+      name: 'Request timeout',
       id: 'requestTimeout',
       type: 'positiveInteger',
       default: 0,
-      description: 'Set number of milliseconds the request should wait for a response ' +
-        'before timing out (use 0 for infinity)'
+      description: 'How long the request should wait for a response before timing out (milliseconds)'
     },
     {
-      name: 'Follow redirects',
+      name: 'Follow redirect',
       id: 'followRedirect',
       type: 'boolean',
       default: true,
       description: 'Automatically follow HTTP redirects'
     },
     {
-      name: 'Trim request body fields',
+      name: 'Body trim',
       id: 'trimRequestBody',
       type: 'boolean',
-      default: false,
-      description: 'Remove white space and additional lines that may affect the server\'s response'
+      default: true,
+      description: 'Trim request body fields'
     }
   ];
 }
diff --git a/codegens/java-unirest/lib/parseRequest.js b/codegens/java-unirest/lib/parseRequest.js
index e4baaac..2867119 100644
--- a/codegens/java-unirest/lib/parseRequest.js
+++ b/codegens/java-unirest/lib/parseRequest.js
@@ -2,50 +2,9 @@ var _ = require('./lodash'),
 
   sanitize = require('./util').sanitize;
 
-/**
- *
- * @param {*} urlObject The request sdk request.url object
- * @returns {String} The final string after parsing all the parameters of the url including 
- * protocol, auth, host, port, path, query, hash
- * This will be used because the url.toString() method returned the URL with non encoded query string
- * and hence a manual call is made to getQueryString() method with encode option set as true.
- */
-function getUrlStringfromUrlObject (urlObject) {
-  var url = '';
-  if (!urlObject) {
-    return url;
-  }
-  if (urlObject.protocol) {
-    url += (urlObject.protocol.endsWith('://') ? urlObject.protocol : urlObject.protocol + '://');
-  }
-  if (urlObject.auth && urlObject.auth.user) {
-    url = url + ((urlObject.auth.password) ?
-      // ==> username:password@
-      urlObject.auth.user + ':' + urlObject.auth.password : urlObject.auth.user) + '@';
-  }
-  if (urlObject.host) {
-    url += urlObject.getHost();
-  }
-  if (urlObject.port) {
-    url += ':' + urlObject.port.toString();
-  }
-  if (urlObject.path) {
-    url += urlObject.getPath();
-  }
-  if (urlObject.query && urlObject.query.count()) {
-    let queryString = urlObject.getQueryString({ ignoreDisabled: true, encode: true });
-    queryString && (url += '?' + queryString);
-  }
-  if (urlObject.hash) {
-    url += '#' + urlObject.hash;
-  }
-
-  return url;
-}
-
 /**
  * parses form data from request body and returns codesnippet in java unirest
- *
+ * 
  * @param {Object} requestbody - JSON object acquired by request.body.JSON()
  * @param {String} indentString - value for indentation
  * @param {Boolean} trimField - whether to trim fields of the request body
@@ -69,9 +28,9 @@ function parseFormData (requestbody, indentString, trimField) {
 }
 
 /**
- * parses body from request object based on mode provided by request body and
+ * parses body from request object based on mode provided by request body and 
  * returns codesnippet in java unirest
- *
+ * 
  * @param {Object} request - postman request object, more information can be found in postman collection sdk
  * @param {String} indentString - value for indentation
  * @param {Boolean} trimField - whether to trim fields of body of the request
@@ -97,7 +56,7 @@ function parseBody (request, indentString, trimField) {
 
 /**
  * parses header from request and returns codesnippet in java unirest
- *
+ * 
  * @param {Object} request - postman request object, more information can be found in postman collection sdk
  * @param {String} indentString - value for indentation
  * @returns {String} - body string parsed from request object
@@ -116,6 +75,5 @@ function parseHeader (request, indentString) {
 
 module.exports = {
   parseBody: parseBody,
-  parseHeader: parseHeader,
-  getUrlStringfromUrlObject: getUrlStringfromUrlObject
+  parseHeader: parseHeader
 };
diff --git a/codegens/java-unirest/lib/unirest.js b/codegens/java-unirest/lib/unirest.js
index dc9f780..a1275df 100644
--- a/codegens/java-unirest/lib/unirest.js
+++ b/codegens/java-unirest/lib/unirest.js
@@ -16,7 +16,7 @@ const SUPPORTED_METHODS = ['GET', 'POST', 'PUT', 'HEAD', 'PATCH', 'DELETE', 'OPT
  */
 function makeSnippet (request, indentString, options) {
   var snippet = '',
-    urlString = parseRequest.getUrlStringfromUrlObject(request.url);
+    urlString = encodeURI(request.url.toString());
 
   if (options.requestTimeout > 0) {
     snippet += `Unirest.setTimeouts(0, ${options.requestTimeout});\n`;
@@ -63,41 +63,40 @@ function getOptions () {
       description: 'Include class definition and import statements in snippet'
     },
     {
-      name: 'Set indentation count',
+      name: 'Indent count',
       id: 'indentCount',
       type: 'positiveInteger',
       default: 2,
-      description: 'Set the number of indentation characters to add per code level'
+      description: 'Number of indentation characters to add per code level'
     },
     {
-      name: 'Set indentation type',
+      name: 'Indent type',
       id: 'indentType',
       type: 'enum',
       availableOptions: ['Tab', 'Space'],
       default: 'Space',
-      description: 'Select the character used to indent lines of code'
+      description: 'Character used for indentation'
     },
     {
-      name: 'Set request timeout',
+      name: 'Request timeout',
       id: 'requestTimeout',
       type: 'positiveInteger',
       default: 0,
-      description: 'Set number of milliseconds the request should wait for a response ' +
-        'before timing out (use 0 for infinity)'
+      description: 'How long the request should wait for a response before timing out (milliseconds)'
     },
     {
-      name: 'Follow redirects',
+      name: 'Follow redirect',
       id: 'followRedirect',
       type: 'boolean',
       default: true,
       description: 'Automatically follow HTTP redirects'
     },
     {
-      name: 'Trim request body fields',
+      name: 'Body trim',
       id: 'trimRequestBody',
       type: 'boolean',
-      default: false,
-      description: 'Remove white space and additional lines that may affect the server\'s response'
+      default: true,
+      description: 'Trim request body fields'
     }
   ];
 }
diff --git a/codegens/js-fetch/README.md b/codegens/js-fetch/README.md
index 602f333..279c0f3 100644
--- a/codegens/js-fetch/README.md
+++ b/codegens/js-fetch/README.md
@@ -15,7 +15,7 @@ Convert function takes three parameters
 
 * `options` - options is an object which hsa following properties
     * `indentType` - String denoting type of indentation for code snippet. eg: 'Space', 'Tab'
-    * `indentCount` - The number of indentation characters to add per code level
+    * `indentCount` - Number of indentation characters to add per code level
     * `trimRequestBody` - Trim request body fields
     * `followRedirect` - Boolean denoting whether to redirect a request
     * `requestTimeout` - Integer denoting time after which the request will bail out in milli-seconds
diff --git a/codegens/js-fetch/lib/index.js b/codegens/js-fetch/lib/index.js
index 2eacd12..b182cc0 100644
--- a/codegens/js-fetch/lib/index.js
+++ b/codegens/js-fetch/lib/index.js
@@ -129,41 +129,40 @@ function parseHeaders (headers) {
 function getOptions () {
   return [
     {
-      name: 'Set indentation count',
+      name: 'Indent count',
       id: 'indentCount',
       type: 'positiveInteger',
       default: 2,
-      description: 'Set the number of indentation characters to add per code level'
+      description: 'Number of indentation characters to add per code level'
     },
     {
-      name: 'Set indentation type',
+      name: 'Indent type',
       id: 'indentType',
       type: 'enum',
       availableOptions: ['Tab', 'Space'],
       default: 'Space',
-      description: 'Select the character used to indent lines of code'
+      description: 'Character used for indentation'
     },
     {
-      name: 'Set request timeout',
+      name: 'Request timeout',
       id: 'requestTimeout',
       type: 'positiveInteger',
       default: 0,
-      description: 'Set number of milliseconds the request should wait for a response' +
-    ' before timing out (use 0 for infinity)'
+      description: 'How long the request should wait for a response before timing out (milliseconds)'
     },
     {
-      name: 'Follow redirects',
+      name: 'Follow redirect',
       id: 'followRedirect',
       type: 'boolean',
       default: true,
       description: 'Automatically follow HTTP redirects'
     },
     {
-      name: 'Trim request body fields',
+      name: 'Body trim',
       id: 'trimRequestBody',
       type: 'boolean',
-      default: false,
-      description: 'Remove white space and additional lines that may affect the server\'s response'
+      default: true,
+      description: 'Trim request body fields'
     }
   ];
 }
diff --git a/codegens/js-jquery/lib/js-jquery.js b/codegens/js-jquery/lib/js-jquery.js
index bab94f1..c2933d5 100644
--- a/codegens/js-jquery/lib/js-jquery.js
+++ b/codegens/js-jquery/lib/js-jquery.js
@@ -64,34 +64,33 @@ self = module.exports = {
      */
   getOptions: function () {
     return [{
-      name: 'Set indentation count',
+      name: 'Indent count',
       id: 'indentCount',
       type: 'positiveInteger',
       default: 2,
-      description: 'Set the number of indentation characters to add per code level'
+      description: 'Number of indentation characters to add per code level'
     },
     {
-      name: 'Set indentation type',
+      name: 'Indent type',
       id: 'indentType',
       type: 'enum',
       availableOptions: ['Tab', 'Space'],
       default: 'Space',
-      description: 'Select the character used to indent lines of code'
+      description: 'Character used for indentation'
     },
     {
-      name: 'Set request timeout',
+      name: 'Request timeout',
       id: 'requestTimeout',
       type: 'positiveInteger',
       default: 0,
-      description: 'Set number of milliseconds the request should wait for a response' +
-    ' before timing out (use 0 for infinity)'
+      description: 'How long the request should wait for a response before timing out (milliseconds)'
     },
     {
-      name: 'Trim request body fields',
+      name: 'Body trim',
       id: 'trimRequestBody',
       type: 'boolean',
-      default: false,
-      description: 'Remove white space and additional lines that may affect the server\'s response'
+      default: true,
+      description: 'Trim request body fields'
     }];
   },
 
diff --git a/codegens/js-xhr/README.md b/codegens/js-xhr/README.md
index c111535..e4fca52 100644
--- a/codegens/js-xhr/README.md
+++ b/codegens/js-xhr/README.md
@@ -24,7 +24,7 @@ Convert function takes three parameters
 
 * `options` - options is an object which hsa following properties
     * `indentType` - String denoting type of indentation for code snippet. eg: 'Space', 'Tab'
-    * `indentCount` - The number of indentation characters to add per code level
+    * `indentCount` - Number of indentation characters to add per code level
     * `trimRequestBody` - Trim request body fields
     * `followRedirect` - Boolean denoting whether to redirect a request
     * `requestTimeout` - Integer denoting time after which the request will bail out in milli-seconds
diff --git a/codegens/js-xhr/lib/index.js b/codegens/js-xhr/lib/index.js
index 44d65b1..41c759e 100644
--- a/codegens/js-xhr/lib/index.js
+++ b/codegens/js-xhr/lib/index.js
@@ -119,34 +119,33 @@ function parseHeaders (headers) {
 function getOptions () {
   return [
     {
-      name: 'Set indentation count',
+      name: 'Indent count',
       id: 'indentCount',
       type: 'positiveInteger',
       default: 2,
-      description: 'Set the number of indentation characters to add per code level'
+      description: 'Number of indentation characters to add per code level'
     },
     {
-      name: 'Set indentation type',
+      name: 'Indent type',
       id: 'indentType',
       type: 'enum',
       availableOptions: ['Tab', 'Space'],
       default: 'Space',
-      description: 'Select the character used to indent lines of code'
+      description: 'Character used for indentation'
     },
     {
-      name: 'Set request timeout',
+      name: 'Request timeout',
       id: 'requestTimeout',
       type: 'positiveInteger',
       default: 0,
-      description: 'Set number of milliseconds the request should wait for a response' +
-    ' before timing out (use 0 for infinity)'
+      description: 'How long the request should wait for a response before timing out (milliseconds)'
     },
     {
-      name: 'Trim request body fields',
+      name: 'Body trim',
       id: 'trimRequestBody',
       type: 'boolean',
-      default: false,
-      description: 'Remove white space and additional lines that may affect the server\'s response'
+      default: true,
+      description: 'Trim request body fields'
     }
   ];
 }
@@ -174,7 +173,7 @@ function convert (request, options, callback) {
   indent = indent.repeat(options.indentCount);
   trim = options.trimRequestBody;
 
-  bodySnippet = request.body ? parseBody(request.body.toJSON(), trim, indent) : '';
+  bodySnippet = parseBody(request.body.toJSON(), trim, indent);
 
   codeSnippet += bodySnippet + '\n';
 
@@ -197,7 +196,7 @@ function convert (request, options, callback) {
 
   codeSnippet += headerSnippet + '\n';
 
-  codeSnippet += request.body ? 'xhr.send(data)' : 'xhr.send();';
+  codeSnippet += 'xhr.send(data);';
   callback(null, codeSnippet);
 }
 
diff --git a/codegens/libcurl/lib/index.js b/codegens/libcurl/lib/index.js
index b511f52..b2e6f26 100644
--- a/codegens/libcurl/lib/index.js
+++ b/codegens/libcurl/lib/index.js
@@ -46,7 +46,7 @@ self = module.exports = {
     _.forEach(headersData, function (value, key) {
       snippet += indentString + `headers = curl_slist_append(headers, "${sanitize(key)}: ${sanitize(value)}");\n`;
     });
-    body = request.body ? request.body.toJSON() : {};
+    body = request.body.toJSON();
     if (body.mode && body.mode === 'formdata' && !options.useMimeType) {
       snippet += indentString + 'headers = curl_slist_append(headers, "content-type:' +
                 ` multipart/form-data; boundary=${BOUNDARY}");\n`;
@@ -124,6 +124,11 @@ self = module.exports = {
     }
 
     snippet += indentString + 'res = curl_easy_perform(curl);\n';
+    snippet += indentString + 'if(res == CURLE_OK) {\n';
+    snippet += indentString.repeat(2) + 'long response_code;\n';
+    snippet += indentString.repeat(2) + 'curl_easy_getinfo(curl, CURLINFO_RESPONSE_CODE, &response_code);\n';
+    snippet += indentString.repeat(2) + 'if(!res && response_code) printf("%03ld", response_code);\n';
+    snippet += indentString + '}\n';
     if (body.mode === 'formdata' && options.useMimeType) {
       snippet += indentString + 'curl_mime_free(mime);\n';
     }
@@ -151,26 +156,26 @@ self = module.exports = {
         description: 'The protocol to be used to make the request'
       },
       {
-        name: 'Set indentation count',
+        name: 'Indent count',
         id: 'indentCount',
         type: 'positiveInteger',
         default: 2,
-        description: 'Set the number of indentation characters to add per code level'
+        description: 'Number of indentation characters to add per code level'
       },
       {
-        name: 'Set indentation type',
+        name: 'Indent type',
         id: 'indentType',
         type: 'enum',
         availableOptions: ['Tab', 'Space'],
         default: 'Space',
-        description: 'Select the character used to indent lines of code'
+        description: 'Character used for indentation'
       },
       {
-        name: 'Trim request body fields',
+        name: 'Body trim',
         id: 'trimRequestBody',
         type: 'boolean',
-        default: false,
-        description: 'Remove white space and additional lines that may affect the server\'s response'
+        default: true,
+        description: 'Trim request body fields'
       },
       {
         name: 'Use curl_mime',
@@ -180,12 +185,11 @@ self = module.exports = {
         description: 'Use curl_mime to send multipart/form-data requests'
       },
       {
-        name: 'Set request timeout',
+        name: 'Request timeout',
         id: 'requestTimeout',
         type: 'positiveInteger',
         default: 0,
-        description: 'Set number of milliseconds the request should wait for a response' +
-    ' before timing out (use 0 for infinity)'
+        description: 'How long the request should wait for a response before timing out (milliseconds)'
       }
     ];
   }
diff --git a/codegens/nodejs-native/README.md b/codegens/nodejs-native/README.md
index c86571b..e8edf36 100644
--- a/codegens/nodejs-native/README.md
+++ b/codegens/nodejs-native/README.md
@@ -15,8 +15,8 @@ Convert function will take three parameters
 * `request`- Postman-SDK Request object
 
 * `options`- options is an object which can have following properties
-    * `indentType`- String denoting type of indentation for code snippet. eg: 'Space', 'Tab'
-    * `indentCount`- Integer representing count of indentation required.
+    * `indentType`- string representing type of indentation for code snippet. eg: 'Space', 'Tab'
+    * `indentCount`- positiveInteger representing count of indentation required.
     * `requestTimeout` : Integer denoting time after which the request will bail out in milli-seconds
     * `trimRequestBody` : Trim request body fields
     * `followRedirect` : Boolean denoting whether to redirect a request
diff --git a/codegens/nodejs-native/lib/request.js b/codegens/nodejs-native/lib/request.js
index 5eb7361..6f85db3 100644
--- a/codegens/nodejs-native/lib/request.js
+++ b/codegens/nodejs-native/lib/request.js
@@ -121,41 +121,40 @@ self = module.exports = {
      */
   getOptions: function () {
     return [{
-      name: 'Set indentation count',
+      name: 'Indent count',
       id: 'indentCount',
       type: 'positiveInteger',
       default: 2,
-      description: 'Set the number of indentation characters to add per code level'
+      description: 'Number of indentation characters to add per code level'
     },
     {
-      name: 'Set indentation type',
+      name: 'Indent type',
       id: 'indentType',
       type: 'enum',
       availableOptions: ['Tab', 'Space'],
       default: 'Space',
-      description: 'Select the character used to indent lines of code'
+      description: 'Character used for indentation'
     },
     {
-      name: 'Set request timeout',
+      name: 'Request timeout',
       id: 'requestTimeout',
       type: 'positiveInteger',
       default: 0,
-      description: 'Set number of milliseconds the request should wait for a response' +
-    ' before timing out (use 0 for infinity)'
+      description: 'How long the request should wait for a response before timing out (milliseconds)'
     },
     {
-      name: 'Follow redirects',
+      name: 'Follow redirect',
       id: 'followRedirect',
       type: 'boolean',
       default: true,
       description: 'Automatically follow HTTP redirects'
     },
     {
-      name: 'Trim request body fields',
+      name: 'Body trim',
       id: 'trimRequestBody',
       type: 'boolean',
-      default: false,
-      description: 'Remove white space and additional lines that may affect the server\'s response'
+      default: true,
+      description: 'Trim request body fields'
     }];
   },
 
diff --git a/codegens/nodejs-request/README.md b/codegens/nodejs-request/README.md
index 7d85226..9a23dc6 100644
--- a/codegens/nodejs-request/README.md
+++ b/codegens/nodejs-request/README.md
@@ -24,7 +24,7 @@ Convert function will take three parameters
 * `request`- Postman-SDK Request object
 
 * `options`- options is an object which can have following properties
-    * `indentType`- String denoting type of indentation for code snippet. eg: 'Space', 'Tab'
+    * `indentType`- string representing type of indentation for code snippet. eg: 'Space', 'Tab'
     * `indentCount`- positiveInteger representing count of indentation required.
     * `requestTimeout` : Integer denoting time after which the request will bail out in milli-seconds
     * `trimRequestBody` : Trim request body fields
diff --git a/codegens/nodejs-request/lib/request.js b/codegens/nodejs-request/lib/request.js
index ea4442c..1b0d3c1 100644
--- a/codegens/nodejs-request/lib/request.js
+++ b/codegens/nodejs-request/lib/request.js
@@ -16,7 +16,7 @@ function makeSnippet (request, indentString, options) {
   var snippet = 'var request = require(\'request\');\n',
     optionsArray = [];
 
-  snippet += 'var fs = require(\'fs\');\n';
+  snippet += 'var fs = require(\'fs\')\n';
   snippet += 'var options = {\n';
 
   /**
@@ -45,7 +45,7 @@ function makeSnippet (request, indentString, options) {
     optionsArray.push(indentString + 'followRedirect: false');
   }
   snippet += optionsArray.join(',\n') + '\n';
-  snippet += '};\n';
+  snippet += '}\n';
 
   snippet += 'request(options, function (error, response) { \n';
   snippet += indentString + 'if (error) throw new Error(error);\n';
@@ -63,41 +63,40 @@ function makeSnippet (request, indentString, options) {
 function getOptions () {
   return [
     {
-      name: 'Set indentation count',
+      name: 'Indent count',
       id: 'indentCount',
       type: 'positiveInteger',
       default: 2,
-      description: 'Set the number of indentation characters to add per code level'
+      description: 'Number of indentation characters to add per code level'
     },
     {
-      name: 'Set indentation type',
+      name: 'Indent type',
       id: 'indentType',
       type: 'enum',
       availableOptions: ['Tab', 'Space'],
       default: 'Space',
-      description: 'Select the character used to indent lines of code'
+      description: 'Character used for indentation'
     },
     {
-      name: 'Set request timeout',
+      name: 'Request timeout',
       id: 'requestTimeout',
       type: 'positiveInteger',
       default: 0,
-      description: 'Set number of milliseconds the request should wait for a response' +
-    ' before timing out (use 0 for infinity)'
+      description: 'How long the request should wait for a response before timing out (milliseconds)'
     },
     {
-      name: 'Follow redirects',
+      name: 'Follow redirect',
       id: 'followRedirect',
       type: 'boolean',
       default: true,
       description: 'Automatically follow HTTP redirects'
     },
     {
-      name: 'Trim request body fields',
+      name: 'Body trim',
       id: 'trimRequestBody',
       type: 'boolean',
-      default: false,
-      description: 'Remove white space and additional lines that may affect the server\'s response'
+      default: true,
+      description: 'Trim request body fields'
     }
   ];
 }
diff --git a/codegens/nodejs-unirest/README.md b/codegens/nodejs-unirest/README.md
index 2d82a53..7231271 100644
--- a/codegens/nodejs-unirest/README.md
+++ b/codegens/nodejs-unirest/README.md
@@ -24,7 +24,7 @@ Convert function will take three parameters
 * `request`- Postman-SDK Request object
 
 * `options`- options is an object which can have following properties
-    * `indentType`- String denoting type of indentation for code snippet. eg: 'Space', 'Tab'
+    * `indentType`- string representing type of indentation for code snippet. eg: 'Space', 'Tab' (default: 'Tab')
     * `indentCount`- positiveInteger representing count of indentation required.
     * `requestTimeout` : Integer denoting time after which the request will bail out in milli-seconds
     * `trimRequestBody` : Trim request body fields
diff --git a/codegens/nodejs-unirest/lib/unirest.js b/codegens/nodejs-unirest/lib/unirest.js
index 42882db..e163bec 100644
--- a/codegens/nodejs-unirest/lib/unirest.js
+++ b/codegens/nodejs-unirest/lib/unirest.js
@@ -44,41 +44,40 @@ function makeSnippet (request, indentString, options) {
 function getOptions () {
   return [
     {
-      name: 'Set indentation count',
+      name: 'Indent count',
       id: 'indentCount',
       type: 'positiveInteger',
       default: 2,
-      description: 'Set the number of indentation characters to add per code level'
+      description: 'Number of indentation characters to add per code level'
     },
     {
-      name: 'Set indentation type',
+      name: 'Indent type',
       id: 'indentType',
       type: 'enum',
       availableOptions: ['Tab', 'Space'],
       default: 'Space',
-      description: 'Select the character used to indent lines of code'
+      description: 'Character used for indentation'
     },
     {
-      name: 'Set request timeout',
+      name: 'Request timeout',
       id: 'requestTimeout',
       type: 'positiveInteger',
       default: 0,
-      description: 'Set number of milliseconds the request should wait for a response' +
-    ' before timing out (use 0 for infinity)'
+      description: 'How long the request should wait for a response before timing out (milliseconds)'
     },
     {
-      name: 'Follow redirects',
+      name: 'Follow redirect',
       id: 'followRedirect',
       type: 'boolean',
       default: true,
       description: 'Automatically follow HTTP redirects'
     },
     {
-      name: 'Trim request body fields',
+      name: 'Body trim',
       id: 'trimRequestBody',
       type: 'boolean',
-      default: false,
-      description: 'Remove white space and additional lines that may affect the server\'s response'
+      default: true,
+      description: 'Trim request body fields'
     }
   ];
 }
diff --git a/codegens/ocaml-cohttp/README.md b/codegens/ocaml-cohttp/README.md
index 0365756..6958a82 100644
--- a/codegens/ocaml-cohttp/README.md
+++ b/codegens/ocaml-cohttp/README.md
@@ -26,7 +26,7 @@ Convert function takes three parameters
 
 * `options` - options is an object which hsa following properties
     * `indentType` - String denoting type of indentation for code snippet. eg: 'Space', 'Tab'
-    * `indentCount` - The number of indentation characters to add per code level
+    * `indentCount` - Number of indentation characters to add per code level
     * `trimRequestBody` - Trim request body fields
     * `followRedirect` - Boolean denoting whether to redirect a request 
     * `requestTimeout` - Integer denoting time after which the request will bail out in milli-seconds
diff --git a/codegens/ocaml-cohttp/lib/ocaml.js b/codegens/ocaml-cohttp/lib/ocaml.js
index a394499..c6898e6 100644
--- a/codegens/ocaml-cohttp/lib/ocaml.js
+++ b/codegens/ocaml-cohttp/lib/ocaml.js
@@ -209,37 +209,36 @@ self = module.exports = {
   getOptions: function () {
     return [
       {
-        name: 'Set indentation count',
+        name: 'Indent count',
         id: 'indentCount',
         type: 'positiveInteger',
         default: 2,
-        description: 'Set the number of indentation characters to add per code level'
+        description: 'Number of indentation characters to add per code level'
       },
       {
-        name: 'Set indentation type',
+        name: 'Indent type',
         id: 'indentType',
         type: 'enum',
         availableOptions: ['Tab', 'Space'],
         default: 'Space',
-        description: 'Select the character used to indent lines of code'
+        description: 'Character used for indentation'
       },
       {
-        name: 'Trim request body fields',
+        name: 'Body trim',
         id: 'trimRequestBody',
         type: 'boolean',
-        default: false,
-        description: 'Remove white space and additional lines that may affect the server\'s response'
+        default: true,
+        description: 'Trim request body fields'
       },
       {
-        name: 'Set request timeout',
+        name: 'Request timeout',
         id: 'requestTimeout',
         type: 'positiveInteger',
         default: 0,
-        description: 'Set number of milliseconds the request should wait for a response' +
-    ' before timing out (use 0 for infinity)'
+        description: 'How long the request should wait for a response before timing out (milliseconds)'
       },
       {
-        name: 'Follow redirects',
+        name: 'Follow redirect',
         id: 'followRedirect',
         type: 'boolean',
         default: true,
diff --git a/codegens/php-curl/README.md b/codegens/php-curl/README.md
index 9b11f6f..5bfe6a3 100644
--- a/codegens/php-curl/README.md
+++ b/codegens/php-curl/README.md
@@ -31,9 +31,13 @@ It requires 3 mandatory parameters `request`, `callback` and `options`
 * `options` is an object with the following properties
 
     * `indentType` : can be `Tab` or `Space` (default: 'Space')
+
     * `indentCount` : Integer denoting the number of tabs/spaces required for indentation, range 0-8 (default : for indentType Tab : 2, for indentType Space : 4)
+    
     * `requestTimeout` : Integer denoting time after which the request will bail out in milli-seconds (default: 0 -> never bail out)
+
     * `trimRequestBody` : Trim request body fields (default: false)
+
     * `followRedirect` : Boolean denoting whether to redirect a request (default: true)
 
     These plugin options will be used if no options are passed to the convert function.
diff --git a/codegens/php-curl/lib/php-curl.js b/codegens/php-curl/lib/php-curl.js
index 99248ff..442eb8a 100644
--- a/codegens/php-curl/lib/php-curl.js
+++ b/codegens/php-curl/lib/php-curl.js
@@ -33,41 +33,40 @@ self = module.exports = {
      */
   getOptions: function () {
     return [{
-      name: 'Set indentation count',
+      name: 'Indent count',
       id: 'indentCount',
       type: 'positiveInteger',
       default: 2,
-      description: 'Set the number of indentation characters to add per code level'
+      description: 'Number of indentation characters to add per code level'
     },
     {
-      name: 'Set indentation type',
+      name: 'Indent type',
       id: 'indentType',
       type: 'enum',
       availableOptions: ['Tab', 'Space'],
       default: 'Space',
-      description: 'Select the character used to indent lines of code'
+      description: 'Character used for indentation'
     },
     {
-      name: 'Set request timeout',
+      name: 'Request timeout',
       id: 'requestTimeout',
       type: 'positiveInteger',
       default: 0,
-      description: 'Set number of milliseconds the request should wait for a response' +
-    ' before timing out (use 0 for infinity)'
+      description: 'How long the request should wait for a response before timing out (milliseconds)'
     },
     {
-      name: 'Follow redirects',
+      name: 'Follow redirect',
       id: 'followRedirect',
       type: 'boolean',
       default: true,
       description: 'Automatically follow HTTP redirects'
     },
     {
-      name: 'Trim request body fields',
+      name: 'Body trim',
       id: 'trimRequestBody',
       type: 'boolean',
-      default: false,
-      description: 'Remove white space and additional lines that may affect the server\'s response'
+      default: true,
+      description: 'Trim request body fields'
     }];
   },
 
diff --git a/codegens/php-pecl-http/README.md b/codegens/php-pecl-http/README.md
index 02bf542..6d676bb 100644
--- a/codegens/php-pecl-http/README.md
+++ b/codegens/php-pecl-http/README.md
@@ -15,7 +15,7 @@ Convert function takes three parameters
 
 * `options` - options is an object which hsa following properties
     * `indentType` - String denoting type of indentation for code snippet. eg: 'Space', 'Tab'
-    * `indentCount` - The number of indentation characters to add per code level
+    * `indentCount` - Number of indentation characters to add per code level
     * `trimRequestBody` - Trim request body fields
     * `followRedirect` - Boolean denoting whether to redirect a request
     * `requestTimeout` - Integer denoting time after which the request will bail out in milli-seconds
diff --git a/codegens/php-pecl-http/lib/phpPecl.js b/codegens/php-pecl-http/lib/phpPecl.js
index 4ed9263..93644d6 100644
--- a/codegens/php-pecl-http/lib/phpPecl.js
+++ b/codegens/php-pecl-http/lib/phpPecl.js
@@ -33,37 +33,36 @@ self = module.exports = {
   getOptions: function () {
     return [
       {
-        name: 'Set indentation count',
+        name: 'Indent count',
         id: 'indentCount',
         type: 'positiveInteger',
         default: 2,
-        description: 'Set the number of indentation characters to add per code level'
+        description: 'Number of indentation characters to add per code level'
       },
       {
-        name: 'Set indentation type',
+        name: 'Indent type',
         id: 'indentType',
         type: 'enum',
         default: 'Space',
         availableOptions: ['Tab', 'Space'],
-        description: 'Select the character used to indent lines of code'
+        description: 'Character used for indentation'
       },
       {
-        name: 'Set request timeout',
+        name: 'Request timeout',
         id: 'requestTimeout',
         type: 'positiveInteger',
         default: 0,
-        description: 'Set number of milliseconds the request should wait for a response' +
-    ' before timing out (use 0 for infinity)'
+        description: 'How long the request should wait for a response before timing out (milliseconds)'
       },
       {
-        name: 'Trim request body fields',
+        name: 'Body trim',
         id: 'trimRequestBody',
         type: 'boolean',
-        default: false,
-        description: 'Remove white space and additional lines that may affect the server\'s response'
+        default: true,
+        description: 'Trim request body fields'
       },
       {
-        name: 'Follow redirects',
+        name: 'Follow redirect',
         id: 'followRedirect',
         type: 'boolean',
         default: true,
@@ -118,6 +117,7 @@ self = module.exports = {
     snippet += '$client->enqueue($request)->send();\n';
     snippet += '$response = $client->getResponse();\n';
     snippet += 'echo $response->getBody();\n';
+    snippet += '?>';
 
     return callback(null, snippet);
   }
diff --git a/codegens/powershell-restmethod/lib/index.js b/codegens/powershell-restmethod/lib/index.js
index db1ba75..3402cbc 100644
--- a/codegens/powershell-restmethod/lib/index.js
+++ b/codegens/powershell-restmethod/lib/index.js
@@ -155,26 +155,25 @@ function parseHeaders (headers) {
 function getOptions () {
   return [
     {
-      name: 'Set request timeout',
+      name: 'Request timeout',
       id: 'requestTimeout',
       type: 'positiveInteger',
       default: 0,
-      description: 'Set number of milliseconds the request should wait for a response' +
-    ' before timing out (use 0 for infinity)'
+      description: 'How long the request should wait for a response before timing out (milliseconds)'
     },
     {
-      name: 'Follow redirects',
+      name: 'Follow redirect',
       id: 'followRedirect',
       type: 'boolean',
       default: true,
       description: 'Automatically follow HTTP redirects'
     },
     {
-      name: 'Trim request body fields',
+      name: 'Body trim',
       id: 'trimRequestBody',
       type: 'boolean',
-      default: false,
-      description: 'Remove white space and additional lines that may affect the server\'s response'
+      default: true,
+      description: 'Trim request body fields'
     }
   ];
 }
@@ -204,7 +203,7 @@ function convert (request, options, callback) {
   headers = request.getHeaders({enabled: true});
   headerSnippet = parseHeaders(headers);
 
-  body = request.body ? request.body.toJSON() : {};
+  body = request.body.toJSON();
   bodySnippet = parseBody(body, trim);
 
   if (headerSnippet !== '') {
diff --git a/codegens/python-http.client/README.md b/codegens/python-http.client/README.md
index b9388c6..a7510ec 100644
--- a/codegens/python-http.client/README.md
+++ b/codegens/python-http.client/README.md
@@ -15,7 +15,7 @@ Convert function takes three parameters
 
 * `options` - options is an object which hsa following properties
     * `indentType` - String denoting type of indentation for code snippet. eg: 'Space', 'Tab'
-    * `indentCount` - Set the number of indentation characters to add per code level
+    * `indentCount` - Number of indentation characters to add per code level
     * `trimRequestBody` - Trim request body fields
     * `followRedirect` - Boolean denoting whether to redirect a request
     * `requestTimeout` - Integer denoting time after which the request will bail out in milli-seconds
diff --git a/codegens/python-http.client/lib/python-httpclient.js b/codegens/python-http.client/lib/python-httpclient.js
index 09512fb..30473a9 100644
--- a/codegens/python-http.client/lib/python-httpclient.js
+++ b/codegens/python-http.client/lib/python-httpclient.js
@@ -62,34 +62,33 @@ self = module.exports = {
   getOptions: function () {
     return [
       {
-        name: 'Set indentation count',
+        name: 'Indent count',
         id: 'indentCount',
         type: 'positiveInteger',
         default: 2,
-        description: 'Set the number of indentation characters to add per code level'
+        description: 'Number of indentation characters to add per code level'
       },
       {
-        name: 'Set indentation type',
+        name: 'Indent type',
         id: 'indentType',
         type: 'enum',
         default: 'Space',
         availableOptions: ['Tab', 'Space'],
-        description: 'Select the character used to indent lines of code'
+        description: 'Character used for indentation'
       },
       {
-        name: 'Set request timeout',
+        name: 'Request timeout',
         id: 'requestTimeout',
         type: 'positiveInteger',
         default: 0,
-        description: 'Set number of milliseconds the request should wait for a response' +
-    ' before timing out (use 0 for infinity)'
+        description: 'How long the request should wait for a response before timing out (milliseconds)'
       },
       {
-        name: 'Trim request body fields',
+        name: 'Body trim',
         id: 'trimRequestBody',
         type: 'boolean',
-        default: false,
-        description: 'Remove white space and additional lines that may affect the server\'s response'
+        default: true,
+        description: 'Trim request body fields'
       }
     ];
   },
diff --git a/codegens/python-requests/README.md b/codegens/python-requests/README.md
index cca7567..3319fb8 100644
--- a/codegens/python-requests/README.md
+++ b/codegens/python-requests/README.md
@@ -19,9 +19,13 @@ It requires 3 mandatory parameters `request`, `callback` and `options`
 * `options` is an object with the following properties
 
     * `indentType` : can be `Tab` or `Space` (default: 'Space')
+
     * `indentCount` : Integer denoting the number of tabs/spaces required for indentation, range 0-8 (default : for indentType Tab : 2, for indentType Space : 4)
+    
     * `requestTimeout` : Integer denoting time after which the request will bail out in milli-seconds (default: 0 -> never bail out)
+
     * `trimRequestBody` : Trim request body fields (default: false)
+
     * `followRedirect` : Boolean denoting whether to redirect a request (default: true)
 
     These plugin options will be used if no options are passed to the convert function.
diff --git a/codegens/python-requests/lib/python-requests.js b/codegens/python-requests/lib/python-requests.js
index 24519c3..b3d0c22 100644
--- a/codegens/python-requests/lib/python-requests.js
+++ b/codegens/python-requests/lib/python-requests.js
@@ -33,41 +33,40 @@ self = module.exports = {
      */
   getOptions: function () {
     return [{
-      name: 'Set indentation count',
+      name: 'Indent count',
       id: 'indentCount',
       type: 'positiveInteger',
       default: 2,
-      description: 'Set the number of indentation characters to add per code level'
+      description: 'Number of indentation characters to add per code level'
     },
     {
-      name: 'Set indentation type',
+      name: 'Indent type',
       id: 'indentType',
       type: 'enum',
       availableOptions: ['Tab', 'Space'],
       default: 'Space',
-      description: 'Select the character used to indent lines of code'
+      description: 'Character used for indentation'
     },
     {
-      name: 'Set request timeout',
+      name: 'Request timeout',
       id: 'requestTimeout',
       type: 'positiveInteger',
       default: 0,
-      description: 'Set number of milliseconds the request should wait for a response' +
-    ' before timing out (use 0 for infinity)'
+      description: 'How long the request should wait for a response before timing out (milliseconds)'
     },
     {
-      name: 'Follow redirects',
+      name: 'Follow redirect',
       id: 'followRedirect',
       type: 'boolean',
       default: true,
       description: 'Automatically follow HTTP redirects'
     },
     {
-      name: 'Trim request body fields',
+      name: 'Body trim',
       id: 'trimRequestBody',
       type: 'boolean',
-      default: false,
-      description: 'Remove white space and additional lines that may affect the server\'s response'
+      default: true,
+      description: 'Trim request body fields'
     }];
   },
 
@@ -109,8 +108,9 @@ self = module.exports = {
 
     snippet += request.body && request.body.mode && request.body.mode === 'formdata' ?
       ', data = payload, files = files' : ', data = payload';
-    snippet += !options.followRedirect ? ', allow_redirects = False' : '';
+    snippet += !options.followRedirect ? ', allow_redirects=False' : '';
     snippet += options.requestTimeout !== 0 ? `, timeout=${options.requestTimeout}` : '';
+    snippet += options.followRedirect ? '' : ', allow_redirects=false';
     snippet += ')\n\n';
     snippet += 'print(response.text.encode(\'utf8\'))\n';
 
diff --git a/codegens/ruby/README.md b/codegens/ruby/README.md
index 2b036ad..519a07f 100644
--- a/codegens/ruby/README.md
+++ b/codegens/ruby/README.md
@@ -21,8 +21,11 @@ It requires 3 mandatory parameters `request`, `callback` and `options`
 * `options` is an object with the following properties
 
     * `indentType` : can be `Tab` or `Space` (default: 'Space')
+
     * `indentCount` : Integer denoting the number of tabs/spaces required for indentation, range 0-8 (default : for indentType Tab : 2, for indentType Space : 4)
+
     * `trimRequestBody` : Trim request body fields (default: false)
+
     These plugin options will be used if no options are passed to the convert function.
 
 * `callback` : callback function with `error` and `snippet` parameters where snippet is the desired output
diff --git a/codegens/ruby/lib/ruby.js b/codegens/ruby/lib/ruby.js
index 6e7a61a..6b235c0 100644
--- a/codegens/ruby/lib/ruby.js
+++ b/codegens/ruby/lib/ruby.js
@@ -28,41 +28,40 @@ self = module.exports = {
      */
   getOptions: function () {
     return [{
-      name: 'Set indentation count',
+      name: 'Indent count',
       id: 'indentCount',
       type: 'positiveInteger',
       default: 2,
-      description: 'Set the number of indentation characters to add per code level'
+      description: 'Number of indentation characters to add per code level'
     },
     {
-      name: 'Set indentation type',
+      name: 'Indent type',
       id: 'indentType',
       type: 'enum',
       availableOptions: ['Tab', 'Space'],
       default: 'Space',
-      description: 'Select the character used to indent lines of code'
+      description: 'Character used for indentation'
     },
     {
-      name: 'Set request timeout',
+      name: 'Request timeout',
       id: 'requestTimeout',
       type: 'positiveInteger',
       default: 0,
-      description: 'Set number of milliseconds the request should wait for a response' +
-    ' before timing out (use 0 for infinity)'
+      description: 'How long the request should wait for a response before timing out (milliseconds)'
     },
     {
-      name: 'Follow redirects',
+      name: 'Follow redirect',
       id: 'followRedirect',
       type: 'boolean',
       default: true,
       description: 'Automatically follow HTTP redirects'
     },
     {
-      name: 'Trim request body fields',
+      name: 'Body trim',
       id: 'trimRequestBody',
       type: 'boolean',
-      default: false,
-      description: 'Remove white space and additional lines that may affect the server\'s response'
+      default: true,
+      description: 'Trim request body fields'
     }];
   },
 
diff --git a/codegens/shell-httpie/lib/shell-httpie.js b/codegens/shell-httpie/lib/shell-httpie.js
index 2244a7e..5f78908 100644
--- a/codegens/shell-httpie/lib/shell-httpie.js
+++ b/codegens/shell-httpie/lib/shell-httpie.js
@@ -17,15 +17,14 @@ self = module.exports = {
   getOptions: function () {
     return [
       {
-        name: 'Set request timeout',
+        name: 'Request timeout',
         id: 'requestTimeout',
         type: 'positiveInteger',
         default: 0,
-        description: 'Set number of milliseconds the request should wait for a response' +
-    ' before timing out (use 0 for infinity)'
+        description: 'How long the request should wait for a response before timing out (milliseconds)'
       },
       {
-        name: 'Follow redirects',
+        name: 'Follow redirect',
         id: 'followRedirect',
         type: 'boolean',
         default: true,
diff --git a/codegens/shell-wget/README.md b/codegens/shell-wget/README.md
index 7da97e4..880745e 100644
--- a/codegens/shell-wget/README.md
+++ b/codegens/shell-wget/README.md
@@ -20,9 +20,13 @@ It requires 3 mandatory parameters `request`, `callback` and `options`
 * `options` is an object with the following properties
 
     * `indentType` : can be `Tab` or `Space` (default: 'Space')
+
     * `indentCount` : Integer denoting the number of tabs/spaces required for indentation, range 0-8 (default : for indentType Tab : 2, for indentType Space : 4)
+    
     * `requestTimeout` : Integer denoting time after which the request will bail out in milli-seconds (default: 0 -> never bail out)
+
     * `trimRequestBody` : Trim request body fields (default: false)
+
     * `followRedirect` : Boolean denoting whether to redirect a request (default: true)
 
     These plugin options will be used if no options are passed to the convert function.
diff --git a/codegens/shell-wget/lib/shell-wget.js b/codegens/shell-wget/lib/shell-wget.js
index 11d0d78..e337daa 100644
--- a/codegens/shell-wget/lib/shell-wget.js
+++ b/codegens/shell-wget/lib/shell-wget.js
@@ -38,41 +38,40 @@ self = module.exports = {
     // Also, place where to log the output if required.
     return [
       {
-        name: 'Set indentation count',
+        name: 'Indent count',
         id: 'indentCount',
         type: 'positiveInteger',
         default: 2,
-        description: 'Set the number of indentation characters to add per code level'
+        description: 'Number of indentation characters to add per code level'
       },
       {
-        name: 'Set indentation type',
+        name: 'Indent type',
         id: 'indentType',
         type: 'enum',
         availableOptions: ['Tab', 'Space'],
         default: 'Space',
-        description: 'Select the character used to indent lines of code'
+        description: 'Character used for indentation'
       },
       {
-        name: 'Set request timeout',
+        name: 'Request timeout',
         id: 'requestTimeout',
         type: 'positiveInteger',
         default: 0,
-        description: 'Set number of milliseconds the request should wait for a response' +
-    ' before timing out (use 0 for infinity)'
+        description: 'How long the request should wait for a response before timing out (milliseconds)'
       },
       {
-        name: 'Follow redirects',
+        name: 'Follow redirect',
         id: 'followRedirect',
         type: 'boolean',
         default: true,
         description: 'Automatically follow HTTP redirects'
       },
       {
-        name: 'Trim request body fields',
+        name: 'Body trim',
         id: 'trimRequestBody',
         type: 'boolean',
         default: false,
-        description: 'Remove white space and additional lines that may affect the server\'s response'
+        description: 'Trim request body fields'
       }
     ];
   },
@@ -96,7 +95,8 @@ self = module.exports = {
   convert: function (request, options, callback) {
     var snippet = '',
       indentation = '',
-      identity = '';
+      identity = '',
+      isFormDataFile = false;
 
     if (_.isFunction(options)) {
       callback = options;
@@ -112,7 +112,17 @@ self = module.exports = {
     indentation = identity.repeat(options.indentCount);
     // concatenation and making up the final string
 
-    snippet = 'wget --no-check-certificate --quiet \\\n';
+    if (request.body && request.body.mode === 'formdata') {
+      _.forEach(request.body.toJSON().formdata, (data) => {
+        if (!data.disabled && data.type === 'file') {
+          isFormDataFile = true;
+        }
+      });
+    }
+    if (isFormDataFile) {
+      snippet = '# wget doesn\'t support file upload via form data, use curl -F \\\n';
+    }
+    snippet += 'wget --no-check-certificate --quiet \\\n';
     snippet += `${indentation}--method ${request.method} \\\n`;
     // console.log(getHeaders(request, indentation));
     // Shell-wget accepts timeout in seconds (conversion from milli-seconds to seconds)
diff --git a/codegens/shell-wget/lib/util/parseBody.js b/codegens/shell-wget/lib/util/parseBody.js
index b9b0105..d970e1d 100644
--- a/codegens/shell-wget/lib/util/parseBody.js
+++ b/codegens/shell-wget/lib/util/parseBody.js
@@ -3,9 +3,9 @@ var _ = require('../lodash'),
 
 /**
  * Used to parse the body of the postman SDK-request and return in the desired format
- * 
+ *
  * @param  {Object} request - postman SDK-request object
- * @param  {Boolean} trimRequestBody - whether to trim request body fields 
+ * @param  {Boolean} trimRequestBody - whether to trim request body fields
  * @param  {String} indentation - used for indenting snippet's structure
  * @returns {String} - request body
  */
@@ -41,20 +41,15 @@ module.exports = function (request, trimRequestBody, indentation) {
               return `${sanitize(value.key, request.body.mode, trimRequestBody)}=` +
                             `${sanitize(value.value, request.body.mode, trimRequestBody)}`;
             }
-            /* istanbul ignore next */
-            else if (value.type === 'file') {
-              return `${indentation}--body-file = '@` +
-                            `${sanitize(value.src, request.body.mode, trimRequestBody)}')`;
-            }
           });
           requestBody = `${indentation}--body-data '${bodyMap.join('&')}' \\\n`;
         }
         return requestBody;
         /* istanbul ignore next */
       case 'file':
-        requestBody = `${indentation}--body-file = '@'`;
+        requestBody = `${indentation}--body-file='`;
         requestBody += `${sanitize(request.body[request.body.mode].src,
-          request.body.mode, trimRequestBody)}'),\n`;
+          request.body.mode, trimRequestBody)}' \\\n`;
         return requestBody;
       default:
         return requestBody;
diff --git a/codegens/swift/README.md b/codegens/swift/README.md
index 80ca157..23dbc0f 100644
--- a/codegens/swift/README.md
+++ b/codegens/swift/README.md
@@ -15,8 +15,8 @@ Convert function takes three parameters
 
 * `options` - options is an object which hsa following properties
     * `indentType` - String denoting type of indentation for code snippet. eg: 'Space', 'Tab'
-    * `indentCount` - The number of indentation characters to add per code level
-    * `trimRequestBody` - Whether or not request body fields should be trimmed
+    * `indentCount` - Number of indentation characters to add per code level
+    * `trimRequestBody` - Trim request body fields
     * `requestTimeout` - Integer denoting time after which the request will bail out in milli-seconds
 
 * `callback` - callback function with first parameter as error and second parameter as string for code snippet
diff --git a/codegens/swift/lib/swift.js b/codegens/swift/lib/swift.js
index 5a046ba..3a1e517 100644
--- a/codegens/swift/lib/swift.js
+++ b/codegens/swift/lib/swift.js
@@ -1,7 +1,6 @@
 var _ = require('./lodash'),
   sanitize = require('./util').sanitize,
   sanitizeOptions = require('./util').sanitizeOptions,
-  getUrlStringfromUrlObject = require('./util').getUrlStringfromUrlObject,
   self;
 
 /**
@@ -159,37 +158,36 @@ self = module.exports = {
   getOptions: function () {
     return [
       {
-        name: 'Set indentation count',
+        name: 'Indent count',
         id: 'indentCount',
         type: 'positiveInteger',
         default: 2,
-        description: 'Set the number of indentation characters to add per code level'
+        description: 'Number of indentation characters to add per code level'
       },
       {
-        name: 'Set indentation type',
+        name: 'Indent type',
         id: 'indentType',
         type: 'enum',
         availableOptions: ['Tab', 'Space'],
         default: 'Space',
-        description: 'Select the character used to indent lines of code'
+        description: 'Character used for indentation'
       },
       {
-        name: 'Set request timeout',
+        name: 'Request timeout',
         id: 'requestTimeout',
         type: 'positiveInteger',
         default: 0,
-        description: 'Set number of milliseconds the request should wait for a response' +
-    ' before timing out (use 0 for infinity)'
+        description: 'How long the request should wait for a response before timing out (milliseconds)'
       },
       {
-        name: 'Trim request body fields',
+        name: 'Body trim',
         id: 'trimRequestBody',
         type: 'boolean',
-        default: false,
-        description: 'Remove white space and additional lines that may affect the server\'s response'
+        default: true,
+        description: 'Trim request body fields'
       },
       {
-        name: 'Follow redirects',
+        name: 'Follow redirect',
         id: 'followRedirect',
         type: 'boolean',
         default: true,
@@ -235,7 +233,7 @@ self = module.exports = {
     timeout = options.requestTimeout;
     // followRedirect = options.followRedirect;
     trim = options.trimRequestBody;
-    finalUrl = getUrlStringfromUrlObject(request.url);
+    finalUrl = encodeURI(request.url.toString());
 
     bodySnippet = parseBody(requestBody, trim, indent);
 
diff --git a/codegens/swift/lib/util.js b/codegens/swift/lib/util.js
index ed85b68..2634bf7 100644
--- a/codegens/swift/lib/util.js
+++ b/codegens/swift/lib/util.js
@@ -101,49 +101,7 @@ function sanitizeOptions (options, optionsArray) {
   return result;
 }
 
-/**
- *
- * @param {*} urlObject The request sdk request.url object
- * @returns {String} The final string after parsing all the parameters of the url including 
- * protocol, auth, host, port, path, query, hash
- * This will be used because the url.toString() method returned the URL with non encoded query string
- * and hence a manual call is made to getQueryString() method with encode option set as true.
- */
-function getUrlStringfromUrlObject (urlObject) {
-  var url = '';
-  if (!urlObject) {
-    return url;
-  }
-  if (urlObject.protocol) {
-    url += (urlObject.protocol.endsWith('://') ? urlObject.protocol : urlObject.protocol + '://');
-  }
-  if (urlObject.auth && urlObject.auth.user) {
-    url = url + ((urlObject.auth.password) ?
-      // ==> username:password@
-      urlObject.auth.user + ':' + urlObject.auth.password : urlObject.auth.user) + '@';
-  }
-  if (urlObject.host) {
-    url += urlObject.getHost();
-  }
-  if (urlObject.port) {
-    url += ':' + urlObject.port.toString();
-  }
-  if (urlObject.path) {
-    url += urlObject.getPath();
-  }
-  if (urlObject.query && urlObject.query.count()) {
-    let queryString = urlObject.getQueryString({ ignoreDisabled: true, encode: true });
-    queryString && (url += '?' + queryString);
-  }
-  if (urlObject.hash) {
-    url += '#' + urlObject.hash;
-  }
-
-  return url;
-}
-
 module.exports = {
   sanitize: sanitize,
-  sanitizeOptions: sanitizeOptions,
-  getUrlStringfromUrlObject: getUrlStringfromUrlObject
+  sanitizeOptions: sanitizeOptions
 };


Test patch:
diff --git a/codegens/curl/test/unit/convert.test.js b/codegens/curl/test/unit/convert.test.js
index d42c5f1..fa48464 100644
--- a/codegens/curl/test/unit/convert.test.js
+++ b/codegens/curl/test/unit/convert.test.js
@@ -5,7 +5,6 @@ var expect = require('chai').expect,
   parallel = require('async').parallel,
 
   convert = require('../../index').convert,
-  getUrlStringfromUrlObject = require('../../lib/util').getUrlStringfromUrlObject,
   mainCollection = require('./fixtures/testcollection/collection.json');
 
 /**
@@ -253,177 +252,5 @@ describe('curl convert function', function () {
         }
       });
     });
-
-    it('should not encode queryParam unresolved variables and ' +
-    'leave it inside double parenthesis {{xyz}}', function () {
-      request = new sdk.Request({
-        'method': 'POST',
-        'header': [],
-        'url': {
-          'raw': 'http://postman-echo.com/post?a={{xyz}}',
-          'protocol': 'http',
-          'host': [
-            'postman-echo',
-            'com'
-          ],
-          'path': [
-            'post'
-          ],
-          'query': [
-            {
-              'key': 'a',
-              'value': '{{xyz}}'
-            }
-          ]
-        }
-      });
-      options = {};
-      convert(request, options, function (error, snippet) {
-        if (error) {
-          expect.fail(null, null, error);
-        }
-        expect(snippet).to.be.a('string');
-        expect(snippet).to.include('http://postman-echo.com/post?a={{xyz}}');
-        expect(snippet).to.not.include('http://postman-echo.com/post?a=%7B%7Bxyz%7D%7D');
-      });
-    });
-
-    it('should encode queryParams other than unresolved variables', function () {
-      request = new sdk.Request({
-        'method': 'POST',
-        'header': [],
-        'url': {
-          'raw': 'http://postman-echo.com/post?a=b c',
-          'protocol': 'http',
-          'host': [
-            'postman-echo',
-            'com'
-          ],
-          'path': [
-            'post'
-          ],
-          'query': [
-            {
-              'key': 'a',
-              'value': 'b c'
-            }
-          ]
-        }
-      });
-      options = {};
-      convert(request, options, function (error, snippet) {
-        if (error) {
-          expect.fail(null, null, error);
-        }
-        expect(snippet).to.be.a('string');
-        expect(snippet).to.include('http://postman-echo.com/post?a=b%20c');
-        expect(snippet).to.not.include('http://postman-echo.com/post?a=b c');
-      });
-    });
-
-    describe('getUrlStringfromUrlObject function', function () {
-      var rawUrl, urlObject, outputUrlString;
-
-      it('should return empty string for an url object for an empty url or if no url object is passed', function () {
-        rawUrl = '';
-        urlObject = new sdk.Url(rawUrl);
-        outputUrlString = getUrlStringfromUrlObject(urlObject);
-        expect(outputUrlString).to.be.empty;
-        outputUrlString = getUrlStringfromUrlObject();
-        expect(outputUrlString).to.be.empty;
-      });
-
-      it('should add protocol if present in the url object', function () {
-        rawUrl = 'https://postman-echo.com';
-        urlObject = new sdk.Url(rawUrl);
-        outputUrlString = getUrlStringfromUrlObject(urlObject);
-        expect(outputUrlString).to.equal(rawUrl);
-      });
-
-      it('should add the auth information if present in the url object', function () {
-        rawUrl = 'https://user:password@postman-echo.com';
-        urlObject = new sdk.Url(rawUrl);
-        outputUrlString = getUrlStringfromUrlObject(urlObject);
-        expect(outputUrlString).to.equal(rawUrl);
-      });
-
-      it('should not add the auth information if user isn\'t present but' +
-      ' password is present in the url object', function () {
-        rawUrl = 'https://:password@postman-echo.com';
-        urlObject = new sdk.Url(rawUrl);
-        outputUrlString = getUrlStringfromUrlObject(urlObject);
-        expect(outputUrlString).to.not.include(':password');
-      });
-
-      it('should add host if present in the url object', function () {
-        rawUrl = 'https://postman-echo.com';
-        urlObject = new sdk.Url(rawUrl);
-        outputUrlString = getUrlStringfromUrlObject(urlObject);
-        expect(outputUrlString).to.equal(rawUrl);
-      });
-
-      it('should add port if present in the url object', function () {
-        rawUrl = 'https://postman-echo.com:8080';
-        urlObject = new sdk.Url(rawUrl);
-        outputUrlString = getUrlStringfromUrlObject(urlObject);
-        expect(outputUrlString).to.equal(rawUrl);
-      });
-
-      it('should add path if present in the url object', function () {
-        rawUrl = 'https://postman-echo.com/get';
-        urlObject = new sdk.Url(rawUrl);
-        outputUrlString = getUrlStringfromUrlObject(urlObject);
-        expect(outputUrlString).to.equal(rawUrl);
-      });
-
-      describe('queryParams', function () {
-
-        it('should not encode unresolved query params', function () {
-          rawUrl = 'https://postman-echo.com/get?key={{value}}';
-          urlObject = new sdk.Url(rawUrl);
-          outputUrlString = getUrlStringfromUrlObject(urlObject);
-          expect(outputUrlString).to.not.include('key=%7B%7Bvalue%7B%7B');
-          expect(outputUrlString).to.equal(rawUrl);
-        });
-
-        it('should encode query params other than unresolved variables', function () {
-          rawUrl = 'https://postman-echo.com/get?key=\'a b c\'';
-          urlObject = new sdk.Url(rawUrl);
-          outputUrlString = getUrlStringfromUrlObject(urlObject);
-          expect(outputUrlString).to.not.include('key=\'a b c\'');
-          expect(outputUrlString).to.equal('https://postman-echo.com/get?key=%27a%20b%20c%27');
-        });
-
-        it('should not encode unresolved query params and ' +
-        'encode every other query param, both present together', function () {
-          rawUrl = 'https://postman-echo.com/get?key1={{value}}&key2=\'a b c\'';
-          urlObject = new sdk.Url(rawUrl);
-          outputUrlString = getUrlStringfromUrlObject(urlObject);
-          expect(outputUrlString).to.not.include('key1=%7B%7Bvalue%7B%7B');
-          expect(outputUrlString).to.not.include('key2=\'a b c\'');
-          expect(outputUrlString).to.equal('https://postman-echo.com/get?key1={{value}}&key2=%27a%20b%20c%27');
-        });
-
-        it('should discard disabled query params', function () {
-          urlObject = new sdk.Url({
-            protocol: 'https',
-            host: 'postman-echo.com',
-            query: [
-              { key: 'foo', value: 'bar' },
-              { key: 'alpha', value: 'beta', disabled: true }
-            ]
-          });
-          outputUrlString = getUrlStringfromUrlObject(urlObject);
-          expect(outputUrlString).to.equal('https://postman-echo.com?foo=bar');
-        });
-      });
-
-      it('should add hash if present in the url object', function () {
-        rawUrl = 'https://postmanm-echo.com/get#hash';
-        urlObject = new sdk.Url(rawUrl);
-        outputUrlString = getUrlStringfromUrlObject(urlObject);
-        expect(outputUrlString).to.equal(rawUrl);
-      });
-    });
   });
 });
diff --git a/codegens/java-unirest/test/unit/convert.test.js b/codegens/java-unirest/test/unit/convert.test.js
index a8b326f..faab695 100644
--- a/codegens/java-unirest/test/unit/convert.test.js
+++ b/codegens/java-unirest/test/unit/convert.test.js
@@ -7,7 +7,6 @@ var expect = require('chai').expect,
 
   convert = require('../../lib/index').convert,
   sanitize = require('../../lib/util').sanitize,
-  getUrlStringfromUrlObject = require('../../lib/parseRequest').getUrlStringfromUrlObject,
   getOptions = require('../../index').getOptions,
   mainCollection = require('./fixtures/testcollection/collection.json');
 
@@ -299,176 +298,8 @@ describe('java unirest convert function for test collection', function () {
         expect(snippet).to.include('.get');
       });
     });
-
-    it('should not encode queryParam unresolved variables and ' +
-    'leave it inside double parenthesis {{xyz}}', function () {
-      request = new sdk.Request({
-        'method': 'POST',
-        'header': [],
-        'url': {
-          'raw': 'http://postman-echo.com/post?a={{xyz}}',
-          'protocol': 'http',
-          'host': [
-            'postman-echo',
-            'com'
-          ],
-          'path': [
-            'post'
-          ],
-          'query': [
-            {
-              'key': 'a',
-              'value': '{{xyz}}'
-            }
-          ]
-        }
-      });
-      convert(request, {}, function (error, snippet) {
-        if (error) {
-          expect.fail(null, null, error);
-        }
-        expect(snippet).to.be.a('string');
-        expect(snippet).to.include('http://postman-echo.com/post?a={{xyz}}');
-        expect(snippet).to.not.include('http://postman-echo.com/post?a=%7B%7Bxyz%7D%7D');
-      });
-    });
-
-    it('should encode queryParams other than unresolved variables', function () {
-      request = new sdk.Request({
-        'method': 'POST',
-        'header': [],
-        'url': {
-          'raw': 'http://postman-echo.com/post?a=b c',
-          'protocol': 'http',
-          'host': [
-            'postman-echo',
-            'com'
-          ],
-          'path': [
-            'post'
-          ],
-          'query': [
-            {
-              'key': 'a',
-              'value': 'b c'
-            }
-          ]
-        }
-      });
-      convert(request, {}, function (error, snippet) {
-        if (error) {
-          expect.fail(null, null, error);
-        }
-        expect(snippet).to.be.a('string');
-        expect(snippet).to.include('http://postman-echo.com/post?a=b%20c');
-        expect(snippet).to.not.include('http://postman-echo.com/post?a=b c');
-      });
-    });
   });
-  describe('getUrlStringfromUrlObject function', function () {
-    var rawUrl, urlObject, outputUrlString;
-
-    it('should return empty string for an url object for an empty url or if no url object is passed', function () {
-      rawUrl = '';
-      urlObject = new sdk.Url(rawUrl);
-      outputUrlString = getUrlStringfromUrlObject(urlObject);
-      expect(outputUrlString).to.be.empty;
-      outputUrlString = getUrlStringfromUrlObject();
-      expect(outputUrlString).to.be.empty;
-    });
 
-    it('should add protocol if present in the url object', function () {
-      rawUrl = 'https://postman-echo.com';
-      urlObject = new sdk.Url(rawUrl);
-      outputUrlString = getUrlStringfromUrlObject(urlObject);
-      expect(outputUrlString).to.equal(rawUrl);
-    });
-
-    it('should add the auth information if present in the url object', function () {
-      rawUrl = 'https://user:password@postman-echo.com';
-      urlObject = new sdk.Url(rawUrl);
-      outputUrlString = getUrlStringfromUrlObject(urlObject);
-      expect(outputUrlString).to.equal(rawUrl);
-    });
-
-    it('should not add the auth information if user isn\'t present but' +
-    ' password is present in the url object', function () {
-      rawUrl = 'https://:password@postman-echo.com';
-      urlObject = new sdk.Url(rawUrl);
-      outputUrlString = getUrlStringfromUrlObject(urlObject);
-      expect(outputUrlString).to.not.include(':password');
-    });
-
-    it('should add host if present in the url object', function () {
-      rawUrl = 'https://postman-echo.com';
-      urlObject = new sdk.Url(rawUrl);
-      outputUrlString = getUrlStringfromUrlObject(urlObject);
-      expect(outputUrlString).to.equal(rawUrl);
-    });
-
-    it('should add port if present in the url object', function () {
-      rawUrl = 'https://postman-echo.com:8080';
-      urlObject = new sdk.Url(rawUrl);
-      outputUrlString = getUrlStringfromUrlObject(urlObject);
-      expect(outputUrlString).to.equal(rawUrl);
-    });
-
-    it('should add path if present in the url object', function () {
-      rawUrl = 'https://postman-echo.com/get';
-      urlObject = new sdk.Url(rawUrl);
-      outputUrlString = getUrlStringfromUrlObject(urlObject);
-      expect(outputUrlString).to.equal(rawUrl);
-    });
-
-    describe('queryParams', function () {
-
-      it('should not encode unresolved query params', function () {
-        rawUrl = 'https://postman-echo.com/get?key={{value}}';
-        urlObject = new sdk.Url(rawUrl);
-        outputUrlString = getUrlStringfromUrlObject(urlObject);
-        expect(outputUrlString).to.not.include('key=%7B%7Bvalue%7B%7B');
-        expect(outputUrlString).to.equal(rawUrl);
-      });
-
-      it('should encode query params other than unresolved variables', function () {
-        rawUrl = 'https://postman-echo.com/get?key=\'a b c\'';
-        urlObject = new sdk.Url(rawUrl);
-        outputUrlString = getUrlStringfromUrlObject(urlObject);
-        expect(outputUrlString).to.not.include('key=\'a b c\'');
-        expect(outputUrlString).to.equal('https://postman-echo.com/get?key=%27a%20b%20c%27');
-      });
-
-      it('should not encode unresolved query params and ' +
-      'encode every other query param, both present together', function () {
-        rawUrl = 'https://postman-echo.com/get?key1={{value}}&key2=\'a b c\'';
-        urlObject = new sdk.Url(rawUrl);
-        outputUrlString = getUrlStringfromUrlObject(urlObject);
-        expect(outputUrlString).to.not.include('key1=%7B%7Bvalue%7B%7B');
-        expect(outputUrlString).to.not.include('key2=\'a b c\'');
-        expect(outputUrlString).to.equal('https://postman-echo.com/get?key1={{value}}&key2=%27a%20b%20c%27');
-      });
-
-      it('should discard disabled query params', function () {
-        urlObject = new sdk.Url({
-          protocol: 'https',
-          host: 'postman-echo.com',
-          query: [
-            { key: 'foo', value: 'bar' },
-            { key: 'alpha', value: 'beta', disabled: true }
-          ]
-        });
-        outputUrlString = getUrlStringfromUrlObject(urlObject);
-        expect(outputUrlString).to.equal('https://postman-echo.com?foo=bar');
-      });
-    });
-
-    it('should add hash if present in the url object', function () {
-      rawUrl = 'https://postmanm-echo.com/get#hash';
-      urlObject = new sdk.Url(rawUrl);
-      outputUrlString = getUrlStringfromUrlObject(urlObject);
-      expect(outputUrlString).to.equal(rawUrl);
-    });
-  });
   describe('getOptions function', function () {
 
     it('should return an array of specific options', function () {
diff --git a/codegens/js-xhr/test/unit/convert.test.js b/codegens/js-xhr/test/unit/convert.test.js
index c254a5f..456f01a 100644
--- a/codegens/js-xhr/test/unit/convert.test.js
+++ b/codegens/js-xhr/test/unit/convert.test.js
@@ -242,47 +242,6 @@ describe('js-xhr convert function', function () {
       });
     });
   });
-
-  describe('Request with no body', function () {
-    var req = {
-        'method': 'GET',
-        'url': {
-          'raw': 'https://postman-echo.com/get',
-          'protocol': 'https',
-          'host': [
-            'postman-echo',
-            'com'
-          ],
-          'path': [
-            'get'
-          ]
-        },
-        'description': 'Request without a body'
-      },
-
-      request = new sdk.Request(req),
-      options = {
-        indentCount: 2,
-        indentType: 'Space'
-      };
-    convert(request, options, function (error, snippet) {
-      if (error) {
-        expect.fail(null, null, error);
-        return;
-      }
-
-      it('should not be empty', function () {
-        expect(snippet).not.to.equal('');
-      });
-      it('should not contain var data =', function () {
-        expect(snippet).to.deep.not.include('var data =');
-      });
-      it('should contain xhr.send();', function () {
-        expect(snippet).to.deep.include('xhr.send();');
-      });
-    });
-  });
-
   describe('getOptions function', function () {
     var options = getOptions();
     it('should return an array of specific options', function () {
@@ -297,8 +256,8 @@ describe('js-xhr convert function', function () {
     it('should have 0 as default request timeout ', function () {
       expect(options[2].default).to.equal(0);
     });
-    it('should have default body trim set as false', function () {
-      expect(options[3].default).to.equal(false);
+    it('should have default body trim set as true', function () {
+      expect(options[3].default).to.equal(true);
     });
   });
   describe('convert function', function () {
diff --git a/codegens/js-xhr/test/unit/fixtures/testcollection/collection.json b/codegens/js-xhr/test/unit/fixtures/testcollection/collection.json
index 8afd061..95ad1d1 100644
--- a/codegens/js-xhr/test/unit/fixtures/testcollection/collection.json
+++ b/codegens/js-xhr/test/unit/fixtures/testcollection/collection.json
@@ -47,6 +47,7 @@
 						"disabled": true
 					}
 				],
+				"body": {},
 				"url": {
 					"raw": "https://postman-echo.com/headers",
 					"protocol": "https",
diff --git a/codegens/libcurl/test/unit/convert.test.js b/codegens/libcurl/test/unit/convert.test.js
index 78fde21..06226db 100644
--- a/codegens/libcurl/test/unit/convert.test.js
+++ b/codegens/libcurl/test/unit/convert.test.js
@@ -38,6 +38,8 @@ function runSnippet (codeSnippet, collection, done) {
             if (stderr) {
               return callback(stderr);
             }
+            // this because response also display response code at the end of response body
+            stdout = stdout.substring(0, stdout.length - 3);
             try {
               stdout = JSON.parse(stdout);
             }
diff --git a/codegens/nodejs-request/test/unit/snippet.test.js b/codegens/nodejs-request/test/unit/snippet.test.js
index 2634ac1..309f329 100644
--- a/codegens/nodejs-request/test/unit/snippet.test.js
+++ b/codegens/nodejs-request/test/unit/snippet.test.js
@@ -263,44 +263,6 @@ describe('nodejs-request convert function', function () {
       });
     });
 
-    it('should return snippet with proper semicolon placed where required', function () {
-      // testing for the below snippet
-      /*
-       var request = require('request');
-       var fs = require('fs');
-       var options = {
-         'method': 'GET',
-         'url': 'https://postman-echo.com/headers',
-         'headers': {
-           'my-sample-header': 'Lorem ipsum dolor sit amet',
-           'not-disabled-header': 'ENABLED'
-         }
-       };
-       request(options, function (error, response) {
-         if (error) throw new Error(error);
-         console.log(response.body);
-       }); */
-      request = new sdk.Request(mainCollection.item[0].request);
-      options = {};
-      convert(request, options, function (error, snippet) {
-        if (error) {
-          expect.fail(null, null, error);
-        }
-        expect(snippet).to.be.a('string');
-        var snippetArray = snippet.split('\n');
-        snippetArray.forEach(function (line, index) {
-          if (line.charAt(line.length - 2) === ')') {
-            expect(line.charAt(line.length - 1)).to.equal(';');
-          }
-          expect(line.charAt(line.length - 1)).to.not.equal(')');
-          // check for the closing curly bracket of options object
-          if (line.startsWith('request')) {
-            var previousLine = snippetArray[index - 1];
-            expect(previousLine.charAt(previousLine.length - 1)).to.equal(';');
-          }
-        });
-      });
-    });
     it('should return snippet with no trailing comma when requestTimeout ' +
       'is set to non zero and followRedirect as true', function () {
       request = new sdk.Request(mainCollection.item[0].request);
@@ -354,26 +316,26 @@ describe('nodejs-request convert function', function () {
         expect(getOptions()[4]).to.have.property('id', 'trimRequestBody');
       });
     });
+  });
 
-    describe('Sanitize function', function () {
+  describe('Sanitize function', function () {
 
-      it('should return empty string when input is not a string type', function () {
-        expect(sanitize(123, false)).to.equal('');
-        expect(sanitize(null, false)).to.equal('');
-        expect(sanitize({}, false)).to.equal('');
-        expect(sanitize([], false)).to.equal('');
-      });
+    it('should return empty string when input is not a string type', function () {
+      expect(sanitize(123, false)).to.equal('');
+      expect(sanitize(null, false)).to.equal('');
+      expect(sanitize({}, false)).to.equal('');
+      expect(sanitize([], false)).to.equal('');
+    });
 
-      it('should trim input string when needed', function () {
-        expect(sanitize('inputString     ', true)).to.equal('inputString');
-      });
+    it('should trim input string when needed', function () {
+      expect(sanitize('inputString     ', true)).to.equal('inputString');
     });
+  });
 
-    describe('parseRequest function', function () {
+  describe('parseRequest function', function () {
 
-      it('should return empty string for empty body', function () {
-        expect(parseBody(null, ' ', false)).to.equal('');
-      });
+    it('should return empty string for empty body', function () {
+      expect(parseBody(null, ' ', false)).to.equal('');
     });
   });
 });
diff --git a/codegens/php-pecl-http/test/unit/converter.test.js b/codegens/php-pecl-http/test/unit/converter.test.js
index df74d6e..8ce0d68 100644
--- a/codegens/php-pecl-http/test/unit/converter.test.js
+++ b/codegens/php-pecl-http/test/unit/converter.test.js
@@ -33,7 +33,8 @@ describe('Request Snippet', function () {
                 '    \'testing\' => \'\\\'singlequotes\\\'\',\n    \'TEST\' => \'"doublequotes"\'\n));\n' +
                 '$client->enqueue($request)->send();\n' +
                 '$response = $client->getResponse();\n' +
-                'echo $response->getBody();\n';
+                'echo $response->getBody();\n' +
+                '?>';
         expect((snippet)).to.equal(outputSnippet);
         finish();
       });
@@ -63,7 +64,8 @@ describe('Request Snippet', function () {
                 '    \'TEST\' => \'@#$%^&*()\',\n    \'more\' => \',./\\\';[]}{":?><|\'\n));\n' +
                 '$client->enqueue($request)->send();\n' +
                 '$response = $client->getResponse();\n' +
-                'echo $response->getBody();\n';
+                'echo $response->getBody();\n' +
+                '?>';
         expect((snippet)).to.equal(outputSnippet);
         finish();
       });
@@ -91,7 +93,8 @@ describe('Request Snippet', function () {
                 '    \'not-disabled-header\' => \'ENABLED\'\n));\n' +
                 '$client->enqueue($request)->send();\n' +
                 '$response = $client->getResponse();\n' +
-                'echo $response->getBody();\n';
+                'echo $response->getBody();\n' +
+                '?>';
         expect((snippet)).to.equal(outputSnippet);
         finish();
       });
@@ -117,7 +120,8 @@ describe('Request Snippet', function () {
                 '$request->setRequestMethod(\'GET\');\n$request->setOptions(array());\n\n' +
                 '$client->enqueue($request)->send();\n' +
                 '$response = $client->getResponse();\n' +
-                'echo $response->getBody();\n';
+                'echo $response->getBody();\n' +
+                '?>';
         expect((snippet)).to.equal(outputSnippet);
         finish();
       });
@@ -149,7 +153,8 @@ describe('Request Snippet', function () {
                 '$request->setBody($body);\n$request->setOptions(array());\n\n' +
                 '$client->enqueue($request)->send();\n' +
                 '$response = $client->getResponse();\n' +
-                'echo $response->getBody();\n';
+                'echo $response->getBody();\n' +
+                '?>';
         expect((snippet)).to.equal(outputSnippet);
         finish();
       });
@@ -176,7 +181,8 @@ describe('Request Snippet', function () {
                 '$request->setRequestMethod(\'POST\');\n$request->setOptions(array());\n\n' +
                 '$client->enqueue($request)->send();\n' +
                 '$response = $client->getResponse();\n' +
-                'echo $response->getBody();\n';
+                'echo $response->getBody();\n' +
+                '?>';
         expect((snippet)).to.equal(outputSnippet);
         finish();
       });
@@ -208,7 +214,8 @@ describe('Request Snippet', function () {
                 '$request->setHeaders(array(\n    \'Content-Type\' => \'application/x-www-form-urlencoded\'\n));\n' +
                 '$client->enqueue($request)->send();\n' +
                 '$response = $client->getResponse();\n' +
-                'echo $response->getBody();\n';
+                'echo $response->getBody();\n' +
+                '?>';
         expect((snippet)).to.equal(outputSnippet);
         finish();
       });
@@ -239,7 +246,8 @@ describe('Request Snippet', function () {
                 '$request->setHeaders(array(\n    \'Content-Type\' => \'application/x-www-form-urlencoded\'\n));\n' +
                 '$client->enqueue($request)->send();\n' +
                 '$response = $client->getResponse();\n' +
-                'echo $response->getBody();\n';
+                'echo $response->getBody();\n' +
+                '?>';
         expect((snippet)).to.equal(outputSnippet);
         finish();
       });
@@ -268,7 +276,8 @@ describe('Request Snippet', function () {
                 '    \'Content-Type\' => \'application/json\'\n));\n' +
                 '$client->enqueue($request)->send();\n' +
                 '$response = $client->getResponse();\n' +
-                'echo $response->getBody();\n';
+                'echo $response->getBody();\n' +
+                '?>';
         expect((snippet)).to.equal(outputSnippet);
         finish();
       });
@@ -297,7 +306,8 @@ describe('Request Snippet', function () {
                 '    \'Content-Type\' => \'application/javascript\'\n));\n' +
                 '$client->enqueue($request)->send();\n' +
                 '$response = $client->getResponse();\n' +
-                'echo $response->getBody();\n';
+                'echo $response->getBody();\n' +
+                '?>';
         expect((snippet)).to.equal(outputSnippet);
         finish();
       });
@@ -326,7 +336,8 @@ describe('Request Snippet', function () {
                 '$request->setHeaders(array(\n    \'Content-Type\' => \'text/xml\'\n));\n' +
                 '$client->enqueue($request)->send();\n' +
                 '$response = $client->getResponse();\n' +
-                'echo $response->getBody();\n';
+                'echo $response->getBody();\n' +
+                '?>';
         expect((snippet)).to.equal(outputSnippet);
         finish();
       });
@@ -355,7 +366,8 @@ describe('Request Snippet', function () {
                 '    \'Content-Type\' => \'text/html\'\n));\n' +
                 '$client->enqueue($request)->send();\n' +
                 '$response = $client->getResponse();\n' +
-                'echo $response->getBody();\n';
+                'echo $response->getBody();\n' +
+                '?>';
         expect((snippet)).to.equal(outputSnippet);
         finish();
       });
@@ -388,7 +400,8 @@ describe('Request Snippet', function () {
                 '));\n' +
                 '$client->enqueue($request)->send();\n' +
                 '$response = $client->getResponse();\n' +
-                'echo $response->getBody();\n';
+                'echo $response->getBody();\n' +
+                '?>';
         expect((snippet)).to.equal(outputSnippet);
         finish();
       });
@@ -419,7 +432,8 @@ describe('Request Snippet', function () {
                 '$request->setOptions(array());\n\n' +
                 '$client->enqueue($request)->send();\n' +
                 '$response = $client->getResponse();\n' +
-                'echo $response->getBody();\n';
+                'echo $response->getBody();\n' +
+                '?>';
         expect((snippet)).to.equal(outputSnippet);
         finish();
       });
@@ -457,19 +471,6 @@ describe('Request Snippet', function () {
       .to.throw('Php-Pecl(HTTP)~convert: Callback is not a function');
   });
 
-  it('should not have script closing tag ?>', function () {
-    var collection = new sdk.Collection(JSON.parse(
-        fs.readFileSync('test/unit/fixtures/sample_collection.json').toString())),
-      request = collection.items.members[0].request;
-    convert(request, function (error, snippet) {
-      if (error) {
-        expect.fail(null, null, error);
-      }
-      expect(snippet).to.be.a('string');
-      expect(snippet.endsWith('?>')).to.be.false;
-    });
-  });
-
   describe('parseBody function', function () {
     it('should return empty string if request body is an empty string', function (done) {
       var request = {
@@ -574,8 +575,8 @@ describe('Request Snippet', function () {
     it('should have 0 as default request timeout ', function () {
       expect(options[2].default).to.equal(0);
     });
-    it('should have default body trim set as false', function () {
-      expect(options[3].default).to.equal(false);
+    it('should have default body trim set as true', function () {
+      expect(options[3].default).to.equal(true);
     });
   });
 
diff --git a/codegens/python-requests/test/unit/converter.test.js b/codegens/python-requests/test/unit/converter.test.js
index 687df3a..3192fcf 100644
--- a/codegens/python-requests/test/unit/converter.test.js
+++ b/codegens/python-requests/test/unit/converter.test.js
@@ -153,31 +153,4 @@ describe('Python- Requests converter', function () {
       .to.throw('Python-Requests~convert: Callback is not a function');
   });
 
-  it('should not have allow_redirects=False twice in generated snippet when' +
-  ' followRedirect option is set as false', function () {
-    var request = new sdk.Request(mainCollection.item[0].request),
-      options = { followRedirect: false, requestTimeout: 0 };
-    convert(request, options, function (err, snippet) {
-      if (err) {
-        expect.fail(null, null, err);
-      }
-      expect(snippet).to.be.a('string');
-      expect(snippet).to.not.include('allow_redirects = False, allow_redirects = false');
-    });
-  });
-
-  it('should have correct boolean value for allow_redirects(False, uppercased F) in generated snippet when' +
-  ' followRedirect option is set as false', function () {
-    var request = new sdk.Request(mainCollection.item[0].request),
-      options = { followRedirect: false };
-    convert(request, options, function (err, snippet) {
-      if (err) {
-        expect.fail(null, null, err);
-      }
-      expect(snippet).to.be.a('string');
-      expect(snippet).to.include('allow_redirects = False');
-      expect(snippet).to.not.include('allow_redirects = false');
-    });
-  });
-
 });
diff --git a/codegens/swift/test/unit/convert.test.js b/codegens/swift/test/unit/convert.test.js
index 48fad0f..e675deb 100644
--- a/codegens/swift/test/unit/convert.test.js
+++ b/codegens/swift/test/unit/convert.test.js
@@ -6,7 +6,6 @@ var expect = require('chai').expect,
   fs = require('fs'),
   convert = require('../../index').convert,
   sanitize = require('../../lib/util').sanitize,
-  getUrlStringfromUrlObject = require('../../lib/util').getUrlStringfromUrlObject,
   getOptions = require('../../index').getOptions,
   mainCollection = require('./fixtures/testcollection/collection.json');
 
@@ -190,176 +189,6 @@ describe('Swift Converter', function () {
 
       });
     });
-
-    it('should not encode queryParam unresolved variables and ' +
-    'leave it inside double parenthesis {{xyz}}', function () {
-      request = new sdk.Request({
-        'method': 'POST',
-        'header': [],
-        'url': {
-          'raw': 'http://postman-echo.com/post?a={{xyz}}',
-          'protocol': 'http',
-          'host': [
-            'postman-echo',
-            'com'
-          ],
-          'path': [
-            'post'
-          ],
-          'query': [
-            {
-              'key': 'a',
-              'value': '{{xyz}}'
-            }
-          ]
-        }
-      });
-      convert(request, {}, function (error, snippet) {
-        if (error) {
-          expect.fail(null, null, error);
-        }
-        expect(snippet).to.be.a('string');
-        expect(snippet).to.include('http://postman-echo.com/post?a={{xyz}}');
-        expect(snippet).to.not.include('http://postman-echo.com/post?a=%7B%7Bxyz%7D%7D');
-      });
-    });
-
-    it('should encode queryParams other than unresolved variables', function () {
-      request = new sdk.Request({
-        'method': 'POST',
-        'header': [],
-        'url': {
-          'raw': 'http://postman-echo.com/post?a=b c',
-          'protocol': 'http',
-          'host': [
-            'postman-echo',
-            'com'
-          ],
-          'path': [
-            'post'
-          ],
-          'query': [
-            {
-              'key': 'a',
-              'value': 'b c'
-            }
-          ]
-        }
-      });
-      convert(request, {}, function (error, snippet) {
-        if (error) {
-          expect.fail(null, null, error);
-        }
-        expect(snippet).to.be.a('string');
-        expect(snippet).to.include('http://postman-echo.com/post?a=b%20c');
-        expect(snippet).to.not.include('http://postman-echo.com/post?a=b c');
-      });
-    });
-  });
-
-  describe('getUrlStringfromUrlObject function', function () {
-    var rawUrl, urlObject, outputUrlString;
-
-    it('should return empty string for an url object for an empty url or if no url object is passed', function () {
-      rawUrl = '';
-      urlObject = new sdk.Url(rawUrl);
-      outputUrlString = getUrlStringfromUrlObject(urlObject);
-      expect(outputUrlString).to.be.empty;
-      outputUrlString = getUrlStringfromUrlObject();
-      expect(outputUrlString).to.be.empty;
-    });
-
-    it('should add protocol if present in the url object', function () {
-      rawUrl = 'https://postman-echo.com';
-      urlObject = new sdk.Url(rawUrl);
-      outputUrlString = getUrlStringfromUrlObject(urlObject);
-      expect(outputUrlString).to.equal(rawUrl);
-    });
-
-    it('should add the auth information if present in the url object', function () {
-      rawUrl = 'https://user:password@postman-echo.com';
-      urlObject = new sdk.Url(rawUrl);
-      outputUrlString = getUrlStringfromUrlObject(urlObject);
-      expect(outputUrlString).to.equal(rawUrl);
-    });
-
-    it('should not add the auth information if user isn\'t present but' +
-    ' password is present in the url object', function () {
-      rawUrl = 'https://:password@postman-echo.com';
-      urlObject = new sdk.Url(rawUrl);
-      outputUrlString = getUrlStringfromUrlObject(urlObject);
-      expect(outputUrlString).to.not.include(':password');
-    });
-
-    it('should add host if present in the url object', function () {
-      rawUrl = 'https://postman-echo.com';
-      urlObject = new sdk.Url(rawUrl);
-      outputUrlString = getUrlStringfromUrlObject(urlObject);
-      expect(outputUrlString).to.equal(rawUrl);
-    });
-
-    it('should add port if present in the url object', function () {
-      rawUrl = 'https://postman-echo.com:8080';
-      urlObject = new sdk.Url(rawUrl);
-      outputUrlString = getUrlStringfromUrlObject(urlObject);
-      expect(outputUrlString).to.equal(rawUrl);
-    });
-
-    it('should add path if present in the url object', function () {
-      rawUrl = 'https://postman-echo.com/get';
-      urlObject = new sdk.Url(rawUrl);
-      outputUrlString = getUrlStringfromUrlObject(urlObject);
-      expect(outputUrlString).to.equal(rawUrl);
-    });
-
-    describe('queryParams', function () {
-
-      it('should not encode unresolved query params', function () {
-        rawUrl = 'https://postman-echo.com/get?key={{value}}';
-        urlObject = new sdk.Url(rawUrl);
-        outputUrlString = getUrlStringfromUrlObject(urlObject);
-        expect(outputUrlString).to.not.include('key=%7B%7Bvalue%7B%7B');
-        expect(outputUrlString).to.equal(rawUrl);
-      });
-
-      it('should encode query params other than unresolved variables', function () {
-        rawUrl = 'https://postman-echo.com/get?key=\'a b c\'';
-        urlObject = new sdk.Url(rawUrl);
-        outputUrlString = getUrlStringfromUrlObject(urlObject);
-        expect(outputUrlString).to.not.include('key=\'a b c\'');
-        expect(outputUrlString).to.equal('https://postman-echo.com/get?key=%27a%20b%20c%27');
-      });
-
-      it('should not encode unresolved query params and ' +
-      'encode every other query param, both present together', function () {
-        rawUrl = 'https://postman-echo.com/get?key1={{value}}&key2=\'a b c\'';
-        urlObject = new sdk.Url(rawUrl);
-        outputUrlString = getUrlStringfromUrlObject(urlObject);
-        expect(outputUrlString).to.not.include('key1=%7B%7Bvalue%7B%7B');
-        expect(outputUrlString).to.not.include('key2=\'a b c\'');
-        expect(outputUrlString).to.equal('https://postman-echo.com/get?key1={{value}}&key2=%27a%20b%20c%27');
-      });
-
-      it('should discard disabled query params', function () {
-        urlObject = new sdk.Url({
-          protocol: 'https',
-          host: 'postman-echo.com',
-          query: [
-            { key: 'foo', value: 'bar' },
-            { key: 'alpha', value: 'beta', disabled: true }
-          ]
-        });
-        outputUrlString = getUrlStringfromUrlObject(urlObject);
-        expect(outputUrlString).to.equal('https://postman-echo.com?foo=bar');
-      });
-    });
-
-    it('should add hash if present in the url object', function () {
-      rawUrl = 'https://postmanm-echo.com/get#hash';
-      urlObject = new sdk.Url(rawUrl);
-      outputUrlString = getUrlStringfromUrlObject(urlObject);
-      expect(outputUrlString).to.equal(rawUrl);
-    });
   });
 
   describe('getOptions function', function () {
diff --git a/test/codegen/structure.test.js b/test/codegen/structure.test.js
index 91bd1ae..fea8a24 100644
--- a/test/codegen/structure.test.js
+++ b/test/codegen/structure.test.js
@@ -8,13 +8,13 @@ var _ = require('lodash'),
 // Keep adding new options
 const expectedOptions = {
     multiLine: {
-      name: 'Generate multiline snippet',
+      name: 'Multiline snippet',
       type: 'boolean',
       default: true,
       description: 'Split cURL command across multiple lines'
     },
     longFormat: {
-      name: 'Use long form options',
+      name: 'Long form options',
       type: 'boolean',
       default: true,
       description: 'Use the long form for cURL options (--header instead of -H)'
@@ -26,40 +26,40 @@ const expectedOptions = {
       description: 'Include class definition and import statements in snippet'
     },
     indentCount: {
-      name: 'Set indentation count',
+      name: 'Indent count',
       type: 'positiveInteger',
       default: 0,
-      description: 'Set the number of indentation characters to add per code level'
+      description: 'Number of indentation characters to add per code level'
     },
     indentType: {
-      name: 'Set indentation type',
+      name: 'Indent type',
       type: 'enum',
       default: 'Tab',
-      description: 'Select the character used to indent lines of code'
+      description: 'Character used for indentation'
     },
     requestTimeout: {
-      name: 'Set request timeout',
+      name: 'Request timeout',
       type: 'positiveInteger',
       default: 0,
-      description: 'Set number of milliseconds the request should wait for a response before timing out (use 0 for infinity)'
+      description: 'How long the request should wait for a response before timing out (milliseconds)'
     },
     followRedirect: {
-      name: 'Follow redirects',
+      name: 'Follow redirect',
       type: 'boolean',
       default: true,
       description: 'Automatically follow HTTP redirects'
     },
     trimRequestBody: {
-      name: 'Trim request body fields',
+      name: 'Body trim',
       type: 'boolean',
       default: true,
-      description: 'Remove white space and additional lines that may affect the server\'s response'
+      description: 'Trim request body fields'
     },
     silent: {
-      name: 'Use Silent Mode',
+      name: 'Silent',
       type: 'boolean',
       default: false,
-      description: 'Display the requested data without showing the cURL progress meter or error messages'
+      description: 'Use cURL\'s silent mode in the generated snippet'
     }
   },
   // Standard array of ids that should be used for options ids. Any new option should be updated here.