diff --git a/common/config/rush/pnpm-lock.yaml b/common/config/rush/pnpm-lock.yaml
index 82c2e3d4f5d8..99254cbff1c6 100644
--- a/common/config/rush/pnpm-lock.yaml
+++ b/common/config/rush/pnpm-lock.yaml
@@ -7,7 +7,7 @@ dependencies:
   '@azure/core-paging': 1.0.0-preview.1
   '@azure/event-hubs': 2.1.1
   '@azure/logger-js': 1.3.2
-  '@azure/ms-rest-js': 2.0.3
+  '@azure/ms-rest-js': 2.0.4
   '@azure/ms-rest-nodeauth': 0.9.3
   '@microsoft/api-extractor': 7.3.4
   '@rush-temp/abort-controller': 'file:projects/abort-controller.tgz'
@@ -55,7 +55,7 @@ dependencies:
   '@types/semver': 5.5.0
   '@types/sinon': 7.0.13
   '@types/tough-cookie': 2.3.5
-  '@types/tunnel': 0.0.0
+  '@types/tunnel': 0.0.1
   '@types/underscore': 1.9.2
   '@types/uuid': 3.4.5
   '@types/webpack': 4.32.1
@@ -164,7 +164,7 @@ dependencies:
   semver: 5.7.0
   shx: 0.3.2
   sinon: 7.3.2
-  source-map-support: 0.5.12
+  source-map-support: 0.5.13
   stream-browserify: 2.0.2
   stream-http: 2.8.3
   tough-cookie: 3.0.1
@@ -284,7 +284,7 @@ packages:
     dev: false
     resolution:
       integrity: sha512-jAa6Y2XrvwbEqkaEXDHK+ReNo0WnCPS+LgQ1dRAJUUNxK4CghF5u+SXsVtPENritilVE7FVteqsLOtlhTk+haA==
-  /@azure/ms-rest-js/2.0.3:
+  /@azure/ms-rest-js/2.0.4:
     dependencies:
       '@types/node-fetch': 2.5.0
       '@types/tunnel': 0.0.1
@@ -298,7 +298,7 @@ packages:
       xml2js: 0.4.19
     dev: false
     resolution:
-      integrity: sha512-Lcgs/a6H1srWyLKHF/OaoP8j7/i7RuNHehhXMNH5hb2Nnk5Wq0WK3z9DqF2oBMw3QPicAHFb/3nZxCRKNdXy/g==
+      integrity: sha512-nSOPt6st0RtxclYBQV65qXZpvMDqiDQssktvB/SMTAJ5bIytSPtBmlttTTigO5qHvwQcfzzpQE0sMceK+dJ/IQ==
   /@azure/ms-rest-nodeauth/0.9.3:
     dependencies:
       '@azure/ms-rest-azure-env': 1.1.2
@@ -346,7 +346,7 @@ packages:
   /@babel/highlight/7.5.0:
     dependencies:
       chalk: 2.4.2
-      esutils: 2.0.2
+      esutils: 2.0.3
       js-tokens: 4.0.0
     dev: false
     resolution:
@@ -382,7 +382,7 @@ packages:
       integrity: sha512-MqB0782whsfffYfSjH4TM+LMjrJnhCNEDMDIjeTpl+ASaUvxcjoiVCo/sM1GhS1pHOXYfWVCYneLjMckuUxDaQ==
   /@babel/types/7.5.5:
     dependencies:
-      esutils: 2.0.2
+      esutils: 2.0.3
       lodash: 4.17.15
       to-fast-properties: 2.0.0
     dev: false
@@ -1496,7 +1496,7 @@ packages:
   /babel-code-frame/6.26.0:
     dependencies:
       chalk: 1.1.3
-      esutils: 2.0.2
+      esutils: 2.0.3
       js-tokens: 3.0.2
     dev: false
     resolution:
@@ -1949,7 +1949,7 @@ packages:
   /babel-types/6.26.0:
     dependencies:
       babel-runtime: 6.26.0
-      esutils: 2.0.2
+      esutils: 2.0.3
       lodash: 4.17.15
       to-fast-properties: 1.0.3
     dev: false
@@ -2174,8 +2174,8 @@ packages:
       integrity: sha512-Z942RysHXmJrhqk88FmKBVq/v5tqmSkDz7p54G/MGyjMnCFFnC79XWNbg+Vta8W6Wb2qtSZTSxIGkJrRpCFEiA==
   /browserslist/3.2.8:
     dependencies:
-      caniuse-lite: 1.0.30000986
-      electron-to-chromium: 1.3.204
+      caniuse-lite: 1.0.30000988
+      electron-to-chromium: 1.3.207
     dev: false
     hasBin: true
     resolution:
@@ -2252,13 +2252,14 @@ packages:
       node: '>= 0.8'
     resolution:
       integrity: sha512-zauLjrfCG+xvoyaqLoV8bLVXXNGC4JqlxFCutSDWA6fJrTo2ZuvLYTqZ7aHBLZSMOopbzwv8f+wZcVzfVTI2Dg==
-  /cacache/11.3.3:
+  /cacache/12.0.2:
     dependencies:
       bluebird: 3.5.5
       chownr: 1.1.2
       figgy-pudding: 3.5.1
       glob: 7.1.4
       graceful-fs: 4.2.0
+      infer-owner: 1.0.4
       lru-cache: 5.1.1
       mississippi: 3.0.0
       mkdirp: 0.5.1
@@ -2270,7 +2271,7 @@ packages:
       y18n: 4.0.0
     dev: false
     resolution:
-      integrity: sha512-p8WcneCytvzPxhDvYp31PD039vi77I12W+/KfR9S8AZbaiARFBCpsPJS+9uhWfeBfeAtW7o/4vt3MUqLkbY6nA==
+      integrity: sha512-ifKgxH2CKhJEg6tNdAwziu6Q33EvuG26tYcda6PT3WKisZcYDXsnEdnRv67Po3yCzFfaSoMjGZzJyD2c3DT1dg==
   /cache-base/1.0.1:
     dependencies:
       collection-visit: 1.0.0
@@ -2351,10 +2352,10 @@ packages:
       node: '>=6'
     resolution:
       integrity: sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==
-  /caniuse-lite/1.0.30000986:
+  /caniuse-lite/1.0.30000988:
     dev: false
     resolution:
-      integrity: sha512-pM+LnkoAX0+QnIH3tpW5EnkmfpEoqOD8FAcoBvsl3Xh6DXkgctiCxeCbXphP/k3XJtJzm+zOAJbi6U6IVkpWZQ==
+      integrity: sha512-lPj3T8poYrRc/bniW5SQPND3GRtSrQdUM/R4mCYTbZxyi3jQiggLvZH4+BYUuX0t4TXjU+vMM7KFDQg+rSzZUQ==
   /caseless/0.12.0:
     dev: false
     resolution:
@@ -3151,7 +3152,7 @@ packages:
       integrity: sha512-kqag/Nl+f3GwyK25fhUMYj81BUOrZ9IuJsjIcDE5icNM9FJHAVm3VcUDxdLPoQtTuUylWm6ZIknYJwwaPxsUzg==
   /doctrine/3.0.0:
     dependencies:
-      esutils: 2.0.2
+      esutils: 2.0.3
     dev: false
     engines:
       node: '>=6.0.0'
@@ -3224,10 +3225,10 @@ packages:
     dev: false
     resolution:
       integrity: sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0=
-  /electron-to-chromium/1.3.204:
+  /electron-to-chromium/1.3.207:
     dev: false
     resolution:
-      integrity: sha512-T0eXE6hfbtpzRUaI7aHI/HYJ29Ndk84aVSborRAmXfWvBvz2EuB2OWYUxNcUX9d+jtqEIjgZjWMdoxS0hp5j1g==
+      integrity: sha512-RIgAnfqbjZNECBLjslfy4cIYvcPl3GAXmnENrcoo0TZ8fGkyEEAealAbO7MoevW4xYUPe+e68cWAj6eP0DmMHw==
   /elliptic/6.5.0:
     dependencies:
       bn.js: 4.11.8
@@ -3419,7 +3420,7 @@ packages:
     dependencies:
       esprima: 2.7.3
       estraverse: 1.9.3
-      esutils: 2.0.2
+      esutils: 2.0.3
       optionator: 0.8.2
     dev: false
     engines:
@@ -3506,7 +3507,7 @@ packages:
       eslint-visitor-keys: 1.0.0
       espree: 5.0.1
       esquery: 1.0.1
-      esutils: 2.0.2
+      esutils: 2.0.3
       file-entry-cache: 5.0.1
       functional-red-black-tree: 1.0.1
       glob: 7.1.4
@@ -3529,7 +3530,7 @@ packages:
       semver: 5.7.0
       strip-ansi: 4.0.0
       strip-json-comments: 2.0.1
-      table: 5.4.4
+      table: 5.4.5
       text-table: 0.2.0
     dev: false
     engines:
@@ -3597,12 +3598,12 @@ packages:
     dev: false
     resolution:
       integrity: sha512-SqmZANLWS0mnatqbSfRP5g8OXZC12Fgg1IwNtLsyHDzJizORW4khDfjPqJZsemPWBB2uqykUah5YpQ6epsqC/w==
-  /esutils/2.0.2:
+  /esutils/2.0.3:
     dev: false
     engines:
       node: '>=0.10.0'
     resolution:
-      integrity: sha1-Cr9PHKpbyx96nYrMbepPqqBLrJs=
+      integrity: sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==
   /etag/1.8.1:
     dev: false
     engines:
@@ -4719,6 +4720,10 @@ packages:
     dev: false
     resolution:
       integrity: sha1-gtwzbSMrkGIXnQWrMpOmYFn9Q10=
+  /infer-owner/1.0.4:
+    dev: false
+    resolution:
+      integrity: sha512-IClj+Xz94+d7irH5qRyfJonOdfTzuDaifE6ZPWfx0N0+/ATZCbuTPq2prFl526urkQd90WyUKIh1DfBQ2hMz9A==
   /inflight/1.0.6:
     dependencies:
       once: 1.4.0
@@ -8263,13 +8268,13 @@ packages:
     dev: false
     resolution:
       integrity: sha512-try0/JqxPLF9nOjvSta7tVondkP5dwgyLDjVoyMDlmjugT2lRZ1OfsrYTkCd2hkDnJTKRbO/Rl3orm8vlsUzbA==
-  /source-map-support/0.5.12:
+  /source-map-support/0.5.13:
     dependencies:
       buffer-from: 1.1.1
       source-map: 0.6.1
     dev: false
     resolution:
-      integrity: sha512-4h2Pbvyy15EE02G+JOZpUCmqWJuqrs+sEkzewTm++BPi7Hvn/HwcqLAcNxYAyI0x13CpPPn+kMjl+hplXMHITQ==
+      integrity: sha512-SHSKFHadjVA5oR4PPqhtAVdcBWwRYVd6g6cAXnIbRiIwc2EhPrTuKUBdSLvlEKyIP3GCf89fltvcZiP9MMFA1w==
   /source-map-url/0.4.0:
     dev: false
     resolution:
@@ -8624,7 +8629,7 @@ packages:
     dev: false
     resolution:
       integrity: sha1-PPh9/rTQe0o/FIJ7wYaz/QxkXNg=
-  /table/5.4.4:
+  /table/5.4.5:
     dependencies:
       ajv: 6.10.2
       lodash: 4.17.15
@@ -8634,25 +8639,24 @@ packages:
     engines:
       node: '>=6.0.0'
     resolution:
-      integrity: sha512-IIfEAUx5QlODLblLrGTTLJA7Tk0iLSGBvgY8essPRVNGHAzThujww1YqHLs6h3HfTg55h++RzLHH5Xw/rfv+mg==
+      integrity: sha512-oGa2Hl7CQjfoaogtrOHEJroOcYILTx7BZWLGsJIlzoWmB2zmguhNfPJZsWPKYek/MgCxfco54gEi31d1uN2hFA==
   /tapable/1.1.3:
     dev: false
     engines:
       node: '>=6'
     resolution:
       integrity: sha512-4WK/bYZmj8xLr+HUCODHGF1ZFzsYffasLUgEiMBY4fgtltdO6B4WJtlSbPaDTLpYTcGVwM2qLnFTICEcNxs3kA==
-  /terser-webpack-plugin/1.3.0_webpack@4.38.0:
+  /terser-webpack-plugin/1.4.1_webpack@4.38.0:
     dependencies:
-      cacache: 11.3.3
+      cacache: 12.0.2
       find-cache-dir: 2.1.0
       is-wsl: 1.1.0
-      loader-utils: 1.2.3
       schema-utils: 1.0.0
       serialize-javascript: 1.7.0
       source-map: 0.6.1
       terser: 4.1.2
       webpack: 4.38.0_webpack@4.38.0
-      webpack-sources: 1.3.0
+      webpack-sources: 1.4.1
       worker-farm: 1.7.0
     dev: false
     engines:
@@ -8660,12 +8664,12 @@ packages:
     peerDependencies:
       webpack: ^4.0.0
     resolution:
-      integrity: sha512-W2YWmxPjjkUcOWa4pBEv4OP4er1aeQJlSo2UhtCFQCuRXEHjOFscO8VyWHj9JLlA0RzQb8Y2/Ta78XZvT54uGg==
+      integrity: sha512-ZXmmfiwtCLfz8WKZyYUuuHf3dMYEjg8NrjHMb0JqHVHVOSkzp3cW2/XG1fP3tRhqEqSzMwzzRQGtAPbs4Cncxg==
   /terser/4.1.2:
     dependencies:
       commander: 2.20.0
       source-map: 0.6.1
-      source-map-support: 0.5.12
+      source-map-support: 0.5.13
     dev: false
     engines:
       node: '>=6.0.0'
@@ -8865,21 +8869,6 @@ packages:
       node: '>=0.10.0'
     resolution:
       integrity: sha1-yy4SAwZ+DI3h9hQJS5/kVwTqYAM=
-  /ts-loader/5.4.5_typescript@3.5.3:
-    dependencies:
-      chalk: 2.4.2
-      enhanced-resolve: 4.1.0
-      loader-utils: 1.2.3
-      micromatch: 3.1.10
-      semver: 5.7.0
-      typescript: 3.5.3
-    dev: false
-    engines:
-      node: '>=6.11.5'
-    peerDependencies:
-      typescript: '*'
-    resolution:
-      integrity: sha512-XYsjfnRQCBum9AMRZpk2rTYSVpdZBpZK+kDh0TeT3kxmQNBDVIeUjdPjY5RZry4eIAb8XHc4gYSUiUWPYvzSRw==
   /ts-loader/6.0.4_typescript@3.5.3:
     dependencies:
       chalk: 2.4.2
@@ -8917,7 +8906,7 @@ packages:
       make-error: 1.3.5
       minimist: 1.2.0
       mkdirp: 0.5.1
-      source-map-support: 0.5.12
+      source-map-support: 0.5.13
       yn: 2.0.0
     dev: false
     engines:
@@ -9350,13 +9339,13 @@ packages:
       node: '>= 6'
     resolution:
       integrity: sha512-cX8G2vR/85UYG59FgkoMamwHUIkSSlV3bBMRsbxVXVUk2j6NleCKjQ/WE9eYg9WY4w25O9w8wKP4rzNZFmUcUg==
-  /webpack-sources/1.3.0:
+  /webpack-sources/1.4.1:
     dependencies:
       source-list-map: 2.0.1
       source-map: 0.6.1
     dev: false
     resolution:
-      integrity: sha512-OiVgSrbGu7NEnEvQJJgdSFPl2qWKkWq5lHMhgiToIiN9w34EBnjYzSYs+VbL5KoYiLNtFFa7BZIKxRED3I32pA==
+      integrity: sha512-XSz38193PTo/1csJabKaV4b53uRVotlMgqJXm3s3eje0Bu6gQTxYDqpD38CmQfDBA+gN+QqaGjasuC8I/7eW3Q==
   /webpack/4.38.0_webpack@4.38.0:
     dependencies:
       '@webassemblyjs/ast': 1.8.5
@@ -9379,9 +9368,9 @@ packages:
       node-libs-browser: 2.2.1
       schema-utils: 1.0.0
       tapable: 1.1.3
-      terser-webpack-plugin: 1.3.0_webpack@4.38.0
+      terser-webpack-plugin: 1.4.1_webpack@4.38.0
       watchpack: 1.6.0
