diff --git a/package.json b/package.json
index 78ed90c6880..98fe2b3f0cd 100644
--- a/package.json
+++ b/package.json
@@ -92,7 +92,7 @@
     "proxyquire": "^1.7.10",
     "querystringify": "0.0.3",
     "requirejs": "^2.1.20",
-    "sinon": "^3.2.0",
+    "sinon": "^1.12.1",
     "string-replace-webpack-plugin": "^0.1.3",
     "through2": "^2.0.3",
     "uglify-js": "^2.8.10",
diff --git a/test/mocks/sandbox.js b/test/mocks/sandbox.js
deleted file mode 100644
index 52aefd7b93e..00000000000
--- a/test/mocks/sandbox.js
+++ /dev/null
@@ -1,22 +0,0 @@
-import sinon from 'sinon';
-
-/**
- * Function which can be called from inside a describe() block to make sure that each test runs in a sandbox.
- *
- * @return {function} A function which can be called from it() blocks to return the current sandbox.
- */
-export default function useSandbox() {
-  let sandbox;
-
-  beforeEach(() => {
-    sandbox = sinon.sandbox.create();
-  });
-
-  afterEach(() => {
-    sandbox.restore();
-  });
-
-  return function() {
-    return sandbox;
-  }
-}
diff --git a/test/mocks/videoCacheStub.js b/test/mocks/videoCacheStub.js
index 5ec1cb205b1..4a1d8bca343 100644
--- a/test/mocks/videoCacheStub.js
+++ b/test/mocks/videoCacheStub.js
@@ -1,4 +1,3 @@
-import sinon from 'sinon';
 import * as videoCache from 'src/videoCache';
 
 /**
diff --git a/test/spec/AnalyticsAdapter_spec.js b/test/spec/AnalyticsAdapter_spec.js
index b3f9f2346ea..3eeb5a9efee 100644
--- a/test/spec/AnalyticsAdapter_spec.js
+++ b/test/spec/AnalyticsAdapter_spec.js
@@ -69,7 +69,7 @@ FEATURE: Analytics Adapters API
         adapter = new AnalyticsAdapter(config);
         spyTestGlobal = sinon.spy(window, config.global);
 
-        sinon.stub(events, 'getEvents').returns([]); // these tests shouldn't be affected by previous tests
+        sinon.stub(events, 'getEvents', () => []); // these tests shouldn't be affected by previous tests
       });
 
       afterEach(() => {
@@ -139,7 +139,7 @@ FEATURE: Analytics Adapters API
         const args = { more: 'info' };
 
         beforeEach(() => {
-          sinon.stub(Math, 'random').returns(0.5);
+          sinon.stub(Math, 'random', () => 0.5);
         });
 
         afterEach(() => {
diff --git a/test/spec/bidmanager_spec.js b/test/spec/bidmanager_spec.js
index 25d5d2ad354..150163aa43b 100644
--- a/test/spec/bidmanager_spec.js
+++ b/test/spec/bidmanager_spec.js
@@ -1,9 +1,12 @@
-import useSandbox from 'test/mocks/sandbox';
-import * as utils from 'src/utils';
-import * as bidmanager from 'src/bidmanager';
-import * as bidfactory from 'src/bidfactory';
-import * as fixtures from 'test/fixtures/fixtures';
-import * as assert from 'assert';
+var assert = require('assert');
+
+/* use this method to test individual files instead of the whole prebid.js project */
+
+// TODO refactor to use the spec files
+var utils = require('../../src/utils');
+var bidmanager = require('../../src/bidmanager');
+var bidfactory = require('../../src/bidfactory');
+var fixtures = require('../fixtures/fixtures');
 
 describe('replaceTokenInString', function () {
   it('should replace all given tokens in a String', function () {
@@ -414,9 +417,6 @@ describe('bidmanager.js', function () {
     before(() => {
       $$PREBID_GLOBAL$$.adUnits = fixtures.getAdUnits();
     });
-
-    const getSandbox = useSandbox()
-
     it('should return proper price bucket increments for dense mode', () => {
       const bid = Object.assign({},
         bidfactory.createBid(2),
@@ -501,13 +501,11 @@ describe('bidmanager.js', function () {
     });
 
     it('should add banner bids that have no width or height but single adunit size', () => {
-      getSandbox().stub(utils, 'getBidderRequest').callsFake(() => {
-        return {
-          bids: [{
-            sizes: [[300, 250]],
-          }]
-        }
-      });
+      sinon.stub(utils, 'getBidderRequest', () => ({
+        bids: [{
+          sizes: [[300, 250]],
+        }]
+      }));
 
       const bid = Object.assign({},
         bidfactory.createBid(1),
@@ -524,18 +522,18 @@ describe('bidmanager.js', function () {
       assert.equal(bid.adId, addedBid.adId);
       assert.equal(addedBid.width, 300);
       assert.equal(addedBid.height, 250);
+
+      utils.getBidderRequest.restore();
     });
 
     it('should not add native bids that do not have required assets', () => {
-      getSandbox().stub(utils, 'getBidRequest').callsFake(() => {
-        return {
-          bidder: 'appnexusAst',
-          nativeParams: {
-            title: {'required': true},
-          },
-          mediaType: 'native',
-        }
-      });
+      sinon.stub(utils, 'getBidRequest', () => ({
+        bidder: 'appnexusAst',
+        nativeParams: {
+          title: {'required': true},
+        },
+        mediaType: 'native',
+      }));
 
       const bid = Object.assign({},
         bidfactory.createBid(1),
@@ -549,18 +547,18 @@ describe('bidmanager.js', function () {
       const bidsRecCount = $$PREBID_GLOBAL$$._bidsReceived.length;
       bidmanager.addBidResponse('adUnit-code', bid);
       assert.equal(bidsRecCount, $$PREBID_GLOBAL$$._bidsReceived.length);
+
+      utils.getBidRequest.restore();
     });
 
     it('should add native bids that do have required assets', () => {
-      getSandbox().stub(utils, 'getBidRequest').callsFake(() => {
-        return {
-          bidder: 'appnexusAst',
-          nativeParams: {
-            title: {'required': true},
-          },
-          mediaType: 'native',
-        }
-      });
+      sinon.stub(utils, 'getBidRequest', () => ({
+        bidder: 'appnexusAst',
+        nativeParams: {
+          title: {'required': true},
+        },
+        mediaType: 'native',
+      }));
 
       const bid = Object.assign({},
         bidfactory.createBid(1),
@@ -574,19 +572,19 @@ describe('bidmanager.js', function () {
       const bidsRecCount = $$PREBID_GLOBAL$$._bidsReceived.length;
       bidmanager.addBidResponse('adUnit-code', bid);
       assert.equal(bidsRecCount + 1, $$PREBID_GLOBAL$$._bidsReceived.length);
+
+      utils.getBidRequest.restore();
     });
 
     it('installs publisher-defined renderers on bids', () => {
-      getSandbox().stub(utils, 'getBidderRequest').callsFake(() => {
-        return {
-          bids: [{
-            renderer: {
-              url: 'renderer.js',
-              render: (bid) => bid
-            }
-          }]
-        };
-      });
+      sinon.stub(utils, 'getBidderRequest', () => ({
+        bids: [{
+          renderer: {
+            url: 'renderer.js',
+            render: (bid) => bid
+          }
+        }]
+      }));
 
       const bid = Object.assign({}, bidfactory.createBid(1), {
         bidderCode: 'appnexusAst',
@@ -596,6 +594,8 @@ describe('bidmanager.js', function () {
       bidmanager.addBidResponse('adUnit-code', bid);
       const addedBid = $$PREBID_GLOBAL$$._bidsReceived.pop();
       assert.equal(addedBid.renderer.url, 'renderer.js');
+
+      utils.getBidderRequest.restore();
     });
   });
 });
diff --git a/test/spec/modules/adkernelBidAdapter_spec.js b/test/spec/modules/adkernelBidAdapter_spec.js
index 703981fa5a8..5fabbad7fbf 100644
--- a/test/spec/modules/adkernelBidAdapter_spec.js
+++ b/test/spec/modules/adkernelBidAdapter_spec.js
@@ -146,12 +146,14 @@ describe('Adkernel adapter', () => {
     let bidRequest;
 
     beforeEach(() => {
-      sandbox.stub(utils, 'getTopWindowLocation').returns({
-        protocol: 'https:',
-        hostname: 'example.com',
-        host: 'example.com',
-        pathname: '/index.html',
-        href: 'http://example.com/index.html'
+      sandbox.stub(utils, 'getTopWindowLocation', () => {
+        return {
+          protocol: 'https:',
+          hostname: 'example.com',
+          host: 'example.com',
+          pathname: '/index.html',
+          href: 'http://example.com/index.html'
+        };
       });
 
       ajaxStub.onCall(0).callsArgWith(1, JSON.stringify(bidResponse1));
@@ -196,12 +198,14 @@ describe('Adkernel adapter', () => {
     let bidRequest;
 
     beforeEach(() => {
-      sandbox.stub(utils, 'getTopWindowLocation').returns({
-        protocol: 'https:',
-        hostname: 'example.com',
-        host: 'example.com',
-        pathname: '/index.html',
-        href: 'http://example.com/index.html'
+      sandbox.stub(utils, 'getTopWindowLocation', () => {
+        return {
+          protocol: 'https:',
+          hostname: 'example.com',
+          host: 'example.com',
+          pathname: '/index.html',
+          href: 'http://example.com/index.html'
+        };
       });
       ajaxStub.onCall(0).callsArgWith(1, JSON.stringify(videoBidResponse));
       doRequest([bid_video]);
@@ -320,8 +324,10 @@ describe('Adkernel adapter', () => {
         '//sync.adkernel.com/user-sync?zone=2&r=%2F%2Frtb.adkernel.com%2Fuser-synced%3Fuid%3D%7BUID%7D',
         '//sync.adkernel.com/user-sync?zone=1&r=%2F%2Frtb.adkernel.com%2Fuser-synced%3Fuid%3D%7BUID%7D'];
       let userSyncUrls = [];
-      sandbox.stub(utils, 'createInvisibleIframe').returns({});
-      sandbox.stub(utils, 'addEventHandler').callsFake((el, ev, cb) => {
+      sandbox.stub(utils, 'createInvisibleIframe', () => {
+        return {};
+      });
+      sandbox.stub(utils, 'addEventHandler', (el, ev, cb) => {
         userSyncUrls.push(el.src);
         cb(); // instant callback
       });
diff --git a/test/spec/modules/admixerBidAdapter_spec.js b/test/spec/modules/admixerBidAdapter_spec.js
index c2a38df02c3..0b66f8a9469 100644
--- a/test/spec/modules/admixerBidAdapter_spec.js
+++ b/test/spec/modules/admixerBidAdapter_spec.js
@@ -1,5 +1,3 @@
-import useSandbox from 'test/mocks/sandbox';
-
 var chai = require('chai');
 var Adapter = require('modules/admixerBidAdapter')();
 var Ajax = require('src/ajax');
@@ -135,107 +133,108 @@ describe('Admixer adapter', function () {
   var validJsonVideoParams = {
     zone: 'zone_id',
     callback_uid: 'ad-unit-1',
-    sizes: '300x250',
+    sizes: '300x250-300x600',
+    skippable: true
   };
-
-  const getSandbox = useSandbox();
-
   describe('bid request with valid data', function () {
+    var stubAjax;
+    beforeEach(function () {
+      stubAjax = sinon.stub(Ajax, 'ajax');
+    });
+
+    afterEach(function () {
+      stubAjax.restore();
+    });
     it('display: bid request should be called. sizes style -> [[],[]]', function () {
-      const stubAjax = getSandbox().stub(Ajax, 'ajax');
       Adapter.callBids(validData_1);
       sinon.assert.calledOnce(stubAjax);
     });
     it('video: bid request should be called. sizes style -> [[],[]]', function () {
-      const stubAjax = getSandbox().stub(Ajax, 'ajax');
       Adapter.callBids(validVideoData_1);
       sinon.assert.calledOnce(stubAjax);
     });
     it('display: bid request should be called. sizes style -> []', function () {
-      const stubAjax = getSandbox().stub(Ajax, 'ajax');
       Adapter.callBids(validData_2);
       sinon.assert.calledOnce(stubAjax);
     });
     it('video: bid request should be called. sizes style -> []', function () {
-      const stubAjax = getSandbox().stub(Ajax, 'ajax');
       Adapter.callBids(validVideoData_2);
       sinon.assert.calledOnce(stubAjax);
     });
-    // These tests began failing with the sinon 1.x -> 3.x upgrade. Unfortunately,
-    // they're not using a sinon 1.x API legally... so it's unclear exactly what
-    // they're supposed to be testing.
-    // it('display: ajax params should be matched', function () {
-    //   const stubAjax = getSandbox().stub(Ajax, 'ajax');
-    //   Adapter.callBids(validData_1);
-    //   sinon.assert.calledWith(stubAjax, sinon.match(invUrl, function () {
-    //   }, validJsonParams, {method: 'GET'}));
-    // });
-    // it('video: ajax params should be matched', function () {
-    //   const stubAjax = getSandbox().stub(Ajax, 'ajax');
-    //   Adapter.callBids(validVideoData_3);
-    //   sinon.assert.calledWith(stubAjax, sinon.match(invVastUrl, function () {
-    //   }, validJsonVideoParams, {method: 'GET'}));
-    // });
+    it('display: ajax params should be matched', function () {
+      Adapter.callBids(validData_1);
+      sinon.assert.calledWith(stubAjax, sinon.match(invUrl, function () {
+      }, validJsonParams, {method: 'GET'}));
+    });
+    it('video: ajax params should be matched', function () {
+      Adapter.callBids(validVideoData_3);
+      sinon.assert.calledWith(stubAjax, sinon.match(invVastUrl, function () {
+      }, validJsonVideoParams, {method: 'GET'}));
+    });
   });
   describe('bid request with invalid data', function () {
+    var addBidResponse, stubAjax;
+    beforeEach(function () {
+      addBidResponse = sinon.stub(bidmanager, 'addBidResponse');
+      stubAjax = sinon.stub(Ajax, 'ajax');
+    });
+
+    afterEach(function () {
+      addBidResponse.restore();
+      stubAjax.restore();
+    });
     it('display: ajax shouldn\'t be called', function () {
-      const addBidResponse = getSandbox().stub(bidmanager, 'addBidResponse');
-      const stubAjax = getSandbox().stub(Ajax, 'ajax');
       Adapter.callBids(invalidData);
       sinon.assert.notCalled(stubAjax);
     });
     it('video: ajax shouldn\'t be called', function () {
-      const addBidResponse = getSandbox().stub(bidmanager, 'addBidResponse');
-      const stubAjax = getSandbox().stub(Ajax, 'ajax');
       Adapter.callBids(invalidVideoData);
       sinon.assert.notCalled(stubAjax);
     });
     it('display: bidmanager.addBidResponse status code must to be equal "' + CONSTANTS.STATUS.NO_BID + '"', function () {
-      const addBidResponse = getSandbox().stub(bidmanager, 'addBidResponse');
-      getSandbox().stub(Ajax, 'ajax');
       Adapter.callBids(invalidData);
       expect(addBidResponse.firstCall.args[1].getStatusCode()).to.equal(CONSTANTS.STATUS.NO_BID);
       expect(addBidResponse.firstCall.args[1].bidderCode).to.equal('admixer');
     });
     it('video: bidmanager.addBidResponse status code must to be equal "' + CONSTANTS.STATUS.NO_BID + '"', function () {
-      const addBidResponse = getSandbox().stub(bidmanager, 'addBidResponse');
-      getSandbox().stub(Ajax, 'ajax');
       Adapter.callBids(invalidVideoData);
       expect(addBidResponse.firstCall.args[1].getStatusCode()).to.equal(CONSTANTS.STATUS.NO_BID);
       expect(addBidResponse.firstCall.args[1].bidderCode).to.equal('admixer');
     });
   });
   describe('bid response', function () {
+    var addBidResponse;
+    beforeEach(function () {
+      addBidResponse = sinon.stub(bidmanager, 'addBidResponse');
+    });
+    afterEach(function () {
+      addBidResponse.restore();
+    });
     it('display: response with ad. bidmanager.addBidResponse status code must to be equal "' + CONSTANTS.STATUS.GOOD + '"', function () {
-      const addBidResponse = getSandbox().stub(bidmanager, 'addBidResponse');
       Adapter.responseCallback(responseWithAd);
       var arg = addBidResponse.firstCall.args[1];
       expect(arg.getStatusCode()).to.equal(CONSTANTS.STATUS.GOOD);
       expect(arg.bidderCode).to.equal('admixer');
     });
     it('video: response with ad. bidmanager.addBidResponse status code must to be equal "' + CONSTANTS.STATUS.GOOD + '"', function () {
-      const addBidResponse = getSandbox().stub(bidmanager, 'addBidResponse');
       Adapter.responseCallback(responseWithVideoAd);
       var arg = addBidResponse.firstCall.args[1];
       expect(arg.getStatusCode()).to.equal(CONSTANTS.STATUS.GOOD);
       expect(arg.bidderCode).to.equal('admixer');
     });
     it('display: response without ad. bidmanager.addBidResponse status code must to be equal "' + CONSTANTS.STATUS.NO_BID, function () {
-      const addBidResponse = getSandbox().stub(bidmanager, 'addBidResponse');
       Adapter.responseCallback(responseWithoutAd);
       var arg = addBidResponse.firstCall.args[1];
       expect(arg.getStatusCode()).to.equal(CONSTANTS.STATUS.NO_BID);
       expect(arg.bidderCode).to.equal('admixer');
     });
     it('video: response without ad. bidmanager.addBidResponse status code must to be equal "' + CONSTANTS.STATUS.NO_BID, function () {
-      const addBidResponse = getSandbox().stub(bidmanager, 'addBidResponse');
       Adapter.responseCallback(responseWithoutVideoAd);
       var arg = addBidResponse.firstCall.args[1];
       expect(arg.getStatusCode()).to.equal(CONSTANTS.STATUS.NO_BID);
       expect(arg.bidderCode).to.equal('admixer');
     });
     it('display/video: response empty. bidmanager.addBidResponse status code must to be equal "' + CONSTANTS.STATUS.NO_BID, function () {
-      const addBidResponse = getSandbox().stub(bidmanager, 'addBidResponse');
       Adapter.responseCallback(responseEmpty);
       var arg = addBidResponse.firstCall.args[1];
       expect(arg.getStatusCode()).to.equal(CONSTANTS.STATUS.NO_BID);
diff --git a/test/spec/modules/atomxBidAdapter_spec.js b/test/spec/modules/atomxBidAdapter_spec.js
index 2c2d63d3688..646061912e7 100644
--- a/test/spec/modules/atomxBidAdapter_spec.js
+++ b/test/spec/modules/atomxBidAdapter_spec.js
@@ -1,5 +1,3 @@
-import useSandbox from 'test/mocks/sandbox';
-
 var chai = require('chai');
 var Adapter = require('modules/atomxBidAdapter')();
 var Ajax = require('src/ajax');
@@ -65,10 +63,8 @@ describe('Atomx adapter', function () {
     size: '300x250'
   };
 
-  const getSandbox = useSandbox();
-
-  it('loads the tag code', function() {
-    var stubLoadScript = getSandbox().stub(adLoader, 'loadScript');
+  describe('loads the tag code', function() {
+    var stubLoadScript = sinon.stub(adLoader, 'loadScript');
     Adapter.callBids(validData_1);
     sinon.assert.calledOnce(stubLoadScript);
     let url = stubLoadScript.firstCall.args[0];
@@ -77,68 +73,74 @@ describe('Atomx adapter', function () {
     expect(callback).to.be.a('function');
   });
   describe('bid request with valid data', function () {
+    var stubAjax;
     beforeEach(function () {
       window.atomx_prebid = function() {
         return '/placement';
       };
+      stubAjax = sinon.stub(Ajax, 'ajax');
+    });
+    afterEach(function () {
+      stubAjax.restore();
     });
     it('bid request should be called. sizes style -> [[],[]]', function () {
-      const stubAjax = getSandbox().stub(Ajax, 'ajax');
       Adapter.callBids(validData_1);
       sinon.assert.calledTwice(stubAjax);
     });
-    // These tests began failing with the sinon 1.x -> 3.x upgrade. Unfortunately,
-    // they're not using a sinon 1.x API legally... so it's unclear exactly what
-    // they're supposed to be testing.
-    // it('bid request should be called. sizes style -> []', function () {
-    //   const stubAjax = getSandbox().stub(Ajax, 'ajax');
-    //   Adapter.callBids(validData_2);
-    //   sinon.assert.calledOnce(stubAjax);
-    // });
-    // it('ajax params should be matched', function () {
-    //   const stubAjax = getSandbox().stub(Ajax, 'ajax');
-    //   Adapter.callBids(validData_1);
-    //   sinon.assert.calledWith(stubAjax, sinon.match('/placement', function () {
-    //   }, validJsonParams, {method: 'GET'}));
-    // });
+    it('bid request should be called. sizes style -> []', function () {
+      Adapter.callBids(validData_2);
+      sinon.assert.calledOnce(stubAjax);
+    });
+    it('ajax params should be matched', function () {
+      Adapter.callBids(validData_1);
+      sinon.assert.calledWith(stubAjax, sinon.match('/placement', function () {
+      }, validJsonParams, {method: 'GET'}));
+    });
   });
   describe('bid request with invalid data', function () {
+    var addBidResponse, stubAjax;
     beforeEach(function () {
       window.atomx_prebid = function() {
         return '/placement';
       };
+      addBidResponse = sinon.stub(bidmanager, 'addBidResponse');
+      stubAjax = sinon.stub(Ajax, 'ajax');
+    });
+    afterEach(function () {
+      addBidResponse.restore();
+      stubAjax.restore();
     });
     it('ajax shouldn\'t be called', function () {
-      const stubAjax = getSandbox().stub(Ajax, 'ajax');
-      getSandbox().stub(bidmanager, 'addBidResponse');
       Adapter.callBids(invalidData);
       sinon.assert.notCalled(stubAjax);
     });
     it('bidmanager.addBidResponse status code must to be equal "' + CONSTANTS.STATUS.NO_BID + '"', function () {
-      getSandbox().stub(Ajax, 'ajax');
-      const addBidResponse = getSandbox().stub(bidmanager, 'addBidResponse');
       Adapter.callBids(invalidData);
       expect(addBidResponse.firstCall.args[1].getStatusCode()).to.equal(CONSTANTS.STATUS.NO_BID);
       expect(addBidResponse.firstCall.args[1].bidderCode).to.equal('atomx');
     });
   });
   describe('bid response', function () {
+    var addBidResponse;
+    beforeEach(function () {
+      addBidResponse = sinon.stub(bidmanager, 'addBidResponse');
+    });
+    afterEach(function () {
+      addBidResponse.restore();
+    });
     it('with ad. bidmanager.addBidResponse status code must to be equal "' + CONSTANTS.STATUS.GOOD + '"', function () {
-      const addBidResponse = getSandbox().stub(bidmanager, 'addBidResponse');
       Adapter.responseCallback(validData_1.bids[0], responseWithAd);
       var arg = addBidResponse.firstCall.args[1];
       expect(arg.getStatusCode()).to.equal(CONSTANTS.STATUS.GOOD);
       expect(arg.bidderCode).to.equal('atomx');
     });
     it('without ad. bidmanager.addBidResponse status code must to be equal "' + CONSTANTS.STATUS.NO_BID, function () {
-      const addBidResponse = getSandbox().stub(bidmanager, 'addBidResponse');
       Adapter.responseCallback(validData_1.bids[0], responseWithoutAd);
       var arg = addBidResponse.firstCall.args[1];
       expect(arg.getStatusCode()).to.equal(CONSTANTS.STATUS.NO_BID);
       expect(arg.bidderCode).to.equal('atomx');
     });
     it('empty. bidmanager.addBidResponse status code must to be equal "' + CONSTANTS.STATUS.NO_BID, function () {
-      const addBidResponse = getSandbox().stub(bidmanager, 'addBidResponse');
       Adapter.responseCallback(validData_1.bids[0], responseEmpty);
       var arg = addBidResponse.firstCall.args[1];
       expect(arg.getStatusCode()).to.equal(CONSTANTS.STATUS.NO_BID);
diff --git a/test/spec/modules/coxBidAdapter_spec.js b/test/spec/modules/coxBidAdapter_spec.js
index ea5e39b78cd..ee1eb991f23 100644
--- a/test/spec/modules/coxBidAdapter_spec.js
+++ b/test/spec/modules/coxBidAdapter_spec.js
@@ -42,7 +42,7 @@ describe('CoxAdapter', () => {
 
     // ===== 1
     it('should provide a correctly populated Bid given a valid response', () => {
-      loadScriptStub = sinon.stub(adLoader, 'loadScript').callsFake(() => { emitScript(normalResponse); })
+      loadScriptStub = sinon.stub(adLoader, 'loadScript', () => { emitScript(normalResponse); })
 
       adapter.callBids(oneBidConfig);
 
@@ -54,7 +54,7 @@ describe('CoxAdapter', () => {
 
     // ===== 2
     it('should provide an empty Bid given a zero-price response', () => {
-      loadScriptStub = sinon.stub(adLoader, 'loadScript').callsFake(() => { emitScript(zeroPriceResponse); })
+      loadScriptStub = sinon.stub(adLoader, 'loadScript', () => { emitScript(zeroPriceResponse); })
 
       adapter.callBids(oneBidConfig);
 
@@ -65,7 +65,7 @@ describe('CoxAdapter', () => {
 
     // ===== 3
     it('should provide an empty Bid given an incomplete response', () => {
-      loadScriptStub = sinon.stub(adLoader, 'loadScript').callsFake(() => { emitScript(incompleteResponse); })
+      loadScriptStub = sinon.stub(adLoader, 'loadScript', () => { emitScript(incompleteResponse); })
 
       adapter.callBids(oneBidConfig);
 
@@ -76,7 +76,7 @@ describe('CoxAdapter', () => {
 
     // ===== 4
     it('should not provide a Bid given no response', () => {
-      loadScriptStub = sinon.stub(adLoader, 'loadScript').callsFake(() => { emitScript(''); });
+      loadScriptStub = sinon.stub(adLoader, 'loadScript', () => { emitScript(''); });
 
       adapter.callBids(oneBidConfig);
 
diff --git a/test/spec/modules/criteoBidAdapter_spec.js b/test/spec/modules/criteoBidAdapter_spec.js
index cd5255b141c..c8a49283c7a 100644
--- a/test/spec/modules/criteoBidAdapter_spec.js
+++ b/test/spec/modules/criteoBidAdapter_spec.js
@@ -132,7 +132,7 @@ describe('criteo adapter test', () => {
     });
 
     it('adds bid for valid request', (done) => {
-      stubAddBidResponse = sinon.stub(bidManager, 'addBidResponse').callsFake(function (adUnitCode, bid) {
+      stubAddBidResponse = sinon.stub(bidManager, 'addBidResponse', function (adUnitCode, bid) {
         expect(bid).to.satisfy(bid => { return bid.getStatusCode() == CONSTANTS.STATUS.GOOD });
         done();
       });
@@ -142,7 +142,7 @@ describe('criteo adapter test', () => {
 
     it('adds bid for multibid valid request', (done) => {
       let callCount = 0;
-      stubAddBidResponse = sinon.stub(bidManager, 'addBidResponse').callsFake(function (adUnitCode, bid) {
+      stubAddBidResponse = sinon.stub(bidManager, 'addBidResponse', function (adUnitCode, bid) {
         callCount++;
 
         if (callCount == 2) { done(); }
@@ -152,7 +152,7 @@ describe('criteo adapter test', () => {
     });
 
     it('adds bidderCode to the response of a valid request', (done) => {
-      stubAddBidResponse = sinon.stub(bidManager, 'addBidResponse').callsFake(function (adUnitCode, bid) {
+      stubAddBidResponse = sinon.stub(bidManager, 'addBidResponse', function (adUnitCode, bid) {
         expect(bid).to.have.property('bidderCode', 'criteo');
         done();
       });
@@ -161,7 +161,7 @@ describe('criteo adapter test', () => {
     });
 
     it('adds cpm to the response of a valid request', (done) => {
-      stubAddBidResponse = sinon.stub(bidManager, 'addBidResponse').callsFake(function (adUnitCode, bid) {
+      stubAddBidResponse = sinon.stub(bidManager, 'addBidResponse', function (adUnitCode, bid) {
         expect(bid).to.have.property('cpm', 1.12);
         done();
       });
@@ -169,7 +169,7 @@ describe('criteo adapter test', () => {
     });
 
     it('adds creative to the response of a valid request', (done) => {
-      stubAddBidResponse = sinon.stub(bidManager, 'addBidResponse').callsFake(function (adUnitCode, bid) {
+      stubAddBidResponse = sinon.stub(bidManager, 'addBidResponse', function (adUnitCode, bid) {
         expect(bid).to.have.property('ad', "<iframe src=\"fakeIframeSrc\" height=\"250\" width='350'></iframe>");
         done();
       });
@@ -187,7 +187,7 @@ describe('criteo adapter test', () => {
 
     it('adds creative to the response of a native valid request', (done) => {
       stubAddBidResponse = sinon.stub(
-        bidManager, 'addBidResponse').callsFake(
+        bidManager, 'addBidResponse',
         function (adUnitCode, bid) {
           let expectedAdProperty = `<script type=\"text/javascript\">
   let win = window;
@@ -218,7 +218,7 @@ describe('criteo adapter test', () => {
     it('no bid if cdb handler responds with no bid empty string response', (done) => {
       server.respondWith('');
 
-      stubAddBidResponse = sinon.stub(bidManager, 'addBidResponse').callsFake(function (adUnitCode, bid) {
+      stubAddBidResponse = sinon.stub(bidManager, 'addBidResponse', function (adUnitCode, bid) {
         expect(bid).to.satisfy(bid => { return bid.getStatusCode() == CONSTANTS.STATUS.NO_BID });
         done();
       });
@@ -229,7 +229,7 @@ describe('criteo adapter test', () => {
     it('no bid if cdb handler responds with no bid empty object response', (done) => {
       server.respondWith('{ }');
 
-      stubAddBidResponse = sinon.stub(bidManager, 'addBidResponse').callsFake(function (adUnitCode, bid) {
+      stubAddBidResponse = sinon.stub(bidManager, 'addBidResponse', function (adUnitCode, bid) {
         expect(bid).to.satisfy(bid => { return bid.getStatusCode() == CONSTANTS.STATUS.NO_BID });
         done();
       });
@@ -240,7 +240,7 @@ describe('criteo adapter test', () => {
     it('no bid if cdb handler responds with HTTP error', (done) => {
       server.respondWith([500, {}, 'Internal Server Error']);
 
-      stubAddBidResponse = sinon.stub(bidManager, 'addBidResponse').callsFake(function (adUnitCode, bid) {
+      stubAddBidResponse = sinon.stub(bidManager, 'addBidResponse', function (adUnitCode, bid) {
         expect(bid).to.satisfy(bid => { return bid.getStatusCode() == CONSTANTS.STATUS.NO_BID });
         done();
       });
@@ -251,7 +251,7 @@ describe('criteo adapter test', () => {
     it('no bid if response is invalid because response slots don\'t match input slots', (done) => {
       server.respondWith(JSON.stringify(invalidResponse));
 
-      stubAddBidResponse = sinon.stub(bidManager, 'addBidResponse').callsFake(function (adUnitCode, bid) {
+      stubAddBidResponse = sinon.stub(bidManager, 'addBidResponse', function (adUnitCode, bid) {
         expect(bid).to.satisfy(bid => { return bid.getStatusCode() == CONSTANTS.STATUS.NO_BID });
         done();
       });
diff --git a/test/spec/modules/gumgumBidAdapter_spec.js b/test/spec/modules/gumgumBidAdapter_spec.js
index e647d74cfbc..b90a1a48b15 100644
--- a/test/spec/modules/gumgumBidAdapter_spec.js
+++ b/test/spec/modules/gumgumBidAdapter_spec.js
@@ -101,13 +101,15 @@ describe('gumgum adapter', () => {
       window.DigiTrust = {
         getUser: function() {}
       };
-      sandbox.stub(window.DigiTrust, 'getUser').returns({
-        success: true,
-        identity: {
-          privacy: {optout: false},
-          id: 'testId'
-        }
-      });
+      sandbox.stub(window.DigiTrust, 'getUser', () =>
+        ({
+          success: true,
+          identity: {
+            privacy: {optout: false},
+            id: 'testId'
+          }
+        })
+      );
 
       adapter.callBids(bidderRequest);
       expect(adLoader.loadScript.firstCall.args[0]).to.include('&dt=testId');
@@ -123,13 +125,15 @@ describe('gumgum adapter', () => {
       window.DigiTrust = {
         getUser: function() {}
       };
-      sandbox.stub(window.DigiTrust, 'getUser').returns({
-        success: true,
-        identity: {
-          privacy: {optout: true},
-          id: 'testId'
-        }
-      });
+      sandbox.stub(window.DigiTrust, 'getUser', () =>
+        ({
+          success: true,
+          identity: {
+            privacy: {optout: true},
+            id: 'testId'
+          }
+        })
+      );
 
       adapter.callBids(bidderRequest);
       expect(adLoader.loadScript.firstCall.args[0]).to.not.include('&dt');
@@ -140,13 +144,15 @@ describe('gumgum adapter', () => {
       window.DigiTrust = {
         getUser: function() {}
       };
-      sandbox.stub(window.DigiTrust, 'getUser').returns({
-        success: false,
-        identity: {
-          privacy: {optout: false},
-          id: 'testId'
-        }
-      });
+      sandbox.stub(window.DigiTrust, 'getUser', () =>
+        ({
+          success: false,
+          identity: {
+            privacy: {optout: false},
+            id: 'testId'
+          }
+        })
+      );
 
       adapter.callBids(bidderRequest);
       expect(adLoader.loadScript.firstCall.args[0]).to.not.include('&dt');
diff --git a/test/spec/modules/hiromediaBidAdapter_spec.js b/test/spec/modules/hiromediaBidAdapter_spec.js
index d81f05bde76..c1ed4ee6e11 100644
--- a/test/spec/modules/hiromediaBidAdapter_spec.js
+++ b/test/spec/modules/hiromediaBidAdapter_spec.js
@@ -15,7 +15,6 @@ describe('hiromedia adapter', function () {
   let xhr;
   let addBidResponseStub;
   let hasValidBidRequestSpy;
-  let requests;
   let placementId = 0;
 
   window.$$PREBID_GLOBAL$$ = window.$$PREBID_GLOBAL$$ || {};
@@ -25,11 +24,7 @@ describe('hiromedia adapter', function () {
     sandbox = sinon.sandbox.create();
 
     // Used to spy on bid requests
-    requests = [];
     xhr = sandbox.useFakeXMLHttpRequest();
-    xhr.onCreate = (request) => {
-      requests.push(request);
-    };
 
     // Used to spy on bid responses
     addBidResponseStub = sandbox.stub(bidmanager, 'addBidResponse');
@@ -47,7 +42,7 @@ describe('hiromedia adapter', function () {
   // Helper function that asserts that no bidding activity (requests nor responses)
   // was made during a test.
   const assertNoBids = () => {
-    expect(requests.length).to.be.equal(0);
+    expect(xhr.requests.length).to.be.equal(0);
     sinon.assert.notCalled(addBidResponseStub);
   };
 
@@ -108,7 +103,7 @@ describe('hiromedia adapter', function () {
       };
 
       adapter.callBids(params);
-      expect(requests.length).to.equal(3);
+      expect(xhr.requests.length).to.equal(3);
       sinon.assert.notCalled(addBidResponseStub);
       sinon.assert.calledThrice(hasValidBidRequestSpy);
 
@@ -116,7 +111,7 @@ describe('hiromedia adapter', function () {
         expect(hasValidBidRequestSpy.returnValues[index]).to.be.equal(true);
 
         // validate request
-        const bidRequest = requests[index].url;
+        const bidRequest = xhr.requests[index].url;
         const defaultBidUrl = urlParse(DEFAULT_ENDPOINT);
         const bidUrl = urlParse(bidRequest, true);
         const query = bidUrl.query;
@@ -146,9 +141,9 @@ describe('hiromedia adapter', function () {
       };
 
       adapter.callBids(params);
-      expect(requests.length).to.be.equal(1);
+      expect(xhr.requests.length).to.be.equal(1);
 
-      const bidRequest = requests[0].url;
+      const bidRequest = xhr.requests[0].url;
       const bidUrl = urlParse(bidRequest, true);
       const query = bidUrl.query;
 
@@ -166,7 +161,7 @@ describe('hiromedia adapter', function () {
       };
 
       adapter.callBids(params);
-      expect(requests.length).to.be.equal(0);
+      expect(xhr.requests.length).to.be.equal(0);
       sinon.assert.calledOnce(hasValidBidRequestSpy);
       sinon.assert.calledOnce(addBidResponseStub);
 
@@ -188,9 +183,9 @@ describe('hiromedia adapter', function () {
       };
 
       adapter.callBids(params);
-      expect(requests.length).to.be.equal(1);
+      expect(xhr.requests.length).to.be.equal(1);
 
-      const bidRequest = requests[0].url;
+      const bidRequest = xhr.requests[0].url;
       const defaultBidUrl = urlParse(DEFAULT_ENDPOINT);
       const bidUrl = urlParse(bidRequest, true);
       const query = bidUrl.query;
@@ -302,7 +297,7 @@ describe('hiromedia adapter', function () {
       let randomIndex = 0;
 
       server.respondWith((request) => {
-        const mathRandomStub = sandbox.stub(Math, 'random').callsFake(function () {
+        const mathRandomStub = sandbox.stub(Math, 'random', function () {
           const randomValue = randomValues[randomIndex];
 
           randomIndex += 1;
diff --git a/test/spec/modules/huddledmassesBidAdapter_spec.js b/test/spec/modules/huddledmassesBidAdapter_spec.js
index ae1ad9ac53e..f4cc12dde1b 100644
--- a/test/spec/modules/huddledmassesBidAdapter_spec.js
+++ b/test/spec/modules/huddledmassesBidAdapter_spec.js
@@ -41,7 +41,7 @@ describe('HuddledMasses adapter tests', function () {
     beforeEach(() => {
       bids = [];
       server = sinon.fakeServer.create();
-      sandbox.stub(bidManager, 'addBidResponse').callsFake((elemId, bid) => {
+      sandbox.stub(bidManager, 'addBidResponse', (elemId, bid) => {
         bids.push(bid);
       });
     });
diff --git a/test/spec/modules/imonomyBidAdapter_spec.js b/test/spec/modules/imonomyBidAdapter_spec.js
index f6b8fd7e4da..e27a0d69a60 100644
--- a/test/spec/modules/imonomyBidAdapter_spec.js
+++ b/test/spec/modules/imonomyBidAdapter_spec.js
@@ -71,7 +71,7 @@ describe('imonomy adapter test', () => {
     });
 
     it('no bid if cdb handler responds with no bid empty string response', (done) => {
-      stubAddBidResponse = sinon.stub(bidManager, 'addBidResponse').callsFake(function (adUnitCode, bid) {
+      stubAddBidResponse = sinon.stub(bidManager, 'addBidResponse', function (adUnitCode, bid) {
         expect(bid).to.satisfy(bid => { return bid.getStatusCode() == CONSTANTS.STATUS.NO_BID });
         done();
       });
@@ -83,7 +83,7 @@ describe('imonomy adapter test', () => {
     });
 
     it('adds bid for valid request', (done) => {
-      stubAddBidResponse = sinon.stub(bidManager, 'addBidResponse').callsFake(function (adUnitCode, bid) {
+      stubAddBidResponse = sinon.stub(bidManager, 'addBidResponse', function (adUnitCode, bid) {
         expect(bid).to.satisfy(bid => { return bid.getStatusCode() == CONSTANTS.STATUS.GOOD });
         done();
       });
@@ -95,7 +95,7 @@ describe('imonomy adapter test', () => {
     });
 
     it('adds bid for valid request with UM', (done) => {
-      stubAddBidResponse = sinon.stub(bidManager, 'addBidResponse').callsFake(function (adUnitCode, bid) {
+      stubAddBidResponse = sinon.stub(bidManager, 'addBidResponse', function (adUnitCode, bid) {
         expect(bid).to.satisfy(bid => { return bid.getStatusCode() == CONSTANTS.STATUS.GOOD });
         done();
       });
diff --git a/test/spec/modules/improvedigitalBidAdapter_spec.js b/test/spec/modules/improvedigitalBidAdapter_spec.js
index a36c516d365..c781406da6e 100644
--- a/test/spec/modules/improvedigitalBidAdapter_spec.js
+++ b/test/spec/modules/improvedigitalBidAdapter_spec.js
@@ -359,7 +359,9 @@ describe('improvedigital adapter tests', function () {
   beforeEach(() => {
     improveDigitalAdapter = new Adapter();
     sandbox = sinon.sandbox.create();
-    sandbox.stub(utils, 'getUniqueIdentifierStr').callsFake(
+    sandbox.stub(
+      utils,
+      'getUniqueIdentifierStr',
       function() {
         var retValue = randomNumber.toString();
         randomNumber++;
diff --git a/test/spec/modules/justpremiumBidAdapter_spec.js b/test/spec/modules/justpremiumBidAdapter_spec.js
index 06e55409bf6..d4bb8547eba 100644
--- a/test/spec/modules/justpremiumBidAdapter_spec.js
+++ b/test/spec/modules/justpremiumBidAdapter_spec.js
@@ -33,13 +33,15 @@ describe('justpremium adapter', () => {
         }
       };
       sandbox = sinon.sandbox.create();
-      sandbox.stub(adLoader, 'loadScript').callsFake((url, callback) => {
+      sandbox.stub(adLoader, 'loadScript', (url, callback) => {
         if (url === window.location.protocol + CONST.LIB) {
           window.Jpx = factory;
           callback();
         }
       });
-      sandbox.stub(factory.JAM, 'instance').returns({});
+      sandbox.stub(factory.JAM, 'instance', () => {
+        return {};
+      })
     });
 
     afterEach(() => {
@@ -247,7 +249,7 @@ describe('justpremium adapter', () => {
 
     it('should add empty bid if there was no valid response', () => {
       adLoader.loadScript.restore();
-      const stubLoadScript = sandbox.stub(adLoader, 'loadScript').callsFake((url, callback) => {
+      const stubLoadScript = sandbox.stub(adLoader, 'loadScript', (url, callback) => {
         if (callback) {
           callback(new Error('test'));
         }
@@ -301,13 +303,13 @@ describe('justpremium adapter', () => {
         ]
       };
 
-      const stubLoadScript = sandbox.stub(adLoader, 'loadScript').callsFake((url, callback) => {
+      const stubLoadScript = sandbox.stub(adLoader, 'loadScript', (url, callback) => {
         if (callback) {
           callback();
         }
       });
       const stubAddBidResponse = sandbox.stub(bidmanager, 'addBidResponse');
-      const stubCreateBid = sandbox.stub(jPAM.cb.bidder20000, 'createBid').callsFake((factory) => {
+      const stubCreateBid = sandbox.stub(jPAM.cb.bidder20000, 'createBid', (factory) => {
         return factory();
       });
 
@@ -351,13 +353,13 @@ describe('justpremium adapter', () => {
         format: 'wp'
       };
 
-      const stubLoadScript = sandbox.stub(adLoader, 'loadScript').callsFake((url, callback) => {
+      const stubLoadScript = sandbox.stub(adLoader, 'loadScript', (url, callback) => {
         if (callback) {
           callback();
         }
       });
       const stubAddBidResponse = sandbox.stub(bidmanager, 'addBidResponse');
-      const stubCreateBid = sandbox.stub(jPAM.cb.bidder20000, 'createBid').callsFake((factory) => {
+      const stubCreateBid = sandbox.stub(jPAM.cb.bidder20000, 'createBid', (factory) => {
         const bid = factory({});
 
         Object.assign(bid, responseData);
diff --git a/test/spec/modules/kargoBidAdapter_spec.js b/test/spec/modules/kargoBidAdapter_spec.js
index 3904c4bc88f..f74457d9f9b 100644
--- a/test/spec/modules/kargoBidAdapter_spec.js
+++ b/test/spec/modules/kargoBidAdapter_spec.js
@@ -93,7 +93,7 @@ describe('kargo adapter tests', function () {
   }
 
   function simulateAdLoader() {
-    sandbox.stub(adloader, 'loadScript').callsFake((url) => {
+    sandbox.stub(adloader, 'loadScript', (url) => {
       window.$$PREBID_GLOBAL$$.kargo_prebid_f4cf851b_665a_43d7_b22c_33c8fdebe577(adUnits);
       krakenParams = JSON.parse(decodeURIComponent(url.match(/\?json=(.*)&cb=/)[1]));
     });
diff --git a/test/spec/modules/lifestreetBidAdapter_spec.js b/test/spec/modules/lifestreetBidAdapter_spec.js
index 2ec8c6b518c..bb93ad90ef2 100644
--- a/test/spec/modules/lifestreetBidAdapter_spec.js
+++ b/test/spec/modules/lifestreetBidAdapter_spec.js
@@ -45,7 +45,7 @@ describe('LifestreetAdapter', () => {
       beforeEach(() => {
         tagRequests = [];
         request = cloneJson(BIDDER_REQUEST);
-        sinon.stub(adloader, 'loadScript').callsFake((url, callback) => {
+        sinon.stub(adloader, 'loadScript', (url, callback) => {
           tagRequests.push(url);
           callback();
         });
@@ -145,7 +145,7 @@ describe('LifestreetAdapter', () => {
 
       beforeEach(() => {
         sinon.stub(bidmanager, 'addBidResponse');
-        sinon.stub(adloader, 'loadScript').callsFake((url, callback) => {
+        sinon.stub(adloader, 'loadScript', (url, callback) => {
           callback();
         });
         slot = {};
diff --git a/test/spec/modules/mantisBidAdapter_spec.js b/test/spec/modules/mantisBidAdapter_spec.js
index d45c456b361..ac072aacccf 100644
--- a/test/spec/modules/mantisBidAdapter_spec.js
+++ b/test/spec/modules/mantisBidAdapter_spec.js
@@ -52,7 +52,7 @@ describe('mantis adapter tests', function () {
   describe('callBids', () => {
     it('should create appropriate bid responses', () => {
       sandbox.stub(bidmanager, 'addBidResponse');
-      sandbox.stub(adloader, 'loadScript').callsFake(function (url) {
+      sandbox.stub(adloader, 'loadScript', function (url) {
         var jsonp = eval(decodeURIComponent(url.match(/jsonp=(.*)&property/)[1]));
 
         jsonp({
diff --git a/test/spec/modules/mobfoxBidAdapter_spec.js b/test/spec/modules/mobfoxBidAdapter_spec.js
index 1b2dde1abb1..f2819009908 100644
--- a/test/spec/modules/mobfoxBidAdapter_spec.js
+++ b/test/spec/modules/mobfoxBidAdapter_spec.js
@@ -57,7 +57,7 @@ describe('mobfox adapter tests', function () {
     }
   }
   function createMobfoxErrorStub() {
-    return sinon.stub(ajax, 'ajax').callsFake((url, callbacks) => {
+    return sinon.stub(ajax, 'ajax', (url, callbacks) => {
       callbacks.success(
         JSON.stringify({error: 'No Ad Available'}),
         xhrMock
@@ -66,7 +66,7 @@ describe('mobfox adapter tests', function () {
   }
 
   function createMobfoxSuccessStub() {
-    return sinon.stub(ajax, 'ajax').callsFake((url, callbacks) => {
+    return sinon.stub(ajax, 'ajax', (url, callbacks) => {
       callbacks.success(
         JSON.stringify(mockResponses.banner)
         , xhrMock
diff --git a/test/spec/modules/openxBidAdapter_spec.js b/test/spec/modules/openxBidAdapter_spec.js
index 6d35e039033..21ceb5a6dec 100644
--- a/test/spec/modules/openxBidAdapter_spec.js
+++ b/test/spec/modules/openxBidAdapter_spec.js
@@ -16,7 +16,7 @@ describe('openx adapter tests', function () {
     };
 
     beforeEach(() => {
-      stubAjax = sinon.stub(ajax, 'ajax').callsFake(responseHandlerCallback);
+      stubAjax = sinon.stub(ajax, 'ajax', responseHandlerCallback);
       stubAddBidResponse = sinon.stub(bidmanager, 'addBidResponse');
       sinon.stub(document.body, 'appendChild');
     });
diff --git a/test/spec/modules/rubiconBidAdapter_spec.js b/test/spec/modules/rubiconBidAdapter_spec.js
index dcb255ffa5b..02c07ef85af 100644
--- a/test/spec/modules/rubiconBidAdapter_spec.js
+++ b/test/spec/modules/rubiconBidAdapter_spec.js
@@ -193,21 +193,16 @@ describe('the rubicon adapter', () => {
 
     describe('for requests', () => {
       let xhr,
-        bids,
-        requests;
+        bids;
 
       beforeEach(() => {
         rubiconAdapter = new RubiconAdapter();
 
         bids = [];
-        requests = [];
 
         xhr = sandbox.useFakeXMLHttpRequest();
-        xhr.onCreate = (request) => {
-          requests.push(request);
-        }
 
-        sandbox.stub(bidManager, 'addBidResponse').callsFake((elemId, bid) => {
+        sandbox.stub(bidManager, 'addBidResponse', (elemId, bid) => {
           bids.push(bid);
         });
       });
@@ -220,7 +215,7 @@ describe('the rubicon adapter', () => {
         it('should make a well-formed request', () => {
           rubiconAdapter.callBids(bidderRequest);
 
-          let request = requests[0];
+          let request = xhr.requests[0];
 
           let [path, query] = request.url.split('?');
           query = parseQuery(query);
@@ -268,7 +263,7 @@ describe('the rubicon adapter', () => {
 
           rubiconAdapter.callBids(sizesBidderRequest);
 
-          let query = parseQuery(requests[0].url.split('?')[1]);
+          let query = parseQuery(xhr.requests[0].url.split('?')[1]);
 
           expect(query['size_id']).to.equal('55');
           expect(query['alt_size_ids']).to.equal('57,59');
@@ -280,7 +275,7 @@ describe('the rubicon adapter', () => {
 
           rubiconAdapter.callBids(sizesBidderRequest);
 
-          expect(requests.length).to.equal(0);
+          expect(xhr.requests.length).to.equal(0);
 
           expect(bidManager.addBidResponse.calledOnce).to.equal(true);
           expect(bids).to.be.lengthOf(1);
@@ -293,7 +288,7 @@ describe('the rubicon adapter', () => {
 
           rubiconAdapter.callBids(noAccountBidderRequest);
 
-          expect(requests.length).to.equal(0);
+          expect(xhr.requests.length).to.equal(0);
           expect(bidManager.addBidResponse.calledOnce).to.equal(true);
           expect(bids).to.be.lengthOf(1);
           expect(bids[0].getStatusCode()).to.equal(CONSTANTS.STATUS.NO_BID);
@@ -305,7 +300,7 @@ describe('the rubicon adapter', () => {
 
           rubiconAdapter.callBids(floorBidderRequest);
 
-          let query = parseQuery(requests[0].url.split('?')[1]);
+          let query = parseQuery(xhr.requests[0].url.split('?')[1]);
 
           expect(query['rp_floor']).to.equal('2');
         });
@@ -314,7 +309,7 @@ describe('the rubicon adapter', () => {
           window.DigiTrust = {
             getUser: function() {}
           };
-          sandbox.stub(window.DigiTrust, 'getUser').callsFake(() =>
+          sandbox.stub(window.DigiTrust, 'getUser', () =>
             ({
               success: true,
               identity: {
@@ -327,7 +322,7 @@ describe('the rubicon adapter', () => {
 
           rubiconAdapter.callBids(bidderRequest);
 
-          let request = requests[0];
+          let request = xhr.requests[0];
 
           let query = request.url.split('?')[1];
           query = parseQuery(query);
@@ -350,7 +345,7 @@ describe('the rubicon adapter', () => {
         it('should not send digitrust params when DigiTrust not loaded', () => {
           rubiconAdapter.callBids(bidderRequest);
 
-          let request = requests[0];
+          let request = xhr.requests[0];
 
           let query = request.url.split('?')[1];
           query = parseQuery(query);
@@ -367,7 +362,7 @@ describe('the rubicon adapter', () => {
           window.DigiTrust = {
             getUser: function() {}
           };
-          sandbox.stub(window.DigiTrust, 'getUser').callsFake(() =>
+          sandbox.stub(window.DigiTrust, 'getUser', () =>
             ({
               success: true,
               identity: {
@@ -380,7 +375,7 @@ describe('the rubicon adapter', () => {
 
           rubiconAdapter.callBids(bidderRequest);
 
-          let request = requests[0];
+          let request = xhr.requests[0];
 
           let query = request.url.split('?')[1];
           query = parseQuery(query);
@@ -399,7 +394,7 @@ describe('the rubicon adapter', () => {
           window.DigiTrust = {
             getUser: function() {}
           };
-          sandbox.stub(window.DigiTrust, 'getUser').callsFake(() =>
+          sandbox.stub(window.DigiTrust, 'getUser', () =>
             ({
               success: false,
               identity: {
@@ -412,7 +407,7 @@ describe('the rubicon adapter', () => {
 
           rubiconAdapter.callBids(bidderRequest);
 
-          let request = requests[0];
+          let request = xhr.requests[0];
 
           let query = request.url.split('?')[1];
           query = parseQuery(query);
@@ -442,7 +437,7 @@ describe('the rubicon adapter', () => {
           });
 
           it('should send digiTrustId config params', () => {
-            sinon.stub(window.$$PREBID_GLOBAL$$, 'getConfig').callsFake((key) => {
+            sinon.stub(window.$$PREBID_GLOBAL$$, 'getConfig', (key) => {
               var config = {
                 digiTrustId: {
                   success: true,
@@ -458,7 +453,7 @@ describe('the rubicon adapter', () => {
 
             rubiconAdapter.callBids(bidderRequest);
 
-            let request = requests[0];
+            let request = xhr.requests[0];
 
             let query = request.url.split('?')[1];
             query = parseQuery(query);
@@ -479,7 +474,7 @@ describe('the rubicon adapter', () => {
           });
 
           it('should not send digiTrustId config params due to optout', () => {
-            sinon.stub(window.$$PREBID_GLOBAL$$, 'getConfig').callsFake((key) => {
+            sinon.stub(window.$$PREBID_GLOBAL$$, 'getConfig', (key) => {
               var config = {
                 digiTrustId: {
                   success: true,
@@ -495,7 +490,7 @@ describe('the rubicon adapter', () => {
 
             rubiconAdapter.callBids(bidderRequest);
 
-            let request = requests[0];
+            let request = xhr.requests[0];
 
             let query = request.url.split('?')[1];
             query = parseQuery(query);
@@ -512,7 +507,7 @@ describe('the rubicon adapter', () => {
           });
 
           it('should not send digiTrustId config params due to failure', () => {
-            sinon.stub(window.$$PREBID_GLOBAL$$, 'getConfig').callsFake((key) => {
+            sinon.stub(window.$$PREBID_GLOBAL$$, 'getConfig', (key) => {
               var config = {
                 digiTrustId: {
                   success: false,
@@ -528,7 +523,7 @@ describe('the rubicon adapter', () => {
 
             rubiconAdapter.callBids(bidderRequest);
 
-            let request = requests[0];
+            let request = xhr.requests[0];
 
             let query = request.url.split('?')[1];
             query = parseQuery(query);
@@ -545,14 +540,14 @@ describe('the rubicon adapter', () => {
           });
 
           it('should not send digiTrustId config params if they do not exist', () => {
-            sinon.stub(window.$$PREBID_GLOBAL$$, 'getConfig').callsFake((key) => {
+            sinon.stub(window.$$PREBID_GLOBAL$$, 'getConfig', (key) => {
               var config = {};
               return config[key];
             });
 
             rubiconAdapter.callBids(bidderRequest);
 
-            let request = requests[0];
+            let request = xhr.requests[0];
 
             let query = request.url.split('?')[1];
             query = parseQuery(query);
@@ -584,13 +579,13 @@ describe('the rubicon adapter', () => {
         it('should make a well-formed video request', () => {
           createVideoBidderRequest();
 
-          sandbox.stub(Date, 'now').callsFake(() =>
+          sandbox.stub(Date, 'now', () =>
             bidderRequest.auctionStart + 100
           );
 
           rubiconAdapter.callBids(bidderRequest);
 
-          let request = requests[0];
+          let request = xhr.requests[0];
 
           let url = request.url;
           let post = JSON.parse(request.requestBody);
@@ -646,7 +641,7 @@ describe('the rubicon adapter', () => {
         it('should allow a floor price override', () => {
           createVideoBidderRequest();
 
-          sandbox.stub(Date, 'now').callsFake(() =>
+          sandbox.stub(Date, 'now', () =>
             bidderRequest.auctionStart + 100
           );
 
@@ -657,7 +652,7 @@ describe('the rubicon adapter', () => {
 
           rubiconAdapter.callBids(floorBidderRequest);
 
-          let request = requests[0];
+          let request = xhr.requests[0];
           let post = JSON.parse(request.requestBody);
 
           let floor = post.slots[0].floor;
@@ -667,7 +662,7 @@ describe('the rubicon adapter', () => {
 
         it('should trap when no video object is passed in', () => {
           createVideoBidderRequestNoVideo();
-          sandbox.stub(Date, 'now').callsFake(() =>
+          sandbox.stub(Date, 'now', () =>
             bidderRequest.auctionStart + 100
           );
 
@@ -675,12 +670,12 @@ describe('the rubicon adapter', () => {
 
           rubiconAdapter.callBids(floorBidderRequest);
 
-          expect(requests.length).to.equal(0);
+          expect(xhr.requests.length).to.equal(0);
         });
 
         it('should get size from bid.sizes too', () => {
           createVideoBidderRequestNoPlayer();
-          sandbox.stub(Date, 'now').callsFake(() =>
+          sandbox.stub(Date, 'now', () =>
             bidderRequest.auctionStart + 100
           );
 
@@ -688,7 +683,7 @@ describe('the rubicon adapter', () => {
 
           rubiconAdapter.callBids(floorBidderRequest);
 
-          let request = requests[0];
+          let request = xhr.requests[0];
           let post = JSON.parse(request.requestBody);
 
           expect(post.slots[0].width).to.equal(300);
@@ -707,7 +702,7 @@ describe('the rubicon adapter', () => {
 
         server = sinon.fakeServer.create();
 
-        sandbox.stub(bidManager, 'addBidResponse').callsFake((elemId, bid) => {
+        sandbox.stub(bidManager, 'addBidResponse', (elemId, bid) => {
           bids.push(bid);
           if (addBidResponseAction) {
             addBidResponseAction();
@@ -1047,7 +1042,7 @@ describe('the rubicon adapter', () => {
       server = sinon.fakeServer.create();
       clock = sinon.useFakeTimers();
 
-      sandbox.stub(bidManager, 'addBidResponse').callsFake((elemId, bid) => {
+      sandbox.stub(bidManager, 'addBidResponse', (elemId, bid) => {
         bids.push(bid);
         if (addBidResponseAction) {
           addBidResponseAction();
@@ -1107,7 +1102,7 @@ describe('the rubicon adapter', () => {
     });
 
     it('should not add the Emily iframe by default', () => {
-      sinon.stub(window.$$PREBID_GLOBAL$$, 'getConfig').callsFake((key) => {
+      sinon.stub(window.$$PREBID_GLOBAL$$, 'getConfig', (key) => {
         var config = { rubicon: {
           userSync: {delay: 10}
         }};
@@ -1128,7 +1123,7 @@ describe('the rubicon adapter', () => {
     });
 
     it('should add the Emily iframe when enabled', () => {
-      sinon.stub(window.$$PREBID_GLOBAL$$, 'getConfig').callsFake((key) => {
+      sinon.stub(window.$$PREBID_GLOBAL$$, 'getConfig', (key) => {
         var config = { rubicon: {
           userSync: {enabled: true, delay: 20}
         }};
@@ -1149,7 +1144,7 @@ describe('the rubicon adapter', () => {
     });
 
     it('should not fire more than once', () => {
-      sinon.stub(window.$$PREBID_GLOBAL$$, 'getConfig').callsFake((key) => {
+      sinon.stub(window.$$PREBID_GLOBAL$$, 'getConfig', (key) => {
         var config = { rubicon: {
           userSync: {enabled: true, delay: 100}
         }};
@@ -1177,7 +1172,7 @@ describe('the rubicon adapter', () => {
     });
 
     it('should not add the Emily iframe when disabled', () => {
-      sinon.stub(window.$$PREBID_GLOBAL$$, 'getConfig').callsFake((key) => {
+      sinon.stub(window.$$PREBID_GLOBAL$$, 'getConfig', (key) => {
         var config = { rubicon: {
           userSync: {enabled: false, delay: 50}
         }};
diff --git a/test/spec/modules/smartadserverBidAdapter_spec.js b/test/spec/modules/smartadserverBidAdapter_spec.js
index a4049c7df30..bfb89cf4ead 100644
--- a/test/spec/modules/smartadserverBidAdapter_spec.js
+++ b/test/spec/modules/smartadserverBidAdapter_spec.js
@@ -103,7 +103,7 @@ describe('smartadserver adapter tests', function () {
   });
 
   it('creates an empty bid response if no bids', function() {
-    var stubLoadScript = sinon.stub(adLoader, 'loadScript').callsFake(function(url) {
+    var stubLoadScript = sinon.stub(adLoader, 'loadScript', function(url) {
       var bidUrl = stubLoadScript.getCall(0).args[0];
       var parsedBidUrl = urlParse(bidUrl);
       var parsedBidUrlQueryString = querystringify.parse(parsedBidUrl.query);
@@ -126,7 +126,7 @@ describe('smartadserver adapter tests', function () {
   });
 
   it('creates a bid response if bid is returned', function() {
-    var stubLoadScript = sinon.stub(adLoader, 'loadScript').callsFake(function(url) {
+    var stubLoadScript = sinon.stub(adLoader, 'loadScript', function(url) {
       var bidUrl = stubLoadScript.getCall(0).args[0];
       var parsedBidUrl = urlParse(bidUrl);
       var parsedBidUrlQueryString = querystringify.parse(parsedBidUrl.query);
diff --git a/test/spec/modules/smartyadsBidAdapter_spec.js b/test/spec/modules/smartyadsBidAdapter_spec.js
index dd303f41770..d7c723604a6 100644
--- a/test/spec/modules/smartyadsBidAdapter_spec.js
+++ b/test/spec/modules/smartyadsBidAdapter_spec.js
@@ -42,7 +42,7 @@ describe('Smartyads adapter tests', function () {
       bids = [];
       server = sinon.fakeServer.create();
 
-      sandbox.stub(bidManager, 'addBidResponse').callsFake((elemId, bid) => {
+      sandbox.stub(bidManager, 'addBidResponse', (elemId, bid) => {
         bids.push(bid);
       });
     });
diff --git a/test/spec/modules/spotxBidAdapter_spec.js b/test/spec/modules/spotxBidAdapter_spec.js
index ae68d4cb777..1b48111b79e 100644
--- a/test/spec/modules/spotxBidAdapter_spec.js
+++ b/test/spec/modules/spotxBidAdapter_spec.js
@@ -170,7 +170,7 @@ describe('spotx adapter tests', () => {
           }
         };
 
-        loadScriptStub = sinon.stub(adLoader, 'loadScript').callsFake(function(url, callback) {
+        loadScriptStub = sinon.stub(adLoader, 'loadScript', function(url, callback) {
           callback();
         });
       });
@@ -180,7 +180,7 @@ describe('spotx adapter tests', () => {
       });
 
       it('should add bid response on success', (done) => {
-        sinon.stub(bidManager, 'addBidResponse').callsFake((placementCode, bid) => {
+        sinon.stub(bidManager, 'addBidResponse', (placementCode, bid) => {
           expect(placementCode).to.equal('video1');
           expect(bid.bidderCode).to.equal('spotx');
           expect(bid.cpm).to.equal(20);
@@ -202,7 +202,7 @@ describe('spotx adapter tests', () => {
       });
 
       it('should add failed bid response on error', (done) => {
-        sinon.stub(bidManager, 'addBidResponse').callsFake((placementCode, bid) => {
+        sinon.stub(bidManager, 'addBidResponse', (placementCode, bid) => {
           expect(placementCode).to.equal('video1');
           expect(bid.bidderCode).to.equal('spotx');
           expect(bid.statusMessage).to.equal('Bid returned empty or error response');
diff --git a/test/spec/modules/tapsenseBidAdapter_spec.js b/test/spec/modules/tapsenseBidAdapter_spec.js
index b2f2fcf1be7..71f61af2a65 100644
--- a/test/spec/modules/tapsenseBidAdapter_spec.js
+++ b/test/spec/modules/tapsenseBidAdapter_spec.js
@@ -209,7 +209,7 @@ describe('TapSenseAdapter', () => {
       sandbox.stub(bidmanager, 'addBidResponse');
       sandbox.stub(adloader, 'loadScript');
       let bids = makeSuccessfulRequest(adapter);
-      sandbox.stub(utils, 'getBidRequest').callsFake((id) => {
+      sandbox.stub(utils, 'getBidRequest', (id) => {
         return bids.find((item) => { return item.bidId === id });
       })
     });
diff --git a/test/spec/modules/thoughtleadrBidAdapter_spec.js b/test/spec/modules/thoughtleadrBidAdapter_spec.js
index 6bb1dd4f80e..3cd2a49e888 100644
--- a/test/spec/modules/thoughtleadrBidAdapter_spec.js
+++ b/test/spec/modules/thoughtleadrBidAdapter_spec.js
@@ -61,7 +61,7 @@ describe('thoughtleadr adapter tests', function () {
 
   describe('requestPlacement', function () {
     it('should request header-bid.json', function () {
-      ajaxMock = sandbox.stub(ajax, 'ajax').callsFake(function (url, cb) {
+      ajaxMock = sandbox.stub(ajax, 'ajax', function (url, cb) {
         cb(JSON.stringify({
           header_bid_token: 'asd',
           media_type: 'article',
@@ -76,7 +76,7 @@ describe('thoughtleadr adapter tests', function () {
     });
 
     it('should request header-bid.json without bids', function () {
-      ajaxMock = sandbox.stub(ajax, 'ajax').callsFake(function (url, cb) {
+      ajaxMock = sandbox.stub(ajax, 'ajax', function (url, cb) {
         cb(JSON.stringify({}));
       });
 
@@ -88,7 +88,7 @@ describe('thoughtleadr adapter tests', function () {
     });
 
     it('should sync cookies', function () {
-      ajaxMock = sandbox.stub(ajax, 'ajax').callsFake(function (url, cb) {
+      ajaxMock = sandbox.stub(ajax, 'ajax', function (url, cb) {
         cb(JSON.stringify({
           header_bid_token: 'asd',
           media_type: 'article',
diff --git a/test/spec/modules/twengaBidAdapter_spec.js b/test/spec/modules/twengaBidAdapter_spec.js
index f1e7112393d..dcead6c4578 100644
--- a/test/spec/modules/twengaBidAdapter_spec.js
+++ b/test/spec/modules/twengaBidAdapter_spec.js
@@ -68,7 +68,7 @@ describe('twenga adapter tests', function () {
   };
 
   it('creates an empty bid response if no bids', function() {
-    var stubLoadScript = sinon.stub(adLoader, 'loadScript').callsFake(function(url) {
+    var stubLoadScript = sinon.stub(adLoader, 'loadScript', function(url) {
       var bidUrl = stubLoadScript.getCall(0).args[0];
       var parsedBidUrl = urlParse(bidUrl);
       var parsedBidUrlQueryString = querystringify.parse(parsedBidUrl.query);
@@ -88,7 +88,7 @@ describe('twenga adapter tests', function () {
   });
 
   it('creates a bid response if bid is returned', function() {
-    var stubLoadScript = sinon.stub(adLoader, 'loadScript').callsFake(function(url) {
+    var stubLoadScript = sinon.stub(adLoader, 'loadScript', function(url) {
       var bidUrl = stubLoadScript.getCall(0).args[0];
       var parsedBidUrl = urlParse(bidUrl);
       var parsedBidUrlQueryString = querystringify.parse(parsedBidUrl.query);
diff --git a/test/spec/modules/ucfunnelBidAdapter_spec.js b/test/spec/modules/ucfunnelBidAdapter_spec.js
index 9a0207deb91..d8ddfc041b6 100644
--- a/test/spec/modules/ucfunnelBidAdapter_spec.js
+++ b/test/spec/modules/ucfunnelBidAdapter_spec.js
@@ -43,7 +43,7 @@ describe('ucfunnel adapter tests', function () {
       bids = [];
       server = sinon.fakeServer.create();
 
-      sandbox.stub(bidManager, 'addBidResponse').callsFake((elemId, bid) => {
+      sandbox.stub(bidManager, 'addBidResponse', (elemId, bid) => {
         bids.push(bid);
       });
     });
diff --git a/test/spec/modules/yieldbotBidAdapter_spec.js b/test/spec/modules/yieldbotBidAdapter_spec.js
index ad860009ec8..a29d441e751 100644
--- a/test/spec/modules/yieldbotBidAdapter_spec.js
+++ b/test/spec/modules/yieldbotBidAdapter_spec.js
@@ -114,13 +114,17 @@ function setupTest(testRequest, force = false) {
   yieldbotLibStub.enableAsync = sandbox.stub(window.yieldbot, 'enableAsync');
 
   yieldbotLibStub.getSlotCriteria =
-    sandbox.stub(window.yieldbot, 'getSlotCriteria').callsFake(
+    sandbox.stub(
+      window.yieldbot,
+      'getSlotCriteria',
       (slotName) => {
         return YB_BID_FIXTURE[slotName] || {ybot_ad: 'n'};
       });
 
   yieldbotLibStub.go =
-    sandbox.stub(window.yieldbot, 'go').callsFake(
+    sandbox.stub(
+      window.yieldbot,
+      'go',
       () => {
         window.yieldbot._initialized = true;
       });
diff --git a/test/spec/unit/pbjs_api_spec.js b/test/spec/unit/pbjs_api_spec.js
index b946e969388..ba322f23a1d 100644
--- a/test/spec/unit/pbjs_api_spec.js
+++ b/test/spec/unit/pbjs_api_spec.js
@@ -640,7 +640,7 @@ describe('Unit: Prebid Module', function () {
       spyLogMessage = sinon.spy(utils, 'logMessage');
 
       inIframe = true;
-      sinon.stub(utils, 'inIframe').callsFake(() => inIframe);
+      sinon.stub(utils, 'inIframe', () => inIframe);
     });
 
     afterEach(function () {
diff --git a/yarn.lock b/yarn.lock
index 15543aaf0d8..949c467070e 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -27,7 +27,7 @@ abbrev@1.0.x:
   version "1.0.9"
   resolved "https://registry.yarnpkg.com/abbrev/-/abbrev-1.0.9.tgz#91b4792588a7738c25f35dd6f63752a2f8776135"
 
-accepts@1.3.3:
+accepts@1.3.3, accepts@~1.3.0:
   version "1.3.3"
   resolved "https://registry.yarnpkg.com/accepts/-/accepts-1.3.3.tgz#c3ca7434938648c3e0d9c1e328dd68b622c284ca"
   dependencies:
@@ -41,13 +41,6 @@ accepts@~1.2.12, accepts@~1.2.13:
     mime-types "~2.1.6"
     negotiator "0.5.3"
 
-accepts@~1.3.0:
-  version "1.3.4"
-  resolved "https://registry.yarnpkg.com/accepts/-/accepts-1.3.4.tgz#86246758c7dd6d21a6474ff084a4740ec05eb21f"
-  dependencies:
-    mime-types "~2.1.16"
-    negotiator "0.6.1"
-
 acorn-dynamic-import@^2.0.0:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/acorn-dynamic-import/-/acorn-dynamic-import-2.0.2.tgz#c752bd210bef679501b6c6cb7fc84f8f47158cc4"
@@ -69,8 +62,8 @@ acorn@^3.0.0, acorn@^3.0.4, acorn@^3.3.0:
   resolved "https://registry.yarnpkg.com/acorn/-/acorn-3.3.0.tgz#45e37fb39e8da3f25baee3ff5369e2bb5f22017a"
 
 acorn@^5.0.0, acorn@^5.0.3, acorn@^5.1.1:
-  version "5.1.2"
-  resolved "https://registry.yarnpkg.com/acorn/-/acorn-5.1.2.tgz#911cb53e036807cf0fa778dc5d370fbd864246d7"
+  version "5.1.1"
+  resolved "https://registry.yarnpkg.com/acorn/-/acorn-5.1.1.tgz#53fe161111f912ab999ee887a90a0bc52822fd75"
 
 adm-zip@~0.4.3:
   version "0.4.7"
@@ -888,7 +881,7 @@ babel-types@^6.18.0, babel-types@^6.19.0, babel-types@^6.22.0, babel-types@^6.24
     lodash "^4.17.4"
     to-fast-properties "^1.0.3"
 
-babylon@^6.11.0, babylon@^6.18.0:
+babylon@^6.11.0, babylon@^6.17.4, babylon@^6.18.0:
   version "6.18.0"
   resolved "https://registry.yarnpkg.com/babylon/-/babylon-6.18.0.tgz#af2f3b88fa6f5c1e4c634d1a0f8eac4f55b395e3"
 
@@ -1094,15 +1087,14 @@ browserify-aes@0.4.0:
     inherits "^2.0.1"
 
 browserify-aes@^1.0.0, browserify-aes@^1.0.4:
-  version "1.0.8"
-  resolved "https://registry.yarnpkg.com/browserify-aes/-/browserify-aes-1.0.8.tgz#c8fa3b1b7585bb7ba77c5560b60996ddec6d5309"
+  version "1.0.6"
+  resolved "https://registry.yarnpkg.com/browserify-aes/-/browserify-aes-1.0.6.tgz#5e7725dbdef1fd5930d4ebab48567ce451c48a0a"
   dependencies:
-    buffer-xor "^1.0.3"
+    buffer-xor "^1.0.2"
     cipher-base "^1.0.0"
     create-hash "^1.1.0"
-    evp_bytestokey "^1.0.3"
+    evp_bytestokey "^1.0.0"
     inherits "^2.0.1"
-    safe-buffer "^5.0.1"
 
 browserify-cipher@^1.0.0:
   version "1.0.0"
@@ -1162,7 +1154,7 @@ buffer-crc32@^0.2.1, buffer-crc32@~0.2.1:
   version "0.2.13"
   resolved "https://registry.yarnpkg.com/buffer-crc32/-/buffer-crc32-0.2.13.tgz#0d333e3f00eac50aa1454abd30ef8c2a5d9a7242"
 
-buffer-xor@^1.0.3:
+buffer-xor@^1.0.2:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/buffer-xor/-/buffer-xor-1.0.3.tgz#26e61ed1422fb70dd42e6e36729ed51d855fe8d9"
 
@@ -1775,8 +1767,8 @@ cookie@0.3.1:
   resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.3.1.tgz#e7e0a1f9ef43b4c8ba925c5c5a96e806d16873bb"
 
 core-js@^2.0.1, core-js@^2.2.0, core-js@^2.4.0, core-js@^2.4.1, core-js@^2.5.0:
-  version "2.5.1"
-  resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.5.1.tgz#ae6874dc66937789b80754ff5428df66819ca50b"
+  version "2.5.0"
+  resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.5.0.tgz#569c050918be6486b3837552028ae0466b717086"
 
 core-util-is@1.0.2, core-util-is@~1.0.0:
   version "1.0.2"
@@ -1953,7 +1945,7 @@ d@1:
   dependencies:
     es5-ext "^0.10.9"
 
-"dargs@github:christian-bromann/dargs":
+dargs@christian-bromann/dargs:
   version "4.0.1"
   resolved "https://codeload.github.com/christian-bromann/dargs/tar.gz/7d6d4164a7c4106dbd14ef39ed8d95b7b5e9b770"
   dependencies:
@@ -2166,10 +2158,6 @@ diff@1.4.0:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/diff/-/diff-1.4.0.tgz#7f28d2eb9ee7b15a97efd89ce63dcfdaa3ccbabf"
 
-diff@^3.1.0:
-  version "3.3.1"
-  resolved "https://registry.yarnpkg.com/diff/-/diff-3.3.1.tgz#aa8567a6eed03c531fc89d3f711cd0e5259dec75"
-
 diffie-hellman@^5.0.0:
   version "5.0.2"
   resolved "https://registry.yarnpkg.com/diffie-hellman/-/diffie-hellman-5.0.2.tgz#b5835739270cfe26acf632099fded2a07f209e5e"
@@ -2374,9 +2362,9 @@ errorhandler@~1.4.2:
     accepts "~1.3.0"
     escape-html "~1.0.3"
 
-es5-ext@^0.10.14, es5-ext@^0.10.30, es5-ext@^0.10.9, es5-ext@~0.10.14, es5-ext@~0.10.2:
-  version "0.10.30"
-  resolved "https://registry.yarnpkg.com/es5-ext/-/es5-ext-0.10.30.tgz#7141a16836697dbabfaaaeee41495ce29f52c939"
+es5-ext@^0.10.13, es5-ext@^0.10.14, es5-ext@^0.10.9, es5-ext@~0.10.14, es5-ext@~0.10.2:
+  version "0.10.29"
+  resolved "https://registry.yarnpkg.com/es5-ext/-/es5-ext-0.10.29.tgz#768eb2dfc4957bcf35fa0568f193ab71ede53fd8"
   dependencies:
     es6-iterator "2"
     es6-symbol "~3.1"
@@ -2421,7 +2409,7 @@ es6-symbol@3.1.1, es6-symbol@^3.1, es6-symbol@^3.1.1, es6-symbol@~3.1, es6-symbo
     d "1"
     es5-ext "~0.10.14"
 
-es6-weak-map@^2.0.1, es6-weak-map@^2.0.2:
+es6-weak-map@^2.0.1:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/es6-weak-map/-/es6-weak-map-2.0.2.tgz#5e3ab32251ffd1538a1f8e5ffa1357772f92d96f"
   dependencies:
@@ -2524,8 +2512,8 @@ eslint-scope@^3.7.1:
     estraverse "^4.1.1"
 
 eslint@^4.0.0:
-  version "4.6.1"
-  resolved "https://registry.yarnpkg.com/eslint/-/eslint-4.6.1.tgz#ddc7fc7fd70bf93205b0b3449bb16a1e9e7d4950"
+  version "4.5.0"
+  resolved "https://registry.yarnpkg.com/eslint/-/eslint-4.5.0.tgz#bb75d3b8bde97fb5e13efcd539744677feb019c3"
   dependencies:
     ajv "^5.2.0"
     babel-code-frame "^6.22.0"
@@ -2624,7 +2612,7 @@ etag@~1.7.0:
   version "1.7.0"
   resolved "https://registry.yarnpkg.com/etag/-/etag-1.7.0.tgz#03d30b5f67dd6e632d2945d30d6652731a34d5d8"
 
-event-emitter@^0.3.5, event-emitter@~0.3.5:
+event-emitter@^0.3.4, event-emitter@~0.3.5:
   version "0.3.5"
   resolved "https://registry.yarnpkg.com/event-emitter/-/event-emitter-0.3.5.tgz#df8c69eef1647923c7157b9ce83840610b02cc39"
   dependencies:
@@ -2663,9 +2651,9 @@ events@^1.0.0:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/events/-/events-1.1.1.tgz#9ebdb7635ad099c70dcc4c2a1f5004288e8bd924"
 
-evp_bytestokey@^1.0.0, evp_bytestokey@^1.0.3:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/evp_bytestokey/-/evp_bytestokey-1.0.3.tgz#7fcbdb198dc71959432efe13842684e0525acb02"
+evp_bytestokey@^1.0.0:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/evp_bytestokey/-/evp_bytestokey-1.0.2.tgz#f66bb88ecd57f71a766821e20283ea38c68bf80a"
   dependencies:
     md5.js "^1.3.4"
     safe-buffer "^5.1.1"
@@ -3007,11 +2995,11 @@ form-data@~2.1.1:
     combined-stream "^1.0.5"
     mime-types "^2.1.12"
 
-formatio@1.2.0, formatio@^1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/formatio/-/formatio-1.2.0.tgz#f3b2167d9068c4698a8d51f4f760a39a54d818eb"
+formatio@1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/formatio/-/formatio-1.1.1.tgz#5ed3ccd636551097383465d996199100e86161e9"
   dependencies:
-    samsam "1.x"
+    samsam "~1.1"
 
 fresh@0.3.0:
   version "0.3.0"
@@ -3099,8 +3087,8 @@ ftp@~0.3.10:
     xregexp "2.0.0"
 
 function-bind@^1.0.2:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.1.tgz#a56899d3ea3c9bab874bb9773b7c5ede92f4895d"
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.0.tgz#16176714c801798e4e8f2cf7f7529467bb4a5771"
 
 functional-red-black-tree@^1.0.1:
   version "1.0.1"
@@ -3829,8 +3817,8 @@ ieee754@^1.1.4:
   resolved "https://registry.yarnpkg.com/ieee754/-/ieee754-1.1.8.tgz#be33d40ac10ef1926701f6f08a2d86fbfd1ad3e4"
 
 ignore@^3.3.3:
-  version "3.3.5"
-  resolved "https://registry.yarnpkg.com/ignore/-/ignore-3.3.5.tgz#c4e715455f6073a8d7e5dae72d2fc9d71663dba6"
+  version "3.3.3"
+  resolved "https://registry.yarnpkg.com/ignore/-/ignore-3.3.3.tgz#432352e57accd87ab3110e82d3fea0e47812156d"
 
 imurmurhash@^0.1.4:
   version "0.1.4"
@@ -3883,8 +3871,8 @@ inquirer@^0.8.5:
     through "^2.3.6"
 
 inquirer@^3.0.6:
-  version "3.2.3"
-  resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-3.2.3.tgz#1c7b1731cf77b934ec47d22c9ac5aa8fe7fbe095"
+  version "3.2.2"
+  resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-3.2.2.tgz#c2aaede1507cc54d826818737742d621bef2e823"
   dependencies:
     ansi-escapes "^2.0.0"
     chalk "^2.0.0"
@@ -3999,8 +3987,8 @@ is-glob@^2.0.0, is-glob@^2.0.1:
     is-extglob "^1.0.0"
 
 is-my-json-valid@^2.12.4:
-  version "2.16.1"
-  resolved "https://registry.yarnpkg.com/is-my-json-valid/-/is-my-json-valid-2.16.1.tgz#5a846777e2c2620d1e69104e5d3a03b1f6088f11"
+  version "2.16.0"
+  resolved "https://registry.yarnpkg.com/is-my-json-valid/-/is-my-json-valid-2.16.0.tgz#f079dd9bfdae65ee2038aae8acbc86ab109e3693"
   dependencies:
     generate-function "^2.0.0"
     generate-object-property "^1.1.0"
@@ -4130,17 +4118,17 @@ isstream@~0.1.2:
   resolved "https://registry.yarnpkg.com/isstream/-/isstream-0.1.2.tgz#47e63f7af55afa6f92e1500e690eb8b8529c099a"
 
 istanbul-api@^1.1.8:
-  version "1.1.14"
-  resolved "https://registry.yarnpkg.com/istanbul-api/-/istanbul-api-1.1.14.tgz#25bc5701f7c680c0ffff913de46e3619a3a6e680"
+  version "1.1.11"
+  resolved "https://registry.yarnpkg.com/istanbul-api/-/istanbul-api-1.1.11.tgz#fcc0b461e2b3bda71e305155138238768257d9de"
   dependencies:
     async "^2.1.4"
     fileset "^2.0.2"
     istanbul-lib-coverage "^1.1.1"
     istanbul-lib-hook "^1.0.7"
-    istanbul-lib-instrument "^1.8.0"
+    istanbul-lib-instrument "^1.7.4"
     istanbul-lib-report "^1.1.1"
     istanbul-lib-source-maps "^1.2.1"
-    istanbul-reports "^1.1.2"
+    istanbul-reports "^1.1.1"
     js-yaml "^3.7.0"
     mkdirp "^0.5.1"
     once "^1.4.0"
@@ -4164,15 +4152,27 @@ istanbul-lib-hook@^1.0.7:
   dependencies:
     append-transform "^0.4.0"
 
-istanbul-lib-instrument@^1.7.3, istanbul-lib-instrument@^1.8.0:
-  version "1.8.0"
-  resolved "https://registry.yarnpkg.com/istanbul-lib-instrument/-/istanbul-lib-instrument-1.8.0.tgz#66f6c9421cc9ec4704f76f2db084ba9078a2b532"
+istanbul-lib-instrument@^1.7.3:
+  version "1.7.5"
+  resolved "https://registry.yarnpkg.com/istanbul-lib-instrument/-/istanbul-lib-instrument-1.7.5.tgz#adb596f8f0cb8b95e739206351a38a586af21b1e"
   dependencies:
     babel-generator "^6.18.0"
     babel-template "^6.16.0"
     babel-traverse "^6.18.0"
     babel-types "^6.18.0"
-    babylon "^6.18.0"
+    babylon "^6.17.4"
+    istanbul-lib-coverage "^1.1.1"
+    semver "^5.3.0"
+
+istanbul-lib-instrument@^1.7.4:
+  version "1.7.4"
+  resolved "https://registry.yarnpkg.com/istanbul-lib-instrument/-/istanbul-lib-instrument-1.7.4.tgz#e9fd920e4767f3d19edc765e2d6b3f5ccbd0eea8"
+  dependencies:
+    babel-generator "^6.18.0"
+    babel-template "^6.16.0"
+    babel-traverse "^6.18.0"
+    babel-types "^6.18.0"
+    babylon "^6.17.4"
     istanbul-lib-coverage "^1.1.1"
     semver "^5.3.0"
 
@@ -4195,9 +4195,9 @@ istanbul-lib-source-maps@^1.2.1:
     rimraf "^2.6.1"
     source-map "^0.5.3"
 
-istanbul-reports@^1.1.2:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/istanbul-reports/-/istanbul-reports-1.1.2.tgz#0fb2e3f6aa9922bd3ce45d05d8ab4d5e8e07bd4f"
+istanbul-reports@^1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/istanbul-reports/-/istanbul-reports-1.1.1.tgz#042be5c89e175bc3f86523caab29c014e77fee4e"
   dependencies:
     handlebars "^4.0.3"
 
@@ -4395,10 +4395,6 @@ jsprim@^1.2.2:
     json-schema "0.2.3"
     verror "1.10.0"
 
-just-extend@^1.1.22:
-  version "1.1.22"
-  resolved "https://registry.yarnpkg.com/just-extend/-/just-extend-1.1.22.tgz#3330af756cab6a542700c64b2e4e4aa062d52fff"
-
 karma-babel-preprocessor@^6.0.1:
   version "6.0.1"
   resolved "https://registry.yarnpkg.com/karma-babel-preprocessor/-/karma-babel-preprocessor-6.0.1.tgz#7ae1d3e64950dbe11f421b74040ab08fb5a66c21"
@@ -4511,8 +4507,8 @@ karma-webpack@^2.0.3:
     webpack-dev-middleware "^1.0.11"
 
 karma@^1.7.0:
-  version "1.7.1"
-  resolved "https://registry.yarnpkg.com/karma/-/karma-1.7.1.tgz#85cc08e9e0a22d7ce9cca37c4a1be824f6a2b1ae"
+  version "1.7.0"
+  resolved "https://registry.yarnpkg.com/karma/-/karma-1.7.0.tgz#6f7a1a406446fa2e187ec95398698f4cee476269"
   dependencies:
     bluebird "^3.3.0"
     body-parser "^1.16.1"
@@ -4991,13 +4987,9 @@ log4js@^0.6.31:
     readable-stream "~1.0.2"
     semver "~4.3.3"
 
-lolex@^1.6.0:
-  version "1.6.0"
-  resolved "https://registry.yarnpkg.com/lolex/-/lolex-1.6.0.tgz#3a9a0283452a47d7439e72731b9e07d7386e49f6"
-
-lolex@^2.1.2:
-  version "2.1.2"
-  resolved "https://registry.yarnpkg.com/lolex/-/lolex-2.1.2.tgz#2694b953c9ea4d013e5b8bfba891c991025b2629"
+lolex@1.3.2:
+  version "1.3.2"
+  resolved "https://registry.yarnpkg.com/lolex/-/lolex-1.3.2.tgz#7c3da62ffcb30f0f5a80a2566ca24e45d8a01f31"
 
 longest@^1.0.1:
   version "1.0.1"
@@ -5108,17 +5100,17 @@ mem@^1.1.0:
     mimic-fn "^1.0.0"
 
 memoizee@^0.4.5:
-  version "0.4.9"
-  resolved "https://registry.yarnpkg.com/memoizee/-/memoizee-0.4.9.tgz#ea1c005f5c4c31d89a4a10e24db83fbf61cdd4f3"
+  version "0.4.5"
+  resolved "https://registry.yarnpkg.com/memoizee/-/memoizee-0.4.5.tgz#1bc3ea1e4be056dd475d521979d7be3d5e5b21c8"
   dependencies:
     d "1"
-    es5-ext "^0.10.30"
-    es6-weak-map "^2.0.2"
-    event-emitter "^0.3.5"
+    es5-ext "^0.10.13"
+    es6-weak-map "^2.0.1"
+    event-emitter "^0.3.4"
     is-promise "^2.1"
     lru-queue "0.1"
     next-tick "1"
-    timers-ext "^0.1.2"
+    timers-ext "0.1"
 
 memory-fs@^0.2.0:
   version "0.2.0"
@@ -5201,15 +5193,15 @@ miller-rabin@^4.0.0:
     bn.js "^4.0.0"
     brorand "^1.0.1"
 
-"mime-db@>= 1.29.0 < 2", mime-db@~1.30.0:
-  version "1.30.0"
-  resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.30.0.tgz#74c643da2dd9d6a45399963465b26d5ca7d71f01"
+"mime-db@>= 1.29.0 < 2", mime-db@~1.29.0:
+  version "1.29.0"
+  resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.29.0.tgz#48d26d235589651704ac5916ca06001914266878"
 
-mime-types@^2.1.12, mime-types@~2.1.11, mime-types@~2.1.15, mime-types@~2.1.16, mime-types@~2.1.6, mime-types@~2.1.7, mime-types@~2.1.9:
-  version "2.1.17"
-  resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.17.tgz#09d7a393f03e995a79f8af857b70a9e0ab16557a"
+mime-types@^2.1.12, mime-types@~2.1.11, mime-types@~2.1.15, mime-types@~2.1.6, mime-types@~2.1.7, mime-types@~2.1.9:
+  version "2.1.16"
+  resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.16.tgz#2b858a52e5ecd516db897ac2be87487830698e23"
   dependencies:
-    mime-db "~1.30.0"
+    mime-db "~1.29.0"
 
 mime-types@~1.0.1:
   version "1.0.2"
@@ -5220,8 +5212,8 @@ mime@1.3.4:
   resolved "https://registry.yarnpkg.com/mime/-/mime-1.3.4.tgz#115f9e3b6b3daf2959983cb38f149a2d40eb5d53"
 
 mime@^1.3.4:
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/mime/-/mime-1.4.0.tgz#69e9e0db51d44f2a3b56e48b7817d7d137f1a343"
+  version "1.3.6"
+  resolved "https://registry.yarnpkg.com/mime/-/mime-1.3.6.tgz#591d84d3653a6b0b4a3b9df8de5aa8108e72e5e0"
 
 mime@~1.2.11:
   version "1.2.11"
@@ -5396,12 +5388,8 @@ mute-stream@0.0.7:
   resolved "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.7.tgz#3075ce93bc21b8fab43e1bc4da7e8115ed1e7bab"
 
 nan@^2.3.0:
-  version "2.7.0"
-  resolved "https://registry.yarnpkg.com/nan/-/nan-2.7.0.tgz#d95bf721ec877e08db276ed3fc6eb78f9083ad46"
-
-native-promise-only@^0.8.1:
-  version "0.8.1"
-  resolved "https://registry.yarnpkg.com/native-promise-only/-/native-promise-only-0.8.1.tgz#20a318c30cb45f71fe7adfbf7b21c99c1472ef11"
+  version "2.6.2"
+  resolved "https://registry.yarnpkg.com/nan/-/nan-2.6.2.tgz#e4ff34e6c95fdfb5aecc08de6596f43605a7db45"
 
 natives@^1.1.0:
   version "1.1.0"
@@ -5446,15 +5434,6 @@ nightwatch@^0.9.5:
     proxy-agent "2.0.0"
     q "1.4.1"
 
-nise@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/nise/-/nise-1.0.1.tgz#0da92b10a854e97c0f496f6c2845a301280b3eef"
-  dependencies:
-    formatio "^1.2.0"
-    just-extend "^1.1.22"
-    lolex "^1.6.0"
-    path-to-regexp "^1.7.0"
-
 node-int64@~0.3.0:
   version "0.3.3"
   resolved "https://registry.yarnpkg.com/node-int64/-/node-int64-0.3.3.tgz#2d6e6b2ece5de8588b43d88d1bc41b26cd1fa84d"
@@ -5923,12 +5902,6 @@ path-root@^0.1.1:
   dependencies:
     path-root-regex "^0.1.0"
 
-path-to-regexp@^1.7.0:
-  version "1.7.0"
-  resolved "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-1.7.0.tgz#59fde0f435badacba103a84e9d3bc64e96b9937d"
-  dependencies:
-    isarray "0.0.1"
-
 path-type@^1.0.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/path-type/-/path-type-1.1.0.tgz#59c44f7ee491da704da415da5a4070ba4f8fe441"
@@ -6340,10 +6313,11 @@ regenerator-transform@^0.10.0:
     private "^0.1.6"
 
 regex-cache@^0.4.2:
-  version "0.4.4"
-  resolved "https://registry.yarnpkg.com/regex-cache/-/regex-cache-0.4.4.tgz#75bdc58a2a1496cec48a12835bc54c8d562336dd"
+  version "0.4.3"
+  resolved "https://registry.yarnpkg.com/regex-cache/-/regex-cache-0.4.3.tgz#9b1a6c35d4d0dfcef5711ae651e8e9d3d7114145"
   dependencies:
     is-equal-shallow "^0.1.3"
+    is-primitive "^2.0.0"
 
 regexpu-core@^2.0.0:
   version "2.0.0"
@@ -6613,9 +6587,13 @@ safe-buffer@^5.0.1, safe-buffer@^5.1.0, safe-buffer@^5.1.1, safe-buffer@~5.1.0,
   version "5.1.1"
   resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.1.tgz#893312af69b2123def71f57889001671eeb2c853"
 
-samsam@1.x, samsam@^1.1.3:
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/samsam/-/samsam-1.2.1.tgz#edd39093a3184370cb859243b2bdf255e7d8ea67"
+samsam@1.1.2:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/samsam/-/samsam-1.1.2.tgz#bec11fdc83a9fda063401210e40176c3024d1567"
+
+samsam@~1.1:
+  version "1.1.3"
+  resolved "https://registry.yarnpkg.com/samsam/-/samsam-1.1.3.tgz#9f5087419b4d091f232571e7fa52e90b0f552621"
 
 sauce-connect-launcher@^1.2.2:
   version "1.2.2"
@@ -6749,19 +6727,14 @@ signal-exit@^3.0.0, signal-exit@^3.0.2:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.2.tgz#b5fdc08f1287ea1178628e415e25132b73646c6d"
 
-sinon@^3.2.0:
-  version "3.2.1"
-  resolved "https://registry.yarnpkg.com/sinon/-/sinon-3.2.1.tgz#d8adabd900730fd497788a027049c64b08be91c2"
-  dependencies:
-    diff "^3.1.0"
-    formatio "1.2.0"
-    lolex "^2.1.2"
-    native-promise-only "^0.8.1"
-    nise "^1.0.1"
-    path-to-regexp "^1.7.0"
-    samsam "^1.1.3"
-    text-encoding "0.6.4"
-    type-detect "^4.0.0"
+sinon@^1.12.1:
+  version "1.17.7"
+  resolved "https://registry.yarnpkg.com/sinon/-/sinon-1.17.7.tgz#4542a4f49ba0c45c05eb2e9dd9d203e2b8efe0bf"
+  dependencies:
+    formatio "1.1.1"
+    lolex "1.3.2"
+    samsam "1.1.2"
+    util ">=0.10.3 <1"
 
 slash@^1.0.0:
   version "1.0.0"
@@ -6878,8 +6851,8 @@ source-map-resolve@^0.3.0:
     urix "~0.1.0"
 
 source-map-support@^0.4.15:
-  version "0.4.17"
-  resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.4.17.tgz#6f2150553e6375375d0ccb3180502b78c18ba430"
+  version "0.4.16"
+  resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.4.16.tgz#16fecf98212467d017d586a2af68d628b9421cd8"
   dependencies:
     source-map "^0.5.6"
 
@@ -7165,8 +7138,8 @@ supports-color@^3.1.0, supports-color@^3.1.2:
     has-flag "^1.0.0"
 
 supports-color@^4.0.0, supports-color@^4.2.1:
-  version "4.4.0"
-  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-4.4.0.tgz#883f7ddabc165142b2a61427f3352ded195d1a3e"
+  version "4.2.1"
+  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-4.2.1.tgz#65a4bb2631e90e02420dba5554c375a4754bb836"
   dependencies:
     has-flag "^2.0.0"
 
@@ -7270,10 +7243,6 @@ test-value@^2.0.0, test-value@^2.1.0:
     array-back "^1.0.3"
     typical "^2.6.0"
 
-text-encoding@0.6.4:
-  version "0.6.4"
-  resolved "https://registry.yarnpkg.com/text-encoding/-/text-encoding-0.6.4.tgz#e399a982257a276dae428bb92845cb71bdc26d19"
-
 text-table@~0.2.0:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/text-table/-/text-table-0.2.0.tgz#7f5ee823ae805207c00af2df4a84ec3fcfa570b4"
@@ -7344,7 +7313,7 @@ timers-browserify@^2.0.2:
   dependencies:
     setimmediate "^1.0.4"
 
-timers-ext@^0.1.2:
+timers-ext@0.1:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/timers-ext/-/timers-ext-0.1.2.tgz#61cc47a76c1abd3195f14527f978d58ae94c5204"
   dependencies:
@@ -7444,10 +7413,6 @@ type-detect@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/type-detect/-/type-detect-1.0.0.tgz#762217cc06db258ec48908a1298e8b95121e8ea2"
 
-type-detect@^4.0.0:
-  version "4.0.3"
-  resolved "https://registry.yarnpkg.com/type-detect/-/type-detect-4.0.3.tgz#0e3f2670b44099b0b46c284d136a7ef49c74c2ea"
-
 type-is@~1.6.10, type-is@~1.6.15, type-is@~1.6.6:
   version "1.6.15"
   resolved "https://registry.yarnpkg.com/type-is/-/type-is-1.6.15.tgz#cab10fb4909e441c82842eafe1ad646c81804410"
@@ -7626,7 +7591,7 @@ util-deprecate@^1.0.2, util-deprecate@~1.0.1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf"
 
-util@0.10.3, util@^0.10.3:
+util@0.10.3, "util@>=0.10.3 <1", util@^0.10.3:
   version "0.10.3"
   resolved "https://registry.yarnpkg.com/util/-/util-0.10.3.tgz#7afb1afe50805246489e3db7fe0ed379336ac0f9"
   dependencies: