diff --git a/Tasks/AzureResourceGroupDeployment/make.json b/Tasks/AzureResourceGroupDeployment/make.json
index b4ab2c7c844d..4d522c4d5b2d 100644
--- a/Tasks/AzureResourceGroupDeployment/make.json
+++ b/Tasks/AzureResourceGroupDeployment/make.json
@@ -15,5 +15,13 @@
             ],
             "options": "-Rf"
         }
+    ],
+    "rm": [
+        {
+            "items": [
+                "node_modules/azure-arm-rest/node_modules/vsts-task-lib"
+            ],
+            "options": "-Rf"
+        }
     ]
 }
\ No newline at end of file
diff --git a/Tasks/AzureVmssDeployment/Strings/resources.resjson/en-US/resources.resjson b/Tasks/AzureVmssDeployment/Strings/resources.resjson/en-US/resources.resjson
index 15c7d2e6bdf0..9e976b744a90 100644
--- a/Tasks/AzureVmssDeployment/Strings/resources.resjson/en-US/resources.resjson
+++ b/Tasks/AzureVmssDeployment/Strings/resources.resjson/en-US/resources.resjson
@@ -1,19 +1,19 @@
 {
-  "loc.friendlyName": "Azure VM Scale set Deployment (PREVIEW)",
-  "loc.helpMarkDown": "[More Information](https://aka.ms/azurevmsstaskreadme)",
-  "loc.description": "Deploy virtual machine scale set image",
+  "loc.friendlyName": "Azure VM scale set Deployment (PREVIEW)",
+  "loc.helpMarkDown": "[More Information](https://go.microsoft.com/fwlink/?linkid=852117)",
+  "loc.description": "Deploy Virtual Machine scale set image",
   "loc.instanceNameFormat": "Azure VMSS $(vmssName): $(action)",
-  "loc.releaseNotes": "- Updates azure virtual machine scale set with a custom image.\n- Works with Xplat agents (Windows, Linux or OSX).",
+  "loc.releaseNotes": "- Updates Azure Virtual Machine scale set with a custom machine image.",
   "loc.group.displayName.AzureDetails": "Azure Details",
   "loc.group.displayName.Image": "Image Details",
   "loc.input.label.ConnectedServiceName": "Azure subscription",
   "loc.input.help.ConnectedServiceName": "Select the Azure Resource Manager subscription for the scale set.",
   "loc.input.label.action": "Action",
   "loc.input.help.action": "Action to be performed on the scale set.",
-  "loc.input.label.vmssName": "VMSS",
+  "loc.input.label.vmssName": "Virtual Machine scale set name",
   "loc.input.help.vmssName": "Provide the name of scale set. Note that image can be updated only for a scale set which is running a custom image. If a scale set is using platform/gallery image, then image update operation will fail.",
   "loc.input.label.imageUrl": "Image url",
-  "loc.input.help.imageUrl": "Specify the URL of image VHD. If it is a azure storage blob url, the storage account location should be same as scale set location.",
+  "loc.input.help.imageUrl": "Specify the URL of image VHD. If it is an Azure storage blob url, the storage account location should be same as scale set location.",
   "loc.messages.InvalidAction": "This action is not defined. Check with the task author.",
   "loc.messages.TaskNotFound": "Task.json file could not be found: %s",
   "loc.messages.TaskConstructorFailed": "Task failed while initializing. Error: %s",
diff --git a/Tasks/AzureVmssDeployment/Tests/L0.ts b/Tasks/AzureVmssDeployment/Tests/L0.ts
new file mode 100644
index 000000000000..3908b6aa0877
--- /dev/null
+++ b/Tasks/AzureVmssDeployment/Tests/L0.ts
@@ -0,0 +1,86 @@
+'use strict';
+
+const assert = require('assert');
+const ttm = require('vsts-task-lib/mock-test');
+const path = require('path');
+
+function setResponseFile(name) {
+    process.env['MOCK_RESPONSES'] = path.join(__dirname, name);
+}
+
+function runValidations(validator: () => void, tr, done) {
+    try {
+        validator();
+        done();
+    }
+    catch (error) {
+        console.log("STDERR", tr.stderr);
+        console.log("STDOUT", tr.stdout);
+        done(error);
+    }
+}
+
+describe('Azure VMSS Deployment', function () {
+    this.timeout(30000);
+    before((done) => {
+        done();
+    });
+    after(function () {
+    });
+    it("should succeed if vmss image updated successfully", (done) => {
+        let tp = path.join(__dirname, "updateImage.js");
+        let tr = new ttm.MockTestRunner(tp);
+        tr.run();
+        runValidations(() => {
+            assert(tr.succeeded, "Should have succeeded");
+            assert(tr.stdout.indexOf("virtualMachineScaleSets.list is called") > -1, "virtualMachineScaleSets.list function should have been called from azure-sdk");
+            assert(tr.stdout.indexOf("virtualMachinesScaleSets.updateImage is called with RG: testrg1, VMSS: testvmss1 and imageurl : https://someurl") > -1, "virtualMachinesScaleSets.updateImage function should have been called from azure-sdk");
+            assert(tr.stdout.indexOf("loc_mock_UpdatedVMSSImage") > -1, "VMSS image should be updated");
+        }, tr, done);
+    });
+
+    it("should fail if failed to update VMSS image", (done) => {
+        process.env["imageUpdateFailed"] = "true";
+        let tp = path.join(__dirname, "updateImage.js");
+        let tr = new ttm.MockTestRunner(tp);
+        tr.run();
+        process.env["imageUpdateFailed"] = undefined;
+
+        runValidations(() => {
+            assert(tr.failed, "Should have failed");
+            assert(tr.stdout.indexOf("virtualMachineScaleSets.list is called") > -1, "virtualMachineScaleSets.list function should have been called from azure-sdk");
+            assert(tr.stdout.indexOf("virtualMachinesScaleSets.updateImage is called") > -1, "virtualMachinesScaleSets.updateImage function should have been called from azure-sdk");
+            assert(tr.stdout.indexOf("loc_mock_VMSSImageUpdateFailed") > -1, "VMSS image update should fail");
+        }, tr, done);
+    });
+
+    it("should fail if failed to list VMSSs", (done) => {
+        process.env["vmssListFailed"] = "true";
+        let tp = path.join(__dirname, "updateImage.js");
+        let tr = new ttm.MockTestRunner(tp);
+        tr.run();
+        process.env["vmssListFailed"] = undefined;
+
+        runValidations(() => {
+            assert(tr.failed, "Should have failed");
+            assert(tr.stdout.indexOf("virtualMachineScaleSets.list is called") > -1, "virtualMachineScaleSets.list function should have been called from azure-sdk");
+            assert(tr.stdout.indexOf("virtualMachinesScaleSets.updateImage is called") == -1, "virtualMachinesScaleSets.updateImage function should not be called from azure-sdk");
+            assert(tr.stdout.indexOf("loc_mock_VMSSListFetchFailed") > -1, "VMSS list should be failed");
+        }, tr, done);
+    });
+
+    it("should fail if failed to get matching VMSS", (done) => {
+        process.env["noMatchingVmss"] = "true";
+        let tp = path.join(__dirname, "updateImage.js");
+        let tr = new ttm.MockTestRunner(tp);
+        tr.run();
+        process.env["noMatchingVmss"] = undefined;
+
+        runValidations(() => {
+            assert(tr.failed, "Should have failed");
+            assert(tr.stdout.indexOf("virtualMachineScaleSets.list is called") > -1, "virtualMachineScaleSets.list function should have been called from azure-sdk");
+            assert(tr.stdout.indexOf("virtualMachinesScaleSets.updateImage is called") == -1, "virtualMachinesScaleSets.updateImage function should not be called from azure-sdk");
+            assert(tr.stdout.indexOf("loc_mock_FailedToGetRGForVMSS") > -1, "VMSS list should be failed");
+        }, tr, done);
+    });
+});
diff --git a/Tasks/AzureVmssDeployment/Tests/mock_node_modules/azure-arm-compute/LICENSE.txt b/Tasks/AzureVmssDeployment/Tests/mock_node_modules/azure-arm-compute/LICENSE.txt
new file mode 100644
index 000000000000..2bb9ad240fa0
--- /dev/null
+++ b/Tasks/AzureVmssDeployment/Tests/mock_node_modules/azure-arm-compute/LICENSE.txt
@@ -0,0 +1,176 @@
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
\ No newline at end of file
diff --git a/Tasks/AzureVmssDeployment/Tests/mock_node_modules/azure-arm-compute/README.md b/Tasks/AzureVmssDeployment/Tests/mock_node_modules/azure-arm-compute/README.md
new file mode 100644
index 000000000000..e14e72b718fe
--- /dev/null
+++ b/Tasks/AzureVmssDeployment/Tests/mock_node_modules/azure-arm-compute/README.md
@@ -0,0 +1,37 @@
+# Microsoft Azure SDK for Node.js - Compute Management
+
+This project provides a Node.js package that makes it easy to manage Microsoft Azure Compute Resources. Right now it supports:
+- **Node.js version: 4.x.x or higher**
+
+## How to Install
+
+```bash
+npm install azure-arm-compute
+```
+
+## How to use
+
+### Authentication, client creation and listing vm images as an example
+
+ ```javascript
+ var msrestAzure = require('ms-rest-azure');
+ var computeManagementClient = require('azure-arm-compute');
+
+ // Interactive Login
+ // It provides a url and code that needs to be copied and pasted in a browser and authenticated over there. If successful, 
+ // the user will get a DeviceTokenCredentials object.
+ msRestAzure.interactiveLogin(function(err, credentials) {
+  var client = new computeManagementClient(credentials, 'your-subscription-id');
+  client.virtualMachineImages.list('westus', 'MicrosoftWindowsServer', 'WindowsServer', '2012-R2-Datacenter', function(err, result, request, response) {
+    if (err) console.log(err);
+    console.log(result);
+  });
+ });
+ ```
+
+## Detailed Sample
+A detailed sample for creating. getting, listing, powering off, restarting, deleting a vm can be found  [here](https://github.com/Azure/azure-sdk-for-node/blob/master/examples/ARM/compute/vm-sample.js).
+
+## Related projects
+
+- [Microsoft Azure SDK for Node.js](https://github.com/Azure/azure-sdk-for-node)
diff --git a/Tasks/AzureVmssDeployment/Tests/mock_node_modules/azure-arm-compute/package.json b/Tasks/AzureVmssDeployment/Tests/mock_node_modules/azure-arm-compute/package.json
new file mode 100644
index 000000000000..dd0852f0386b
--- /dev/null
+++ b/Tasks/AzureVmssDeployment/Tests/mock_node_modules/azure-arm-compute/package.json
@@ -0,0 +1,133 @@
+{
+  "_args": [
+    [
+      {
+        "raw": "azure-arm-compute@0.19.0",
+        "scope": null,
+        "escapedName": "azure-arm-compute",
+        "name": "azure-arm-compute",
+        "rawSpec": "0.19.0",
+        "spec": "0.19.0",
+        "type": "version"
+      },
+      "D:\\git\\vsts-tasks\\Tasks\\DeployAzureResourceGroup"
+    ]
+  ],
+  "_from": "azure-arm-compute@0.19.0",
+  "_id": "azure-arm-compute@0.19.0",
+  "_inCache": true,
+  "_installable": true,
+  "_location": "/azure-arm-compute",
+  "_nodeVersion": "4.2.2",
+  "_npmOperationalInternal": {
+    "host": "packages-12-west.internal.npmjs.com",
+    "tmp": "tmp/azure-arm-compute-0.19.0.tgz_1467222345706_0.10605484200641513"
+  },
+  "_npmUser": {
+    "name": "windowsazure",
+    "email": "azuresdk@outlook.com"
+  },
+  "_npmVersion": "3.5.0",
+  "_phantomChildren": {},
+  "_requested": {
+    "raw": "azure-arm-compute@0.19.0",
+    "scope": null,
+    "escapedName": "azure-arm-compute",
+    "name": "azure-arm-compute",
+    "rawSpec": "0.19.0",
+    "spec": "0.19.0",
+    "type": "version"
+  },
+  "_requiredBy": [
+    "#DEV:/"
+  ],
+  "_resolved": "https://registry.npmjs.org/azure-arm-compute/-/azure-arm-compute-0.19.0.tgz",
+  "_shasum": "7dce93299d8f25f9fa689323b11565f9c774c83e",
+  "_shrinkwrap": null,
+  "_spec": "azure-arm-compute@0.19.0",
+  "_where": "D:\\git\\vsts-tasks\\Tasks\\DeployAzureResourceGroup",
+  "author": {
+    "name": "Microsoft Corporation"
+  },
+  "bugs": {
+    "url": "http://github.com/Azure/azure-sdk-for-node/issues"
+  },
+  "contributors": [
+    {
+      "name": "Huang, Pengfei",
+      "email": "phuang@microsoft.com"
+    },
+    {
+      "name": "Onalan, Alp",
+      "email": "alpon@microsoft.com"
+    },
+    {
+      "name": "Lee, Hyonho",
+      "email": "Hyonho.Lee@microsoft.com"
+    },
+    {
+      "name": "Cigdem Celik Aydin",
+      "email": "ccelik@microsoft.com"
+    },
+    {
+      "name": "Rohit Bhat",
+      "email": "robhat@microsoft.com"
+    },
+    {
+      "name": "Ahmed El Baz",
+      "email": "ahelbaz@microsoft.com"
+    },
+    {
+      "name": "Wang, Yugang",
+      "email": "yugangw@microsoft.com"
+    },
+    {
+      "name": "Zavery, Amar",
+      "email": "amzavery@microsoft.com"
+    }
+  ],
+  "dependencies": {
+    "ms-rest": "^1.14.0",
+    "ms-rest-azure": "^1.14.0"
+  },
+  "description": "Microsoft Azure Compute Resource Provider Management Client Library for node",
+  "devDependencies": {},
+  "directories": {},
+  "dist": {
+    "shasum": "7dce93299d8f25f9fa689323b11565f9c774c83e",
+    "tarball": "https://registry.npmjs.org/azure-arm-compute/-/azure-arm-compute-0.19.0.tgz"
+  },
+  "homepage": "http://github.com/Azure/azure-sdk-for-node",
+  "keywords": [
+    "node",
+    "azure"
+  ],
+  "licenses": [
+    {
+      "type": "Apache 2.0",
+      "url": "http://www.apache.org/licenses/LICENSE-2.0"
+    }
+  ],
+  "main": "./lib/computeManagementClient.js",
+  "maintainers": [
+    {
+      "name": "windowsazure",
+      "email": "azuresdk@outlook.com"
+    }
+  ],
+  "name": "azure-arm-compute",
+  "optionalDependencies": {},
+  "readme": "ERROR: No README data found!",
+  "repository": {
+    "type": "git",
+    "url": "git+ssh://git@github.com/Azure/azure-sdk-for-node.git"
+  },
+  "scripts": {
+    "test": "npm -s run-script jshint"
+  },
+  "tags": [
+    "azure",
+    "sdk"
+  ],
+  "version": "0.19.0"
+}
\ No newline at end of file
diff --git a/Tasks/AzureVmssDeployment/Tests/updateImage.ts b/Tasks/AzureVmssDeployment/Tests/updateImage.ts
new file mode 100644
index 000000000000..8657664f1ef8
--- /dev/null
+++ b/Tasks/AzureVmssDeployment/Tests/updateImage.ts
@@ -0,0 +1,25 @@
+import ma = require('vsts-task-lib/mock-answer');
+import tmrm = require('vsts-task-lib/mock-run');
+import path = require('path');
+
+let taskPath = path.join(__dirname, '..', 'main.js');
+let tr: tmrm.TaskMockRunner = new tmrm.TaskMockRunner(taskPath);
+
+tr.setInput("action", "UpdateImage");
+tr.setInput("ConnectedServiceName", "AzureRM");
+tr.setInput("vmssName", process.env["noMatchingVmss"] === "true" ? "random-vmss" : "testvmss1");
+tr.setInput("imageUrl", "https://someurl");
+
+process.env["AZURE_HTTP_USER_AGENT"] = "L0test";
+process.env["ENDPOINT_AUTH_AzureRM"] = "{\"parameters\":{\"serviceprincipalid\":\"id\",\"serviceprincipalkey\":\"key\",\"tenantid\":\"tenant\"},\"scheme\":\"ServicePrincipal\"}";
+process.env["ENDPOINT_AUTH_PARAMETER_AzureRM_SERVICEPRINCIPALID"] = "id";
+process.env["ENDPOINT_AUTH_PARAMETER_AzureRM_SERVICEPRINCIPALKEY"] = "key";
+process.env["ENDPOINT_AUTH_PARAMETER_AzureRM_TENANTID"] = "tenant";
+process.env["ENDPOINT_DATA_AzureRM_SUBSCRIPTIONID"] = "sId";
+process.env["ENDPOINT_DATA_AzureRM_SUBSCRIPTIONNAME"] = "sName";
+process.env["ENDPOINT_URL_AzureRM"] = "https://management.azure.com/";
+process.env["ENDPOINT_DATA_AzureRM_ENVIRONMENTAUTHORITYURL"] = "https://login.windows.net/";
+
+tr.registerMock('vsts-task-lib/toolrunner', require('vsts-task-lib/mock-toolrunner'));
+tr.registerMock('azure-arm-rest/azure-arm-compute', require('./mock_node_modules/azure-arm-compute'));
+tr.run();
\ No newline at end of file
diff --git a/Tasks/AzureVmssDeployment/package.json b/Tasks/AzureVmssDeployment/package.json
index ca4a21ea60b2..cef3d5e11c0b 100644
--- a/Tasks/AzureVmssDeployment/package.json
+++ b/Tasks/AzureVmssDeployment/package.json
@@ -2,7 +2,6 @@
   "name": "AzureVmssDeployment",
   "main":"main.js",
   "dependencies": {
-    "vsts-task-lib" : "^0.9.20",
-    "vso-node-api": "6.0.1-preview"
+    "vsts-task-lib" : "^0.9.20"
   }
 }
diff --git a/Tasks/AzureVmssDeployment/task.json b/Tasks/AzureVmssDeployment/task.json
index ce1efe7fffc2..7bdec2bcc983 100644
--- a/Tasks/AzureVmssDeployment/task.json
+++ b/Tasks/AzureVmssDeployment/task.json
@@ -1,11 +1,11 @@
 {
     "id": "4dda660c-b643-4598-a4a2-61080d0002d9",
     "name": "AzureVmssDeployment",
-    "friendlyName": "Azure VM Scale set Deployment (PREVIEW)",
-    "description": "Deploy virtual machine scale set image",
-    "helpMarkDown": "[More Information](https://aka.ms/azurevmsstaskreadme)",
+    "friendlyName": "Azure VM scale set Deployment (PREVIEW)",
+    "description": "Deploy Virtual Machine scale set image",
+    "helpMarkDown": "[More Information](https://go.microsoft.com/fwlink/?linkid=852117)",
     "category": "Deploy",
-    "releaseNotes": "- Updates azure virtual machine scale set with a custom image.\n- Works with Xplat agents (Windows, Linux or OSX).",
+    "releaseNotes": "- Updates Azure Virtual Machine scale set with a custom machine image.",
     "visibility": [
         "Build",
         "Release"
@@ -56,7 +56,7 @@
         {
             "name": "vmssName",
             "type": "pickList",
-            "label": "VMSS",
+            "label": "Virtual Machine scale set name",
             "required": true,
             "groupName": "AzureDetails",
             "helpMarkDown": "Provide the name of scale set. Note that image can be updated only for a scale set which is running a custom image. If a scale set is using platform/gallery image, then image update operation will fail.",
@@ -71,14 +71,14 @@
             "defaultValue": "",
             "required": true,
             "groupName": "Image",
-            "helpMarkDown": "Specify the URL of image VHD. If it is a azure storage blob url, the storage account location should be same as scale set location."
+            "helpMarkDown": "Specify the URL of image VHD. If it is an Azure storage blob url, the storage account location should be same as scale set location."
         }
     ],
     "dataSourceBindings": [
         {
             "target": "vmssName",
             "endpointId": "$(ConnectedServiceName)",
-            "dataSourceName": "AzureVirtualMachineScaleSetsNames"
+            "dataSourceName": "AzureVirtualMachineScaleSetNames"
         }
     ],
     "instanceNameFormat": "Azure VMSS $(vmssName): $(action)",
diff --git a/Tasks/AzureVmssDeployment/task.loc.json b/Tasks/AzureVmssDeployment/task.loc.json
index eb472280a392..e7b8883fa7bb 100644
--- a/Tasks/AzureVmssDeployment/task.loc.json
+++ b/Tasks/AzureVmssDeployment/task.loc.json
@@ -78,7 +78,7 @@
     {
       "target": "vmssName",
       "endpointId": "$(ConnectedServiceName)",
-      "dataSourceName": "AzureVirtualMachineScaleSetsNames"
+      "dataSourceName": "AzureVirtualMachineScaleSetNames"
     }
   ],
   "instanceNameFormat": "ms-resource:loc.instanceNameFormat",