-      webpack-sources: 1.3.0
+      webpack-sources: 1.4.1
     dev: false
     engines:
       node: '>=6.11.5'
@@ -9819,7 +9808,6 @@ packages:
       rollup-plugin-sourcemaps: 0.4.2_rollup@1.17.0
       rollup-plugin-visualizer: 2.5.4_rollup@1.17.0
       shx: 0.3.2
-      ts-loader: 5.4.5_typescript@3.5.3
       ts-node: 7.0.1
       tslib: 1.10.0
       typescript: 3.5.3
@@ -9903,7 +9891,7 @@ packages:
       '@types/semver': 5.5.0
       '@types/sinon': 7.0.13
       '@types/tough-cookie': 2.3.5
-      '@types/tunnel': 0.0.0
+      '@types/tunnel': 0.0.1
       '@types/uuid': 3.4.5
       '@types/webpack': 4.32.1
       '@types/webpack-dev-middleware': 2.0.3
@@ -9969,7 +9957,7 @@ packages:
     dev: false
     name: '@rush-temp/core-http'
     resolution:
-      integrity: sha512-CVbJKETE4rZ8HRTwK5s3AP/KoVFXgWFXoQaGZs6fU1IQy+dKvOeH6ssVQyu6w9aRPfrsZUVE/9vLc/BpF+T4gg==
+      integrity: sha512-efe1kdaKsX3+5dTnSR0+Ri+YAvJUyyE4gMMw1CP9QYP/mbO8tmuocIrclE+I5uCXOftEYC57DxQWfKGDeIxZmA==
       tarball: 'file:projects/core-http.tgz'
     version: 0.0.0
   'file:projects/core-paging.tgz':
@@ -9999,7 +9987,7 @@ packages:
       '@types/priorityqueuejs': 1.0.1
       '@types/semaphore': 1.1.0
       '@types/sinon': 7.0.13
-      '@types/tunnel': 0.0.0
+      '@types/tunnel': 0.0.1
       '@types/underscore': 1.9.2
       '@typescript-eslint/eslint-plugin': 1.13.0_0b5e999c52a893676e7127c05369c7b6
       '@typescript-eslint/parser': 1.13.0_eslint@5.16.0
@@ -10031,7 +10019,7 @@ packages:
     dev: false
     name: '@rush-temp/cosmos'
     resolution:
-      integrity: sha512-/euB1YiQgtheGt1Syg+rxebY8yTl+qdQjyjLB0GAyFo2F1mluazoGYiAEZtD/P9QnEt72eQeL7V1btabWYHZhw==
+      integrity: sha512-yK++23mfEVl3T1p/aa/fkqlg+DjqqN3owE0qGER2wF9UIBkRqV+iYZhhrGUdcWrEmmcdf7CXFhgzOAdDbjIVwg==
       tarball: 'file:projects/cosmos.tgz'
     version: 0.0.0
   'file:projects/event-hubs.tgz':
@@ -10306,7 +10294,7 @@ packages:
       rollup-plugin-sourcemaps: 0.4.2_rollup@1.17.0
       rollup-plugin-terser: 5.1.1_rollup@1.17.0
       rollup-plugin-visualizer: 2.5.4_rollup@1.17.0
-      source-map-support: 0.5.12
+      source-map-support: 0.5.13
       tslib: 1.10.0
       typescript: 3.5.3
       uglify-js: 3.6.0
@@ -10375,7 +10363,7 @@ packages:
       rollup-plugin-sourcemaps: 0.4.2_rollup@1.17.0
       rollup-plugin-terser: 5.1.1_rollup@1.17.0
       rollup-plugin-visualizer: 2.5.4_rollup@1.17.0
-      source-map-support: 0.5.12
+      source-map-support: 0.5.13
       tslib: 1.10.0
       typescript: 3.5.3
       uglify-js: 3.6.0
@@ -10466,7 +10454,7 @@ packages:
     version: 0.0.0
   'file:projects/storage-blob.tgz':
     dependencies:
-      '@azure/ms-rest-js': 2.0.3
+      '@azure/ms-rest-js': 2.0.4
       '@microsoft/api-extractor': 7.3.4
       '@types/dotenv': 6.1.1
       '@types/fs-extra': 8.0.0
