diff --git a/package-lock.json b/package-lock.json
index f5a932e09df4..568f4b8e5b33 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -506,9 +506,9 @@
       }
     },
     "commander": {
-      "version": "2.14.1",
-      "resolved": "https://registry.npmjs.org/commander/-/commander-2.14.1.tgz",
-      "integrity": "sha512-+YR16o3rK53SmWHU3rEM3tPAh2rwb1yPcQX5irVn7mb0gXbwuCCrnkbV5+PBfETdfg1vui07nM6PCG1zndcjQw==",
+      "version": "2.15.0",
+      "resolved": "https://registry.npmjs.org/commander/-/commander-2.15.0.tgz",
+      "integrity": "sha512-7B1ilBwtYSbetCgTY1NJFg+gVpestg0fdA1MhC1Vs4ssyfSXnCAjFr+QcQM9/RedXC0EaUx1sG8Smgw2VfgKEg==",
       "dev": true
     },
     "commonmark": {
@@ -570,7 +570,7 @@
       "integrity": "sha1-6L0O/uWPz/b4+UUQoKVUu/ojVEk=",
       "dev": true,
       "requires": {
-        "lru-cache": "4.1.1",
+        "lru-cache": "4.1.2",
         "shebang-command": "1.2.0",
         "which": "1.3.0"
       }
@@ -695,9 +695,9 @@
       }
     },
     "diff": {
-      "version": "3.3.1",
-      "resolved": "https://registry.npmjs.org/diff/-/diff-3.3.1.tgz",
-      "integrity": "sha512-MKPHZDMB0o6yHyDryUOScqZibp914ksXwAMYMTHj6KO8UeKsRYNJD3oNCKjTqZon+V488P7N/HzXF8t7ZR95ww==",
+      "version": "3.5.0",
+      "resolved": "https://registry.npmjs.org/diff/-/diff-3.5.0.tgz",
+      "integrity": "sha512-A46qtFgd+g7pDZinpnwiRJtxbC1hpgf0uzP3iG89scHk0AUC7A1TGxf5OiiOUv/JMZR8GOt8hL900hV0bOy5xA==",
       "dev": true
     },
     "drange": {
@@ -922,9 +922,9 @@
       "dev": true
     },
     "formidable": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/formidable/-/formidable-1.1.1.tgz",
-      "integrity": "sha1-lriIb3w8NQi5Mta9cMTTqI818ak=",
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/formidable/-/formidable-1.2.0.tgz",
+      "integrity": "sha512-hr9aT30rAi7kf8Q2aaTpSP7xGMhlJ+MdrUDVZs3rxbD3L/K46A86s2VY7qC2D2kGYGBtiT/3j6wTx1eeUq5xAQ==",
       "dev": true
     },
     "fresh": {
@@ -1099,9 +1099,9 @@
       "dev": true
     },
     "hosted-git-info": {
-      "version": "2.5.0",
-      "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.5.0.tgz",
-      "integrity": "sha512-pNgbURSuab90KbTqvRPsseaTxOJCZBD0a7t+haSN33piP9cCM4l0CqdzAif2hUqm716UovKB2ROmiabGAKVXyg==",
+      "version": "2.6.0",
+      "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.6.0.tgz",
+      "integrity": "sha512-lIbgIIQA3lz5XaB6vxakj6sDHADJiZadYEJB+FgA+C4nubM1NwcuvUr9EJPmnH1skZqpqUzWborWo8EIUi0Sdw==",
       "dev": true
     },
     "http-errors": {
@@ -1782,9 +1782,9 @@
       "dev": true
     },
     "lru-cache": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.1.tgz",