@@ -10524,7 +10512,7 @@ packages:
       rollup-plugin-sourcemaps: 0.4.2_rollup@1.17.0
       rollup-plugin-terser: 5.1.1_rollup@1.17.0
       rollup-plugin-visualizer: 2.5.4_rollup@1.17.0
-      source-map-support: 0.5.12
+      source-map-support: 0.5.13
       ts-node: 7.0.1
       tslib: 1.10.0
       typescript: 3.5.3
@@ -10537,7 +10525,7 @@ packages:
     version: 0.0.0
   'file:projects/storage-file.tgz':
     dependencies:
-      '@azure/ms-rest-js': 2.0.3
+      '@azure/ms-rest-js': 2.0.4
       '@microsoft/api-extractor': 7.3.4
       '@types/dotenv': 6.1.1
       '@types/fs-extra': 8.0.0
@@ -10595,7 +10583,7 @@ packages:
       rollup-plugin-sourcemaps: 0.4.2_rollup@1.17.0
       rollup-plugin-terser: 5.1.1_rollup@1.17.0
       rollup-plugin-visualizer: 2.5.4_rollup@1.17.0
-      source-map-support: 0.5.12
+      source-map-support: 0.5.13
       ts-node: 7.0.1
       tslib: 1.10.0
       typescript: 3.5.3
@@ -10608,7 +10596,7 @@ packages:
     version: 0.0.0
   'file:projects/storage-queue.tgz':
     dependencies:
-      '@azure/ms-rest-js': 2.0.3
+      '@azure/ms-rest-js': 2.0.4
       '@microsoft/api-extractor': 7.3.4
       '@types/dotenv': 6.1.1
       '@types/fs-extra': 8.0.0
@@ -10665,7 +10653,7 @@ packages:
       rollup-plugin-sourcemaps: 0.4.2_rollup@1.17.0
       rollup-plugin-terser: 5.1.1_rollup@1.17.0
       rollup-plugin-visualizer: 2.5.4_rollup@1.17.0
-      source-map-support: 0.5.12
+      source-map-support: 0.5.13
       ts-node: 7.0.1
       tslib: 1.10.0
       typescript: 3.5.3
@@ -10752,7 +10740,6 @@ packages:
       integrity: sha512-rdhMvXi7mvg+wP0vVdqhouZr17v9a3n4KDMSyuUPU9qhOvY6bMfqoeIXrzgWkCXtR9yjL15gwJHKWsBlByGE4A==
       tarball: 'file:projects/testhub.tgz'
     version: 0.0.0
-registry: ''
 specifiers:
   '@azure/abort-controller': 1.0.0-preview.1
   '@azure/amqp-common': 1.0.0-preview.6
@@ -10810,7 +10797,7 @@ specifiers:
   '@types/semver': ^5.5.0
   '@types/sinon': ^7.0.13
   '@types/tough-cookie': ^2.3.5
-  '@types/tunnel': ^0.0.0
+  '@types/tunnel': ^0.0.1
   '@types/underscore': ^1.8.8
   '@types/uuid': ^3.4.3
   '@types/webpack': ^4.4.13