-      "integrity": "sha512-q4spe4KTfsAS1SUHLO0wz8Qiyf1+vMIAgpRYioFYDMNqKfHQbg+AVDH3i4fvpl71/P1L0dBl+fQi+P37UYf0ew==",
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.2.tgz",
+      "integrity": "sha512-wgeVXhrDwAWnIF/yZARsFnMBtdFXOg1b8RIrhilp+0iDYN4mdQcNZElDZ0e4B64BhaxeQ5zN7PMyvu7we1kPeQ==",
       "dev": true,
       "requires": {
         "pseudomap": "1.0.2",
@@ -1903,15 +1903,15 @@
       }
     },
     "mocha": {
-      "version": "5.0.2",
-      "resolved": "https://registry.npmjs.org/mocha/-/mocha-5.0.2.tgz",
-      "integrity": "sha512-nmlYKMRpJZLxgzk0bRhcvlpjSisbi0x1JiRl7kctadOMPmecUie7WwCZmcyth+PzX5txKbpcMIvDZCAlx9ISxg==",
+      "version": "5.0.4",
+      "resolved": "https://registry.npmjs.org/mocha/-/mocha-5.0.4.tgz",
+      "integrity": "sha512-nMOpAPFosU1B4Ix1jdhx5e3q7XO55ic5a8cgYvW27CequcEY+BabS0kUVL1Cw1V5PuVHZWeNRWFLmEPexo79VA==",
       "dev": true,
       "requires": {
         "browser-stdout": "1.3.1",
         "commander": "2.11.0",
         "debug": "3.1.0",
-        "diff": "3.3.1",
+        "diff": "3.5.0",
         "escape-string-regexp": "1.0.5",
         "glob": "7.1.2",
         "growl": "1.10.3",
@@ -2090,7 +2090,7 @@
       "integrity": "sha512-9jjUFbTPfEy3R/ad/2oNbKtW9Hgovl5O1FvFWKkKblNXoN/Oou6+9+KKohPK13Yc3/TyunyWhJp6gvRNR/PPAw==",
       "dev": true,
       "requires": {
-        "hosted-git-info": "2.5.0",
+        "hosted-git-info": "2.6.0",
         "is-builtin-module": "1.0.0",
         "semver": "5.5.0",
         "validate-npm-package-license": "3.0.3"
@@ -2270,9 +2270,9 @@
       "dev": true
     },
     "oav": {
-      "version": "0.4.33",
-      "resolved": "https://registry.npmjs.org/oav/-/oav-0.4.33.tgz",
-      "integrity": "sha1-ZRSquGxJRu8wMxOWpKBh4qsS5bc=",
+      "version": "0.4.34",
+      "resolved": "https://registry.npmjs.org/oav/-/oav-0.4.34.tgz",
+      "integrity": "sha1-1xFWYKPUqfkzEfC7qmX5q3mpAvU=",
       "dev": true,
       "requires": {
         "@microsoft.azure/autorest-extension-base": "1.0.13",
@@ -2283,7 +2283,7 @@
         "jsonpath": "0.2.12",
         "linq": "3.0.9",
         "lodash": "4.17.5",
-        "moment": "2.18.1",
+        "moment": "2.21.0",
         "ms-rest": "2.3.1",
         "ms-rest-azure": "2.5.4",
         "recursive-readdir": "2.2.2",
@@ -2327,12 +2327,6 @@
             "strip-bom": "2.0.0"
           }
         },
-        "moment": {
-          "version": "2.18.1",
-          "resolved": "https://registry.npmjs.org/moment/-/moment-2.18.1.tgz",
-          "integrity": "sha1-w2GT3Tzhwu7SrbfIAtu8d6gbHA8=",
-          "dev": true
-        },
         "os-locale": {
           "version": "1.4.0",
           "resolved": "https://registry.npmjs.org/os-locale/-/os-locale-1.4.0.tgz",
@@ -2559,9 +2553,9 @@
       }
     },
     "path-to-regexp": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-2.1.0.tgz",
-      "integrity": "sha512-dZY7QPCPp5r9cnNuQ955mOv4ZFVDXY/yvqeV7Y1W2PJA3PEFcuow9xKFfJxbBj1pIjOAP+M2B4/7xubmykLrXw==",
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-2.2.0.tgz",
+      "integrity": "sha512-zJcOPeBsraLjWXwUzFMPzH3QO2CmO1yRggtADPJjOTyCF5csQxfUGJL+CbyyRvIS09wOipi4F/fgRhdmVGSwxQ==",
       "dev": true
     },
     "path-type": {
@@ -3153,7 +3147,7 @@
         "debug": "3.1.0",
         "extend": "3.0.1",
         "form-data": "2.3.2",
-        "formidable": "1.1.1",
+        "formidable": "1.2.0",
         "methods": "1.1.2",
         "mime": "1.6.0",
         "qs": "6.5.1",
@@ -3269,14 +3263,14 @@
       "requires": {
         "async": "2.6.0",
         "body-parser": "1.18.2",
-        "commander": "2.14.1",
+        "commander": "2.15.0",
         "debug": "3.1.0",
         "js-yaml": "3.11.0",
         "json-refs": "3.0.4",
         "lodash": "4.17.5",
         "multer": "1.3.0",
         "parseurl": "1.3.2",
-        "path-to-regexp": "2.1.0",
+        "path-to-regexp": "2.2.0",
         "qs": "6.5.1",
         "serve-static": "1.13.2",
         "spark-md5": "3.0.0",
@@ -3491,9 +3485,9 @@
       }
     },
     "viz.js": {
-      "version": "1.8.0",
-      "resolved": "https://registry.npmjs.org/viz.js/-/viz.js-1.8.0.tgz",
-      "integrity": "sha1-4Mta0kE2jjWxpulgaR66RUwklR8=",
+      "version": "1.8.1",
+      "resolved": "https://registry.npmjs.org/viz.js/-/viz.js-1.8.1.tgz",
+      "integrity": "sha512-KrSNgnIxec+JCAqDPliO6xYA69ToH2WTYB2Kbt8Bp/XRUvm23rTyfffFi4rvQLFkIRNUz/xCnnqhh/gChhsgGA==",
       "dev": true
     },
     "vscode-jsonrpc": {
@@ -3638,7 +3632,7 @@
       "dev": true,
       "requires": {
         "color": "2.0.1",
-        "viz.js": "1.8.0"
+        "viz.js": "1.8.1"
       }
     },
     "z-schema": {
@@ -3647,7 +3641,7 @@
       "integrity": "sha512-jPNzqmOu3+AGbb4krDODqo4QBzwUGDVzyfGyy1HtWaUnafltQotatSpxxWd6Mp0iSZOUwHU5sqKYi+U8HsHMkg==",
       "dev": true,
       "requires": {
-        "commander": "2.14.1",
+        "commander": "2.15.0",
         "lodash.get": "4.4.2",
         "lodash.isequal": "4.5.0",
         "validator": "9.4.1"
diff --git a/package.json b/package.json
index 8358ec9850a6..9c1d3a990897 100644
--- a/package.json
+++ b/package.json
@@ -19,7 +19,7 @@
     "json-schema-ref-parser": "^3.1.2",
     "mocha": "*",
     "oad": "^0.1.9",
-    "oav": "^0.4.1",
+    "oav": "^0.4.34",
     "request": "^2.61.0",
     "request-promise-native": "^1.0.5",
     "z-schema": "^3.16.1"
@@ -33,6 +33,6 @@
     "url": "http://github.com/azure/azure-rest-api-specs/issues"
   },
   "scripts": {
-    "test": "mocha -t 500000"
+    "test": "mocha -t 500000 --reporter min"
   }
 }