diff --git a/sdk/core/core-http/lib/axiosHttpClient.ts b/sdk/core/core-http/lib/axiosHttpClient.ts
index 164d48b97993..d59668dbc84b 100644
--- a/sdk/core/core-http/lib/axiosHttpClient.ts
+++ b/sdk/core/core-http/lib/axiosHttpClient.ts
@@ -227,9 +227,10 @@ declare type ProxyAgent = { isHttps: boolean; agent: http.Agent | https.Agent };
 export function createProxyAgent(requestUrl: string, proxySettings: ProxySettings, headers?: HttpHeaders): ProxyAgent {
   const tunnelOptions: tunnel.HttpsOverHttpsOptions = {
     proxy: {
-      host: URLBuilder.parse(proxySettings.host).getHost(),
+      // TODO: Handle case where getHost() returns undefined
+      host: URLBuilder.parse(proxySettings.host).getHost()!,
       port: proxySettings.port,
-      headers: (headers && headers.rawHeaders()) || {}
+      headers: (headers && headers.rawHeaders())
     }
   };
 
diff --git a/sdk/core/core-http/package.json b/sdk/core/core-http/package.json
index 8f1231e8c34f..bebf3de1936d 100644
--- a/sdk/core/core-http/package.json
+++ b/sdk/core/core-http/package.json
@@ -111,7 +111,6 @@
   },
   "dependencies": {
     "@azure/core-auth": "1.0.0-preview.1",
-    "@types/tunnel": "^0.0.0",
     "axios": "^0.19.0",
     "form-data": "^2.5.0",
     "process": "^0.11.10",
@@ -132,6 +131,7 @@
     "@types/semver": "^5.5.0",
     "@types/sinon": "^7.0.13",
     "@types/tough-cookie": "^2.3.5",
+    "@types/tunnel": "^0.0.1",
     "@types/uuid": "^3.4.3",
     "@types/webpack": "^4.4.13",
     "@types/webpack-dev-middleware": "^2.0.2",
diff --git a/sdk/core/core-http/test/axiosHttpClientTests.node.ts b/sdk/core/core-http/test/axiosHttpClientTests.node.ts
index d0759be0ed71..f3d7d5431b9b 100644
--- a/sdk/core/core-http/test/axiosHttpClientTests.node.ts
+++ b/sdk/core/core-http/test/axiosHttpClientTests.node.ts
@@ -39,8 +39,8 @@ describe("AxiosHttpClient", () => {
         proxyAgent.isHttps.should.equal(testCase.isProxyHttps);
         const agent = proxyAgent.agent as HttpsAgent;
         should().equal(agent.defaultPort, testCase.port);
-        agent.options.proxy.host!.should.equal(urlHost);
-        agent.options.proxy.port!.should.equal(proxySettings.port);
+        agent.options.proxy.host.should.equal(urlHost);
+        agent.options.proxy.port.should.equal(proxySettings.port);
         done();
       });
     });
@@ -57,7 +57,8 @@ describe("AxiosHttpClient", () => {
       const proxyAgent = createProxyAgent("http://example.com", proxySettings, headers);
 
       const agent = proxyAgent.agent as HttpsAgent;
-      agent.proxyOptions.headers.should.contain({ "user-agent": "Node.js" });
+      should().exist(agent.proxyOptions.headers);
+      agent.proxyOptions.headers!.should.contain({ "user-agent": "Node.js" });
       done();
     });
   });
@@ -86,8 +87,8 @@ describe("AxiosHttpClient", () => {
         };
 
         const tunnel = createTunnel(false, value, tunnelConfig) as HttpsAgent;
-        tunnel.options.proxy.host!.should.equal(defaultProxySettings.host);
-        tunnel.options.proxy.port!.should.equal(defaultProxySettings.port);
+        tunnel.options.proxy.host.should.equal(defaultProxySettings.host);
+        tunnel.options.proxy.port.should.equal(defaultProxySettings.port);
         should().not.exist(tunnel.defaultPort);
       });
     });
@@ -103,8 +104,8 @@ describe("AxiosHttpClient", () => {
         };
 
         const tunnel = createTunnel(true, value, tunnelConfig) as HttpsAgent;
-        tunnel.options.proxy.host!.should.equal(defaultProxySettings.host);
-        tunnel.options.proxy.port!.should.equal(defaultProxySettings.port);
+        tunnel.options.proxy.host.should.equal(defaultProxySettings.host);
+        tunnel.options.proxy.port.should.equal(defaultProxySettings.port);
         tunnel.defaultPort!.should.equal(443);
       });
     });
diff --git a/sdk/cosmosdb/cosmos/package.json b/sdk/cosmosdb/cosmos/package.json
index 03a16f6fb66e..e8cad783a6d4 100644
--- a/sdk/cosmosdb/cosmos/package.json
+++ b/sdk/cosmosdb/cosmos/package.json
@@ -52,7 +52,7 @@
     "@types/priorityqueuejs": "^1.0.1",
     "@types/semaphore": "^1.1.0",
     "@types/sinon": "^7.0.13",
-    "@types/tunnel": "^0.0.0",
+    "@types/tunnel": "^0.0.1",
     "@types/underscore": "^1.8.8",
     "@typescript-eslint/eslint-plugin": "^1.11.0",
     "@typescript-eslint/parser": "^1.11.0",