diff --git a/.circleci/config.yml b/.circleci/config.yml
index 784b520ecc1..c11f87b6f59 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -36,7 +36,7 @@ aliases:
 
   - &run_endtoend_test
       name: BrowserStack End to end testing
-      command: echo "127.0.0.1 test.localhost" | sudo tee -a /etc/hosts && gulp e2e-test --host=test.localhost
+      command: gulp e2e-test
 
   # Download and run BrowserStack local
   - &setup_browserstack
@@ -82,16 +82,6 @@ workflows:
   commit:
     jobs:
       - build
-  nightly:
-    triggers:
-      - schedule:
-          cron: "0 0 * * *"
-          filters:
-            branches:
-              only:
-                - master
-    jobs:
-      - e2etest
 
 experimental:
   pipelines: true
diff --git a/gulpfile.js b/gulpfile.js
index 0c4ebc50653..ff49436384b 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -32,8 +32,8 @@ var prebid = require('./package.json');
 var dateString = 'Updated : ' + (new Date()).toISOString().substring(0, 10);
 var banner = '/* <%= prebid.name %> v<%= prebid.version %>\n' + dateString + '*/\n';
 var port = 9999;
-const FAKE_SERVER_HOST = argv.host ? argv.host : 'localhost';
-const FAKE_SERVER_PORT = 4444;
+const INTEG_SERVER_HOST = argv.host ? argv.host : 'localhost';
+const INTEG_SERVER_PORT = 4444;
 const { spawn } = require('child_process');
 
 // these modules must be explicitly listed in --modules to be included in the build, won't be part of "all" modules
@@ -167,9 +167,9 @@ function gulpBundle(dev) {
   return bundle(dev).pipe(gulp.dest('build/' + (dev ? 'dev' : 'dist')));
 }
 
-function nodeBundle(modules) {
+function nodeBundle(modules, dev = false) {
   return new Promise((resolve, reject) => {
-    bundle(false, modules)
+    bundle(dev, modules)
       .on('error', (err) => {
         reject(err);
       })
@@ -243,41 +243,18 @@ function testTaskMaker(options = {}) {
     if (options.notest) {
       done();
     } else if (options.e2e) {
-      let wdioCmd = path.join(__dirname, 'node_modules/.bin/wdio');
-      let wdioConf = path.join(__dirname, 'wdio.conf.js');
-      let wdioOpts;
-
-      if (options.file) {
-        wdioOpts = [
-          wdioConf,
-          `--spec`,
-          `${options.file}`
-        ]
-      } else {
-        wdioOpts = [
-          wdioConf
-        ];
-      }
-
-      // run fake-server
-      const fakeServer = spawn('node', ['./test/fake-server/index.js', `--port=${FAKE_SERVER_PORT}`]);
-      fakeServer.stdout.on('data', (data) => {
-        console.log(`stdout: ${data}`);
-      });
-      fakeServer.stderr.on('data', (data) => {
-        console.log(`stderr: ${data}`);
-      });
-
-      execa(wdioCmd, wdioOpts, { stdio: 'inherit' })
+      const integ = startIntegServer();
+      startLocalServer();
+      runWebdriver(options)
         .then(stdout => {
           // kill fake server
-          fakeServer.kill('SIGINT');
+          integ.kill('SIGINT');
           done();
           process.exit(0);
         })
         .catch(err => {
           // kill fake server
-          fakeServer.kill('SIGINT');
+          integ.kill('SIGINT');
           done(new Error(`Tests failed with error: ${err}`));
           process.exit(1);
         });
@@ -296,6 +273,26 @@ function testTaskMaker(options = {}) {
 
 const test = testTaskMaker();
 
+function runWebdriver({file}) {
+  process.env.TEST_SERVER_HOST = argv.host || 'localhost';
+  let wdioCmd = path.join(__dirname, 'node_modules/.bin/wdio');
+  let wdioConf = path.join(__dirname, 'wdio.conf.js');
+  let wdioOpts;
+
+  if (file) {
+    wdioOpts = [
+      wdioConf,
+      `--spec`,
+      `${file}`
+    ]
+  } else {
+    wdioOpts = [
+      wdioConf
+    ];
+  }
+  return execa(wdioCmd, wdioOpts, { stdio: 'inherit' });
+}
+
 function newKarmaCallback(done) {
   return function (exitCode) {
     if (exitCode) {
@@ -335,41 +332,29 @@ function buildPostbid() {
     .pipe(gulp.dest('build/postbid/'));
 }
 
-function setupE2e(done) {
-  if (!argv.host) {
-    throw new gutil.PluginError({
-      plugin: 'E2E test',
-      message: gutil.colors.red('Host should be defined e.g. ap.localhost, anlocalhost. localhost cannot be used as safari browserstack is not able to connect to localhost')
-    });
+function startIntegServer(dev = false) {
+  const args = ['./test/fake-server/index.js', `--port=${INTEG_SERVER_PORT}`, `--host=${INTEG_SERVER_HOST}`];
+  if (dev) {
+    args.push('--dev=true')
   }
-  process.env.TEST_SERVER_HOST = argv.host;
-  if (argv.https) {
-    process.env.TEST_SERVER_PROTOCOL = argv.https;
-  }
-  argv.e2e = true;
-  done();
-}
-
-function injectFakeServerEndpoint() {
-  return gulp.src(['build/dist/*.js'])
-    .pipe(replace('https://ib.adnxs.com/ut/v3/prebid', `http://${FAKE_SERVER_HOST}:${FAKE_SERVER_PORT}`))
-    .pipe(gulp.dest('build/dist'));
-}
-
-function injectFakeServerEndpointDev() {
-  return gulp.src(['build/dev/*.js'])
-    .pipe(replace('https://ib.adnxs.com/ut/v3/prebid', `http://${FAKE_SERVER_HOST}:${FAKE_SERVER_PORT}`))
-    .pipe(gulp.dest('build/dev'));
-}
-
-function startFakeServer() {
-  const fakeServer = spawn('node', ['./test/fake-server/index.js', `--port=${FAKE_SERVER_PORT}`]);
-  fakeServer.stdout.on('data', (data) => {
+  const srv = spawn('node', args);
+  srv.stdout.on('data', (data) => {
     console.log(`stdout: ${data}`);
   });
-  fakeServer.stderr.on('data', (data) => {
+  srv.stderr.on('data', (data) => {
     console.log(`stderr: ${data}`);
   });
+  return srv;
+}
+
+function startLocalServer(options = {}) {
+  connect.server({
+    https: argv.https,
+    port: port,
+    host: INTEG_SERVER_HOST,
+    root: './',
+    livereload: options.livereload
+  });
 }
 
 // Watch Task with Live Reload
@@ -385,13 +370,7 @@ function watchTaskMaker(options = {}) {
       'modules/**/*.js',
     ].concat(options.alsoWatch));
 
-    connect.server({
-      https: argv.https,
-      port: port,
-      host: FAKE_SERVER_HOST,
-      root: './',
-      livereload: options.livereload
-    });
+    startLocalServer(options);
 
     mainWatcher.on('all', options.task());
     done();
@@ -427,11 +406,13 @@ gulp.task('build-postbid', gulp.series(escapePostbidConfig, buildPostbid));
 gulp.task('serve', gulp.series(clean, lint, gulp.parallel('build-bundle-dev', watch, test)));
 gulp.task('serve-fast', gulp.series(clean, gulp.parallel('build-bundle-dev', watchFast)));
 gulp.task('serve-and-test', gulp.series(clean, gulp.parallel('build-bundle-dev', watchFast, testTaskMaker({watch: true}))));
-gulp.task('serve-fake', gulp.series(clean, gulp.parallel('build-bundle-dev', watch), injectFakeServerEndpointDev, test, startFakeServer));
+gulp.task('serve-e2e', gulp.series(clean, 'build-bundle-prod', gulp.parallel(() => startIntegServer(), startLocalServer)))
+gulp.task('serve-e2e-dev', gulp.series(clean, 'build-bundle-dev', gulp.parallel(() => startIntegServer(true), startLocalServer)))
 
 gulp.task('default', gulp.series(clean, 'build-bundle-prod'));
 
-gulp.task('e2e-test', gulp.series(clean, setupE2e, gulp.parallel('build-bundle-prod', watch), injectFakeServerEndpoint, test));
+gulp.task('e2e-test-only', () => runWebdriver({file: argv.file}))
+gulp.task('e2e-test', gulp.series(clean, 'build-bundle-prod', testTaskMaker({e2e: true})));
 // other tasks
 gulp.task(bundleToStdout);
 gulp.task('bundle', gulpBundle.bind(null, false)); // used for just concatenating pre-built files with no build step
diff --git a/modules/adomikAnalyticsAdapter.js b/modules/adomikAnalyticsAdapter.js
index 44c0c6868cf..40809c59093 100644
--- a/modules/adomikAnalyticsAdapter.js
+++ b/modules/adomikAnalyticsAdapter.js
@@ -4,7 +4,7 @@ import adapterManager from '../src/adapterManager.js';
 import {logInfo} from '../src/utils.js';
 import {find, findIndex} from '../src/polyfill.js';
 
-// Events used in adomik analytics adapter
+// Events used in adomik analytics adapter.
 const auctionInit = CONSTANTS.EVENTS.AUCTION_INIT;
 const auctionEnd = CONSTANTS.EVENTS.AUCTION_END;
 const bidRequested = CONSTANTS.EVENTS.BID_REQUESTED;
@@ -30,17 +30,13 @@ let adomikAdapter = Object.assign(adapter({}),
           break;
 
         case bidResponse:
-          adomikAdapter.bucketEvents.push({
-            type: 'response',
-            event: adomikAdapter.buildBidResponse(args)
-          });
+          adomikAdapter.saveBidResponse(args);
           break;
 
         case bidWon:
-          adomikAdapter.sendWonEvent({
-            id: args.adId,
-            placementCode: args.adUnitCode
-          });
+          args.id = args.adId;
+          args.placementCode = args.adUnitCode;
+          adomikAdapter.sendWonEvent(args);
           break;
 
         case bidRequested:
@@ -69,16 +65,28 @@ adomikAdapter.initializeBucketEvents = function() {
   adomikAdapter.bucketEvents = [];
 }
 
+adomikAdapter.saveBidResponse = function(args) {
+  let responseSaved = adomikAdapter.bucketEvents.find((bucketEvent) =>
+    bucketEvent.type == 'response' && bucketEvent.event.id == args.id
+  );
+  if (responseSaved) { return true; }
+  adomikAdapter.bucketEvents.push({
+    type: 'response',
+    event: adomikAdapter.buildBidResponse(args)
+  });
+}
+
 adomikAdapter.maxPartLength = function () {
   return (ua.includes(' MSIE ')) ? 1600 : 60000;
 };
 
 adomikAdapter.sendTypedEvent = function() {
+  let [testId, testValue] = adomikAdapter.getKeyValues();
   const groupedTypedEvents = adomikAdapter.buildTypedEvents();
 
   const bulkEvents = {
-    testId: adomikAdapter.currentContext.testId,
-    testValue: adomikAdapter.currentContext.testValue,
+    testId: testId,
+    testValue: testValue,
     uid: adomikAdapter.currentContext.uid,
     ahbaid: adomikAdapter.currentContext.id,
     hostname: window.location.hostname,
@@ -114,10 +122,8 @@ adomikAdapter.sendTypedEvent = function() {
   const stringBulkEvents = JSON.stringify(bulkEvents)
   logInfo('Events sent to adomik prebid analytic ' + stringBulkEvents);
 
-  // Encode object in base64
   const encodedBuf = window.btoa(stringBulkEvents);
 
-  // Create final url and split it (+endpoint length)
   const encodedUri = encodeURIComponent(encodedBuf);
   const maxLength = adomikAdapter.maxPartLength();
   const splittedUrl = encodedUri.match(new RegExp(`.{1,${maxLength}}`, 'g'));
@@ -130,16 +136,18 @@ adomikAdapter.sendTypedEvent = function() {
 };
 
 adomikAdapter.sendWonEvent = function (wonEvent) {
-  let keyValues = { testId: adomikAdapter.currentContext.testId, testValue: adomikAdapter.currentContext.testValue }
-  wonEvent = {...wonEvent, ...keyValues}
-  const stringWonEvent = JSON.stringify(wonEvent)
+  let [testId, testValue] = adomikAdapter.getKeyValues();
+  let keyValues = { testId: testId, testValue: testValue };
+  let samplingInfo = { sampling: adomikAdapter.currentContext.sampling };
+  wonEvent = { ...adomikAdapter.buildBidResponse(wonEvent), ...keyValues, ...samplingInfo };
+
+  const stringWonEvent = JSON.stringify(wonEvent);
   logInfo('Won event sent to adomik prebid analytic ' + stringWonEvent);
 
-  // Encode object in base64
   const encodedBuf = window.btoa(stringWonEvent);
   const encodedUri = encodeURIComponent(encodedBuf);
   const img = new Image(1, 1);
-  img.src = `https://${adomikAdapter.currentContext.url}/?q=${encodedUri}&id=${adomikAdapter.currentContext.id}&won=true`
+  img.src = `https://${adomikAdapter.currentContext.url}/?q=${encodedUri}&id=${adomikAdapter.currentContext.id}&won=true`;
 }
 
 adomikAdapter.buildBidResponse = function (bid) {
@@ -201,33 +209,49 @@ adomikAdapter.buildTypedEvents = function () {
   return groupedTypedEvents;
 }
 
-adomikAdapter.adapterEnableAnalytics = adomikAdapter.enableAnalytics;
+adomikAdapter.getKeyValues = function () {
+  let preventTest = sessionStorage.getItem(window.location.hostname + '_NoAdomikTest')
+  let inScope = sessionStorage.getItem(window.location.hostname + '_AdomikTestInScope')
+  let keyValues = JSON.parse(sessionStorage.getItem(window.location.hostname + '_AdomikTest'))
+  let testId;
+  let testValue;
+  if (typeof (keyValues) === 'object' && keyValues != undefined && !preventTest && inScope) {
+    testId = keyValues.testId
+    testValue = keyValues.testOptionLabel
+  }
+  return [testId, testValue]
+}
 
-adomikAdapter.enableAnalytics = function (config) {
-  adomikAdapter.currentContext = {};
-  const initOptions = config.options;
-
-  _sampled = typeof config === 'undefined' ||
-             typeof config.sampling === 'undefined' ||
-             Math.random() < parseFloat(config.sampling);
-
-  if (_sampled) {
-    if (initOptions) {
-      adomikAdapter.currentContext = {
-        uid: initOptions.id,
-        url: initOptions.url,
-        testId: initOptions.testId,
-        testValue: initOptions.testValue,
-        id: '',
-        timeouted: false,
-        sampling: config.sampling
-      }
-      logInfo('Adomik Analytics enabled with config', initOptions);
-      adomikAdapter.adapterEnableAnalytics(config);
-    }
-  } else {
-    logInfo('Adomik Analytics ignored for sampling', config.sampling);
+adomikAdapter.enable = function(options) {
+  adomikAdapter.currentContext = {
+    uid: options.id,
+    url: options.url,
+    id: '',
+    timeouted: false,
+    sampling: options.sampling
   }
+  logInfo('Adomik Analytics enabled with config', options);
+  adomikAdapter.adapterEnableAnalytics(options);
+};
+
+adomikAdapter.checkOptions = function(options) {
+  if (typeof options !== 'undefined') {
+    if (options.id && options.url) { adomikAdapter.enable(options); } else { logInfo('Adomik Analytics disabled because id and/or url is missing from config', options); }
+  } else { logInfo('Adomik Analytics disabled because config is missing'); }
+};
+
+adomikAdapter.checkSampling = function(options) {
+  _sampled = typeof options === 'undefined' ||
+  typeof options.sampling === 'undefined' ||
+  (options.sampling > 0 && Math.random() < parseFloat(options.sampling));
+  if (_sampled) { adomikAdapter.checkOptions(options) } else { logInfo('Adomik Analytics ignored for sampling', options.sampling); }
+};
+
+adomikAdapter.adapterEnableAnalytics = adomikAdapter.enableAnalytics;
+
+adomikAdapter.enableAnalytics = function ({ provider, options }) {
+  logInfo('Adomik Analytics enableAnalytics', provider);
+  adomikAdapter.checkSampling(options);
 };
 
 adapterManager.registerAnalyticsAdapter({
diff --git a/modules/adotBidAdapter.js b/modules/adotBidAdapter.js
index a28ab4257df..ac49f7ae32d 100644
--- a/modules/adotBidAdapter.js
+++ b/modules/adotBidAdapter.js
@@ -10,7 +10,7 @@ const BIDDER_CODE = 'adot';
 const ADAPTER_VERSION = 'v2.0.0';
 const BID_METHOD = 'POST';
 const BIDDER_URL = 'https://dsp.adotmob.com/headerbidding{PUBLISHER_PATH}/bidrequest';
-const REQUIRED_VIDEO_PARAMS = ['mimes', 'minduration', 'maxduration', 'protocols'];
+const REQUIRED_VIDEO_PARAMS = ['mimes', 'protocols'];
 const DOMAIN_REGEX = new RegExp('//([^/]*)');
 const FIRST_PRICE = 1;
 const IMP_BUILDER = { banner: buildBanner, video: buildVideo, native: buildNative };
diff --git a/modules/adyoulikeBidAdapter.js b/modules/adyoulikeBidAdapter.js
index 1a0074e668b..6710448f00e 100644
--- a/modules/adyoulikeBidAdapter.js
+++ b/modules/adyoulikeBidAdapter.js
@@ -488,6 +488,8 @@ function createBid(response, bidRequests) {
   // retreive video response if present
   const vast64 = response.Vast || getVideoAd(response);
   if (vast64) {
+    bid.width = response.Width;
+    bid.height = response.Height;
     bid.vastXml = window.atob(vast64);
     bid.mediaType = 'video';
   } else if (request.Native) {
diff --git a/modules/apacdexBidAdapter.js b/modules/apacdexBidAdapter.js
index 421eb99b4c1..d7b6b7c4020 100644
--- a/modules/apacdexBidAdapter.js
+++ b/modules/apacdexBidAdapter.js
@@ -2,22 +2,9 @@ import { deepAccess, isPlainObject, isArray, replaceAuctionPrice, isFn } from '.
 import { config } from '../src/config.js';
 import { registerBidder } from '../src/adapters/bidderFactory.js';
 const BIDDER_CODE = 'apacdex';
-const CONFIG = {
-  'apacdex': {
-    'ENDPOINT': 'https://useast.quantumdex.io/auction/apacdex',
-    'USERSYNC': 'https://sync.quantumdex.io/usersync/apacdex'
-  },
-  'quantumdex': {
-    'ENDPOINT': 'https://useast.quantumdex.io/auction/quantumdex',
-    'USERSYNC': 'https://sync.quantumdex.io/usersync/quantumdex'
-  },
-  'valueimpression': {
-    'ENDPOINT': 'https://useast.quantumdex.io/auction/adapter',
-    'USERSYNC': 'https://sync.quantumdex.io/usersync/adapter'
-  }
-};
+const ENDPOINT = 'https://useast.quantumdex.io/auction/pbjs'
+const USERSYNC = 'https://sync.quantumdex.io/usersync/pbjs'
 
-var bidderConfig = CONFIG[BIDDER_CODE];
 var bySlotTargetKey = {};
 var bySlotSizesCount = {}
 
@@ -56,8 +43,6 @@ export const spec = {
     let test;
     let bids = [];
 
-    bidderConfig = CONFIG[validBidRequests[0].bidder];
-
     test = config.getConfig('debug');
 
     validBidRequests.forEach(bidReq => {
@@ -156,13 +141,14 @@ export const spec = {
         transactionId: bid.transactionId,
         sizes: bid.sizes,
         bidId: bid.bidId,
+        adUnitCode: bid.adUnitCode,
         bidFloor: bid.bidFloor
       }
     });
 
     return {
       method: 'POST',
-      url: bidderConfig.ENDPOINT,
+      url: ENDPOINT,
       data: payload,
       withCredentials: true,
       bidderRequests: bids
@@ -209,32 +195,47 @@ export const spec = {
     });
     return bidResponses;
   },
-  getUserSyncs: function (syncOptions, serverResponses) {
+  getUserSyncs: function (syncOptions, serverResponses, gdprConsent, uspConsent) {
     const syncs = [];
-    try {
-      if (syncOptions.iframeEnabled) {
-        syncs.push({
-          type: 'iframe',
-          url: bidderConfig.USERSYNC
-        });
+    if (hasPurpose1Consent(gdprConsent)) {
+      let params = '';
+      if (gdprConsent && typeof gdprConsent.consentString === 'string') {
+        // add 'gdpr' only if 'gdprApplies' is defined
+        if (typeof gdprConsent.gdprApplies === 'boolean') {
+          params = `?gdpr=${Number(gdprConsent.gdprApplies)}&gdpr_consent=${gdprConsent.consentString}`;
+        } else {
+          params = `?gdpr_consent=${gdprConsent.consentString}`;
+        }
       }
-      if (serverResponses.length > 0 && serverResponses[0].body && serverResponses[0].body.pixel) {
-        serverResponses[0].body.pixel.forEach(px => {
-          if (px.type === 'image' && syncOptions.pixelEnabled) {
-            syncs.push({
-              type: 'image',
-              url: px.url
-            });
-          }
-          if (px.type === 'iframe' && syncOptions.iframeEnabled) {
-            syncs.push({
-              type: 'iframe',
-              url: px.url
-            });
-          }
-        });
+      if (uspConsent) {
+        params += `${params ? '&' : '?'}us_privacy=${encodeURIComponent(uspConsent)}`;
       }
-    } catch (e) { }
+
+      try {
+        if (syncOptions.iframeEnabled) {
+          syncs.push({
+            type: 'iframe',
+            url: USERSYNC + params
+          });
+        }
+        if (serverResponses.length > 0 && serverResponses[0].body && serverResponses[0].body.pixel) {
+          serverResponses[0].body.pixel.forEach(px => {
+            if (px.type === 'image' && syncOptions.pixelEnabled) {
+              syncs.push({
+                type: 'image',
+                url: px.url + params
+              });
+            }
+            if (px.type === 'iframe' && syncOptions.iframeEnabled) {
+              syncs.push({
+                type: 'iframe',
+                url: px.url + params
+              });
+            }
+          });
+        }
+      } catch (e) { }
+    }
     return syncs;
   }
 };
@@ -377,4 +378,14 @@ function getBidFloor(bid) {
   return null;
 }
 
+function hasPurpose1Consent(gdprConsent) {
+  let result = true;
+  if (gdprConsent) {
+    if (gdprConsent.gdprApplies && gdprConsent.apiVersion === 2) {
+      result = !!(deepAccess(gdprConsent, 'vendorData.purpose.consents.1') === true);
+    }
+  }
+  return result;
+}
+
 registerBidder(spec);
diff --git a/modules/audiencerunBidAdapter.js b/modules/audiencerunBidAdapter.js
index 2c100bce27b..2744e38e820 100644
--- a/modules/audiencerunBidAdapter.js
+++ b/modules/audiencerunBidAdapter.js
@@ -1,32 +1,30 @@
-import { deepAccess, isFn, logError, getValue, getBidIdParameter, _each, isArray, triggerPixel } from '../src/utils.js';
+import {
+  deepAccess,
+  isFn,
+  logError,
+  getValue,
+  getBidIdParameter,
+  _each,
+  isArray,
+  triggerPixel,
+  formatQS,
+} from '../src/utils.js';
 import { config } from '../src/config.js';
 import { registerBidder } from '../src/adapters/bidderFactory.js';
 import { BANNER } from '../src/mediaTypes.js';
+import { createEidsArray } from './userId/eids.js';
 
 const BIDDER_CODE = 'audiencerun';
 const BASE_URL = 'https://d.audiencerun.com';
 const AUCTION_URL = `${BASE_URL}/prebid`;
 const TIMEOUT_EVENT_URL = `${BASE_URL}/ps/pbtimeout`;
+const ERROR_EVENT_URL = `${BASE_URL}/js_log`;
 const DEFAULT_CURRENCY = 'USD';
 
 let requestedBids = [];
 
 /**
- * Gets bidder request referer
- *
- * @param {Object} bidderRequest
- * @return {string}
- */
-function getPageUrl(bidderRequest) {
-  return (
-    config.getConfig('pageUrl') ||
-    deepAccess(bidderRequest, 'refererInfo.referer') ||
-    null
-  );
-}
-
-/**
- * Returns bidfloor through floors module if available
+ * Returns bidfloor through floors module if available.
  *
  * @param {Object} bid
  * @returns {number}
@@ -44,19 +42,53 @@ function getBidFloor(bid) {
     });
     return bidFloor.floor;
   } catch (_) {
-    return 0
+    return 0;
   }
 }
 
+/**
+ * Returns the most top page referer.
+ *
+ * @returns {string}
+ */
+function getPageReferer() {
+  let t, e;
+  do {
+    t = t ? t.parent : window;
+    try {
+      e = t.document.referrer;
+    } catch (_) {
+      break;
+    }
+  } while (t !== window.top);
+  return e;
+}
+
+/**
+ * Returns bidder request page url.
+ *
+ * @param {Object} bidderRequest
+ * @return {string}
+ */
+function getPageUrl(bidderRequest) {
+  return (
+    config.getConfig('pageUrl') ||
+    deepAccess(bidderRequest, 'refererInfo.referer') ||
+    getPageReferer() ||
+    null
+  );
+}
+
 export const spec = {
-  version: '1.1.0',
+  version: '1.2.0',
   code: BIDDER_CODE,
+  gvlid: 944,
   supportedMediaTypes: [BANNER],
 
   /**
    * Determines whether or not the given bid request is valid.
    *
-   * @param {object} bid The bid to validate.
+   * @param {BidRequest} bid The bid params to validate.
    * @return boolean True if this is a valid bid, and false otherwise.
    */
   isBidRequestValid: function (bid) {
@@ -95,12 +127,19 @@ export const spec = {
 
     const payload = {
       libVersion: this.version,
-      referer: getPageUrl(bidderRequest),
+      pageUrl: config.getConfig('pageUrl'),
+      pageReferer: getPageReferer(),
+      referer: deepAccess(bidderRequest, 'refererInfo.referer'),
+      refererInfo: deepAccess(bidderRequest, 'refererInfo'),
       currencyCode: config.getConfig('currency.adServerCurrency'),
       timeout: config.getConfig('bidderTimeout'),
       bids,
     };
 
+    payload.uspConsent = deepAccess(bidderRequest, 'uspConsent');
+    payload.schain = deepAccess(bidRequests, '0.schain');
+    payload.userId = deepAccess(bidRequests, '0.userId') ? createEidsArray(bidRequests[0].userId) : [];
+
     if (bidderRequest && bidderRequest.gdprConsent) {
       payload.gdpr = {
         consent: bidderRequest.gdprConsent.consentString,
@@ -117,7 +156,7 @@ export const spec = {
 
     return {
       method: 'POST',
-      url: AUCTION_URL,
+      url: deepAccess(bidRequests, '0.params.auctionUrl', AUCTION_URL),
       data: JSON.stringify(payload),
       options: {
         withCredentials: true,
@@ -201,7 +240,9 @@ export const spec = {
     }
 
     timeoutData.forEach((bid) => {
-      const bidOnTimeout = requestedBids.find((requestedBid) => requestedBid.bidId === bid.bidId);
+      const bidOnTimeout = requestedBids.find(
+        (requestedBid) => requestedBid.bidId === bid.bidId
+      );
 
       if (bidOnTimeout) {
         triggerPixel(
@@ -210,6 +251,18 @@ export const spec = {
       }
     });
   },
+
+  /**
+   * Registers bidder specific code, which will execute if the bidder responded with an error.
+   * @param {{bidderRequest: object}} args An object from which we extract bidderRequest object.
+   */
+  onBidderError: function ({ bidderRequest }) {
+    const queryString = formatQS({
+      message: `Prebid.js: Server call for ${bidderRequest.bidderCode} failed.`,
+      url: encodeURIComponent(getPageUrl(bidderRequest)),
+    });
+    triggerPixel(`${ERROR_EVENT_URL}/?${queryString}`);
+  },
 };
 
 registerBidder(spec);
diff --git a/modules/betweenBidAdapter.js b/modules/betweenBidAdapter.js
index acf574a3fe2..e4907c15974 100644
--- a/modules/betweenBidAdapter.js
+++ b/modules/betweenBidAdapter.js
@@ -53,7 +53,7 @@ export const spec = {
         params.maxd = video.maxd;
         params.mind = video.mind;
         params.pos = 'atf';
-        ENDPOINT += '&jst=pvc';
+        params.jst = 'pvc';
         params.codeType = includes(CODE_TYPES, video.codeType) ? video.codeType : 'inpage';
       }
 
diff --git a/modules/cointrafficBidAdapter.js b/modules/cointrafficBidAdapter.js
index e3d3c65a4f0..f61d58664ca 100644
--- a/modules/cointrafficBidAdapter.js
+++ b/modules/cointrafficBidAdapter.js
@@ -4,7 +4,7 @@ import { BANNER } from '../src/mediaTypes.js'
 import { config } from '../src/config.js'
 
 const BIDDER_CODE = 'cointraffic';
-const ENDPOINT_URL = 'https://appspb.cointraffic.io/pb/tmp';
+const ENDPOINT_URL = 'https://apps-pbd.ctengine.io/pb/tmp';
 const DEFAULT_CURRENCY = 'EUR';
 const ALLOWED_CURRENCIES = [
   'EUR', 'USD', 'JPY', 'BGN', 'CZK', 'DKK', 'GBP', 'HUF', 'PLN', 'RON', 'SEK', 'CHF', 'ISK', 'NOK', 'HRK', 'RUB', 'TRY',
diff --git a/modules/colossussspBidAdapter.js b/modules/colossussspBidAdapter.js
index c1b6e31ff2e..fec0d1b6510 100644
--- a/modules/colossussspBidAdapter.js
+++ b/modules/colossussspBidAdapter.js
@@ -112,7 +112,6 @@ export const spec = {
         placementId: bid.params.placement_id,
         groupId: bid.params.group_id,
         bidId: bid.bidId,
-        sizes: bid.mediaTypes[traff].sizes,
         traffic: traff,
         eids: [],
         floor: {}
@@ -146,7 +145,12 @@ export const spec = {
           rtiPartner: 'TDID'
         });
       }
+      if (traff === BANNER) {
+        placement.sizes = bid.mediaTypes[BANNER].sizes
+      }
+
       if (traff === VIDEO) {
+        placement.sizes = bid.mediaTypes[VIDEO].playerSize;
         placement.playerSize = bid.mediaTypes[VIDEO].playerSize;
         placement.minduration = bid.mediaTypes[VIDEO].minduration;
         placement.maxduration = bid.mediaTypes[VIDEO].maxduration;
diff --git a/modules/consentManagement.js b/modules/consentManagement.js
index f0355749055..5fbcc0f8ac1 100644
--- a/modules/consentManagement.js
+++ b/modules/consentManagement.js
@@ -36,8 +36,8 @@ const cmpCallMap = {
  * This function reads the consent string from the config to obtain the consent information of the user.
  * @param {function({})} onSuccess acts as a success callback when the value is read from config; pass along consentObject from CMP
  */
-function lookupStaticConsentData({onSuccess}) {
-  onSuccess(staticConsentData);
+function lookupStaticConsentData({onSuccess, onError}) {
+  processCmpData(staticConsentData, {onSuccess, onError})
 }
 
 /**
@@ -335,8 +335,8 @@ export function requestBidsHook(fn, reqBidsConfigObj) {
       let height = 1;
       if (Array.isArray(adUnits) && adUnits.length > 0) {
         let sizes = getAdUnitSizes(adUnits[0]);
-        width = sizes[0][0];
-        height = sizes[0][1];
+        width = sizes?.[0]?.[0] || 1;
+        height = sizes?.[0]?.[1] || 1;
       }
 
       return function (cb) {
diff --git a/modules/consentManagementUsp.js b/modules/consentManagementUsp.js
index e98b41d5c9e..d6bf913b366 100644
--- a/modules/consentManagementUsp.js
+++ b/modules/consentManagementUsp.js
@@ -28,8 +28,8 @@ const uspCallMap = {
 /**
  * This function reads the consent string from the config to obtain the consent information of the user.
  */
-function lookupStaticConsentData({onSuccess}) {
-  onSuccess(staticConsentData);
+function lookupStaticConsentData({onSuccess, onError}) {
+  processUspData(staticConsentData, {onSuccess, onError});
 }
 
 /**
diff --git a/modules/currency.js b/modules/currency.js
index a59a9880af1..7f88c4b0aeb 100644
--- a/modules/currency.js
+++ b/modules/currency.js
@@ -168,6 +168,8 @@ function initCurrency(url) {
         }
       }
     );
+  } else {
+    ready.done();
   }
 }
 
diff --git a/modules/debugging/pbsInterceptor.js b/modules/debugging/pbsInterceptor.js
index 5af2384cad9..c8de1ed9753 100644
--- a/modules/debugging/pbsInterceptor.js
+++ b/modules/debugging/pbsInterceptor.js
@@ -1,6 +1,6 @@
 import {deepClone, delayExecution} from '../../src/utils.js';
 import {createBid} from '../../src/bidfactory.js';
-import * as CONSTANTS from '../../src/constants.json';
+import {default as CONSTANTS} from '../../src/constants.json';
 
 export function pbsBidInterceptor (next, interceptBids, s2sBidRequest, bidRequests, ajax, {
   onResponse,
diff --git a/modules/e_volutionBidAdapter.js b/modules/e_volutionBidAdapter.js
index 884c4f0c067..63332db8725 100644
--- a/modules/e_volutionBidAdapter.js
+++ b/modules/e_volutionBidAdapter.js
@@ -41,6 +41,19 @@ function getBidFloor(bid) {
   }
 }
 
+function getUserId(eids, id, source, uidExt) {
+  if (id) {
+    var uid = { id };
+    if (uidExt) {
+      uid.ext = uidExt;
+    }
+    eids.push({
+      source,
+      uids: [ uid ]
+    });
+  }
+}
+
 export const spec = {
   code: BIDDER_CODE,
   supportedMediaTypes: [BANNER, VIDEO, NATIVE],
@@ -86,7 +99,12 @@ export const spec = {
       const placement = {
         placementId: bid.params.placementId,
         bidId: bid.bidId,
-        bidfloor: getBidFloor(bid)
+        bidfloor: getBidFloor(bid),
+        eids: []
+      }
+
+      if (bid.userId) {
+        getUserId(placement.eids, bid.userId.id5id, 'id5-sync.com');
       }
 
       if (bid.mediaTypes && bid.mediaTypes[BANNER] && bid.mediaTypes[BANNER].sizes) {
diff --git a/modules/ftrackIdSystem.js b/modules/ftrackIdSystem.js
index c570e69e1d3..21206109ee0 100644
--- a/modules/ftrackIdSystem.js
+++ b/modules/ftrackIdSystem.js
@@ -73,8 +73,6 @@ export const ftrackIdSubmodule = {
           CCampID: '148556'
         };
         window.D9r = {
-          DeviceID: true,
-          SingleDeviceID: true,
           callback: function(response) {
             if (response) {
               storage.setDataInLocalStorage(`${FTRACK_STORAGE_NAME}_exp`, (new Date(Date.now() + (1000 * 60 * 60 * 24 * LOCAL_STORAGE_EXP_DAYS))).toUTCString());
@@ -88,6 +86,22 @@ export const ftrackIdSubmodule = {
           }
         };
 
+        // If config.params.ids does not exist, set defaults
+        if (!config.params.hasOwnProperty('ids')) {
+          window.D9r.DeviceID = true;
+          window.D9r.SingleDeviceID = true;
+        } else {
+          if (config.params.ids.hasOwnProperty('device id') && config.params.ids['device id'] === true) {
+            window.D9r.DeviceID = true;
+          }
+          if (config.params.ids.hasOwnProperty('single device id') && config.params.ids['single device id'] === true) {
+            window.D9r.SingleDeviceID = true;
+          }
+          if (config.params.ids.hasOwnProperty('household id') && config.params.ids['household id'] === true) {
+            window.D9r.HHID = true;
+          }
+        }
+
         if (config.params && config.params.url && config.params.url === FTRACK_URL) {
           var ftrackScript = document.createElement('script');
           ftrackScript.setAttribute('src', config.params.url);
diff --git a/modules/ftrackIdSystem.md b/modules/ftrackIdSystem.md
index c5f255c2fc2..0c92f5afab1 100644
--- a/modules/ftrackIdSystem.md
+++ b/modules/ftrackIdSystem.md
@@ -30,7 +30,12 @@ pbjs.setConfig({
     userIds: [{
       name: 'FTrack',
       params: {
-        url: 'https://d9.flashtalking.com/d9core' // required, if not populated ftrack will not run
+        url: 'https://d9.flashtalking.com/d9core', // required, if not populated ftrack will not run
+        ids: {
+          'device id': true,
+          'single device id': true,
+          'household id': true
+        }
       },
       storage: {
         type: 'html5',           // "html5" is the required storage type
@@ -47,6 +52,12 @@ pbjs.setConfig({
 | Param under userSync.userIds[] | Scope | Type | Description | Example |
 | :-- | :-- | :-- | :-- | :-- |
 | name | Required | String | The name of this module: `"FTrack"` | `"FTrack"` |
+| params | Required | Object | The IDs available, if not populated then the defaults "Device ID" and "Single Device ID" will be returned | |
+| params.url | Required | String | The URL for the ftrack library reference. If not populate, ftrack will not run. | 'https://d9.flashtalking.com/d9core' |
+| params.ids | Optional | Object | The ftrack IDs available, if not populated then the defaults "Device ID" and "Single Device ID" will be returned | |
+| params.ids['device id'] | Optional | Boolean | Should ftrack return "device id". Set to `true` to return it. If set to `undefined` or `false`, ftrack will not return "device id". Default is `false` | `true` |
+| params.ids['single device id'] | Optional | Boolean | Should ftrack return "single device id". Set to `true` to return it. If set to `undefined` or `false`, ftrack will not return "single device id". Default is `false` | `true` |
+| params.ids['household id'] | Optional; _Requires pairing with either "device id" or "single device id"_ | Boolean | __1.__ Should ftrack return "household id". Set to `true` to attempt to return it. If set to `undefined` or `false`, ftrack will not return "household id". Default is `false`.  __2.__ _This will only return "household id" if value of this field is `true` **AND** "household id" is defined on the device._ __3.__ _"household id" requires either "device id" or "single device id" to be also set to `true`, otherwise ftrack will not return "household id"._ | `true` |
 | storage | Required | Object | Storage settings for how the User ID module will cache the FTrack ID locally | |
 | storage.type | Required | String | This is where the results of the user ID will be stored. FTrack **requires** `"html5"`. | `"html5"` |
 | storage.name | Required | String | The name of the local storage where the user ID will be stored. FTrack **requires** `"FTrackId"`. | `"FTrackId"` |
diff --git a/modules/malltvAnalyticsAdapter.js b/modules/malltvAnalyticsAdapter.js
index 3431681ef2f..a0e2a208bc9 100644
--- a/modules/malltvAnalyticsAdapter.js
+++ b/modules/malltvAnalyticsAdapter.js
@@ -184,5 +184,5 @@ malltvAnalyticsAdapter.enableAnalytics = function (config) {
 
 adapterManager.registerAnalyticsAdapter({
   adapter: malltvAnalyticsAdapter,
-  code: 'malltvAnalytics'
+  code: 'malltv'
 })
diff --git a/modules/mobfoxpbBidAdapter.js b/modules/mobfoxpbBidAdapter.js
new file mode 100644
index 00000000000..a4af7133370
--- /dev/null
+++ b/modules/mobfoxpbBidAdapter.js
@@ -0,0 +1,135 @@
+import { isFn, deepAccess, getWindowTop } from '../src/utils.js';
+import { registerBidder } from '../src/adapters/bidderFactory.js';
+import { BANNER, NATIVE, VIDEO } from '../src/mediaTypes.js';
+
+const BIDDER_CODE = 'mobfoxpb';
+const AD_URL = 'https://bes.mobfox.com/pbjs';
+
+function isBidResponseValid(bid) {
+  if (!bid.requestId || !bid.cpm || !bid.creativeId ||
+    !bid.ttl || !bid.currency) {
+    return false;
+  }
+  switch (bid.mediaType) {
+    case BANNER:
+      return Boolean(bid.width && bid.height && bid.ad);
+    case VIDEO:
+      return Boolean(bid.vastUrl);
+    case NATIVE:
+      return Boolean(bid.native && bid.native.impressionTrackers);
+    default:
+      return false;
+  }
+}
+
+function getBidFloor(bid) {
+  if (!isFn(bid.getFloor)) {
+    return deepAccess(bid, 'params.bidfloor', 0);
+  }
+
+  try {
+    const bidFloor = bid.getFloor({
+      currency: 'USD',
+      mediaType: '*',
+      size: '*',
+    });
+    return bidFloor.floor;
+  } catch (_) {
+    return 0
+  }
+}
+
+export const spec = {
+  code: BIDDER_CODE,
+  supportedMediaTypes: [BANNER, VIDEO, NATIVE],
+
+  isBidRequestValid: (bid) => {
+    return Boolean(bid.bidId && bid.params && bid.params.placementId);
+  },
+
+  buildRequests: (validBidRequests = [], bidderRequest) => {
+    const winTop = getWindowTop();
+    const location = winTop.location;
+    const placements = [];
+    const request = {
+      'deviceWidth': winTop.screen.width,
+      'deviceHeight': winTop.screen.height,
+      'language': (navigator && navigator.language) ? navigator.language.split('-')[0] : '',
+      'secure': 1,
+      'host': location.host,
+      'page': location.pathname,
+      'placements': placements
+    };
+
+    if (bidderRequest) {
+      if (bidderRequest.uspConsent) {
+        request.ccpa = bidderRequest.uspConsent;
+      }
+      if (bidderRequest.gdprConsent) {
+        request.gdpr = bidderRequest.gdprConsent
+      }
+    }
+
+    const len = validBidRequests.length;
+    for (let i = 0; i < len; i++) {
+      const bid = validBidRequests[i];
+      const placement = {
+        placementId: bid.params.placementId,
+        bidId: bid.bidId,
+        schain: bid.schain || {},
+        bidfloor: getBidFloor(bid)
+      };
+      const mediaType = bid.mediaTypes
+
+      if (mediaType && mediaType[BANNER] && mediaType[BANNER].sizes) {
+        placement.traffic = BANNER;
+        placement.sizes = mediaType[BANNER].sizes;
+      } else if (mediaType && mediaType[VIDEO] && mediaType[VIDEO].playerSize) {
+        placement.traffic = VIDEO;
+        placement.wPlayer = mediaType[VIDEO].playerSize[0];
+        placement.hPlayer = mediaType[VIDEO].playerSize[1];
+        placement.playerSize = mediaType[VIDEO].playerSize;
+        placement.minduration = mediaType[VIDEO].minduration;
+        placement.maxduration = mediaType[VIDEO].maxduration;
+        placement.mimes = mediaType[VIDEO].mimes;
+        placement.protocols = mediaType[VIDEO].protocols;
+        placement.startdelay = mediaType[VIDEO].startdelay;
+        placement.placement = mediaType[VIDEO].placement;
+        placement.skip = mediaType[VIDEO].skip;
+        placement.skipafter = mediaType[VIDEO].skipafter;
+        placement.minbitrate = mediaType[VIDEO].minbitrate;
+        placement.maxbitrate = mediaType[VIDEO].maxbitrate;
+        placement.delivery = mediaType[VIDEO].delivery;
+        placement.playbackmethod = mediaType[VIDEO].playbackmethod;
+        placement.api = mediaType[VIDEO].api;
+        placement.linearity = mediaType[VIDEO].linearity;
+      } else if (mediaType && mediaType[NATIVE]) {
+        placement.traffic = NATIVE;
+        placement.native = mediaType[NATIVE];
+      }
+      placements.push(placement);
+    }
+
+    return {
+      method: 'POST',
+      url: AD_URL,
+      data: request
+    };
+  },
+
+  interpretResponse: (serverResponse) => {
+    let response = [];
+    for (let i = 0; i < serverResponse.body.length; i++) {
+      let resItem = serverResponse.body[i];
+      if (isBidResponseValid(resItem)) {
+        resItem.meta = resItem.meta || {};
+        resItem.meta.advertiserDomains = resItem.adomain || [];
+
+        response.push(resItem);
+      }
+    }
+    return response;
+  },
+};
+
+registerBidder(spec);
diff --git a/modules/mobfoxpbBidAdapter.md b/modules/mobfoxpbBidAdapter.md
index 6eb549919d7..f434b2792a9 100644
--- a/modules/mobfoxpbBidAdapter.md
+++ b/modules/mobfoxpbBidAdapter.md
@@ -24,7 +24,7 @@ Module that connects to mobfox demand sources
                         {
                             bidder: 'mobfoxpb',
                             params: {
-                                placementId: 0
+                                placementId: 'testBanner'
                             }
                         }
                     ]
@@ -41,7 +41,7 @@ Module that connects to mobfox demand sources
                         {
                             bidder: 'mobfoxpb',
                             params: {
-                                placementId: 0
+                                placementId: 'testVideo'
                             }
                         }
                     ]
@@ -63,7 +63,7 @@ Module that connects to mobfox demand sources
                         {
                             bidder: 'mobfoxpb',
                             params: {
-                                placementId: 0
+                                placementId: 'testNative'
                             }
                         }
                     ]
diff --git a/modules/nextMillenniumBidAdapter.js b/modules/nextMillenniumBidAdapter.js
index 365d692e614..91508d38ca0 100644
--- a/modules/nextMillenniumBidAdapter.js
+++ b/modules/nextMillenniumBidAdapter.js
@@ -1,9 +1,10 @@
-import { isStr, _each, getBidIdParameter } from '../src/utils.js';
+import { isStr, _each, parseUrl, getWindowTop, getBidIdParameter } from '../src/utils.js';
 import { registerBidder } from '../src/adapters/bidderFactory.js';
 import { BANNER } from '../src/mediaTypes.js';
 
 const BIDDER_CODE = 'nextMillennium';
 const ENDPOINT = 'https://pbs.nextmillmedia.com/openrtb2/auction';
+const TEST_ENDPOINT = 'https://test.pbs.nextmillmedia.com/openrtb2/auction';
 const SYNC_ENDPOINT = 'https://statics.nextmillmedia.com/load-cookie.html?v=4';
 const TIME_TO_LIVE = 360;
 
@@ -61,9 +62,12 @@ export const spec = {
         }
       }
 
+      const urlParameters = parseUrl(getWindowTop().location.href).search;
+      const isTest = urlParameters['pbs'] && urlParameters['pbs'] === 'test';
+
       requests.push({
         method: 'POST',
-        url: ENDPOINT,
+        url: isTest ? TEST_ENDPOINT : ENDPOINT,
         data: JSON.stringify(postBody),
         options: {
           contentType: 'application/json',
diff --git a/modules/nexx360BidAdapter.js b/modules/nexx360BidAdapter.js
index 0689d3b04ce..814a2f55299 100644
--- a/modules/nexx360BidAdapter.js
+++ b/modules/nexx360BidAdapter.js
@@ -1,5 +1,6 @@
 import {ajax} from '../src/ajax.js';
 import {config} from '../src/config.js';
+import { transformBidderParamKeywords } from '../src/utils.js';
 import {registerBidder} from '../src/adapters/bidderFactory.js';
 import {BANNER, VIDEO} from '../src/mediaTypes.js';
 
@@ -8,8 +9,11 @@ const BIDDER_URL = 'https://fast.nexx360.io/prebid';
 const CACHE_URL = 'https://fast.nexx360.io/cache';
 const METRICS_TRACKER_URL = 'https://fast.nexx360.io/track-imp';
 
+const GVLID = 965;
+
 export const spec = {
   code: BIDDER_CODE,
+  gvlid: GVLID,
   aliases: ['revenuemaker'], // short code
   supportedMediaTypes: [BANNER, VIDEO],
   /**
@@ -19,6 +23,9 @@ export const spec = {
          * @return boolean True if this is a valid bid, and false otherwise.
          */
   isBidRequestValid: function(bid) {
+    if (!!bid.params.bidfloorCurrency && !['EUR', 'USD'].includes(bid.params.bidfloorCurrency)) return false;
+    if (!!bid.params.bidfloor && typeof bid.params.bidfloor !== 'number') return false;
+    if (!!bid.params.keywords && typeof bid.params.keywords !== 'object') return false;
     return !!(bid.params.account && bid.params.tagId);
   },
   /**
@@ -34,7 +41,7 @@ export const spec = {
     let userEids = null;
     Object.keys(validBidRequests).forEach(key => {
       adunitValue = validBidRequests[key];
-      adUnits.push({
+      const foo = {
         account: adunitValue.params.account,
         tagId: adunitValue.params.tagId,
         videoExt: adunitValue.params.videoExt,
@@ -42,8 +49,12 @@ export const spec = {
         bidId: adunitValue.bidId,
         auctionId: adunitValue.auctionId,
         transactionId: adunitValue.transactionId,
-        mediatypes: adunitValue.mediaTypes
-      });
+        mediatypes: adunitValue.mediaTypes,
+        bidfloor: adunitValue.params.bidfloor || 0,
+        bidfloorCurrency: adunitValue.params.bidfloorCurrency || 'USD',
+        keywords: adunitValue.params.keywords ? transformBidderParamKeywords(adunitValue.params.keywords) : [],
+      }
+      adUnits.push(foo);
       if (adunitValue.userIdAsEids) userEids = adunitValue.userIdAsEids;
     });
     const payload = {
@@ -78,7 +89,6 @@ export const spec = {
          */
   interpretResponse: function(serverResponse, bidRequest) {
     const serverBody = serverResponse.body;
-    // const headerValue = serverResponse.headers.get('some-response-header');
     const bidResponses = [];
     let bidResponse = null;
     let value = null;
diff --git a/modules/otmBidAdapter.js b/modules/otmBidAdapter.js
index a0e91a480a2..e81bdfa9e6a 100644
--- a/modules/otmBidAdapter.js
+++ b/modules/otmBidAdapter.js
@@ -1,10 +1,21 @@
 import { registerBidder } from '../src/adapters/bidderFactory.js';
-import {logInfo, logError, getBidIdParameter, _each, getValue, isFn, isPlainObject} from '../src/utils.js';
+import {
+  logInfo,
+  logError,
+  getBidIdParameter,
+  _each,
+  getValue,
+  isFn,
+  isPlainObject,
+  isArray,
+  isStr,
+  isNumber,
+} from '../src/utils.js';
 import { BANNER } from '../src/mediaTypes.js';
 
 const BIDDER_CODE = 'otm';
 const OTM_BID_URL = 'https://ssp.otm-r.com/adjson';
-const DEF_CUR = 'RUB'
+const DEFAULT_CURRENCY = 'RUB'
 
 export const spec = {
 
@@ -19,7 +30,7 @@ export const spec = {
    * @return boolean True if this is a valid bid, and false otherwise.
    */
   isBidRequestValid: function (bid) {
-    return !!bid.params.tid;
+    return Boolean(bid.params.tid);
   },
 
   /**
@@ -33,43 +44,41 @@ export const spec = {
     logInfo('validBidRequests', validBidRequests);
 
     const bidRequests = [];
-    let tz = new Date().getTimezoneOffset()
-    let referrer = '';
-    if (bidderRequest && bidderRequest.refererInfo) {
-      referrer = bidderRequest.refererInfo.referer;
-    }
+    const tz = new Date().getTimezoneOffset()
+    const referrer = bidderRequest && bidderRequest.refererInfo ? bidderRequest.refererInfo.referer : '';
 
     _each(validBidRequests, (bid) => {
-      let domain = getValue(bid.params, 'domain') || ''
-      let tid = getValue(bid.params, 'tid')
-      let cur = getValue(bid.params, 'currency') || DEF_CUR
-      let bidid = getBidIdParameter('bidId', bid)
-      let transactionid = getBidIdParameter('transactionId', bid)
-      let auctionid = getBidIdParameter('auctionId', bid)
-      let bidfloor = _getBidFloor(bid)
+      let topOrigin = ''
+      try {
+        if (isStr(referrer)) topOrigin = new URL(referrer).host
+      } catch (e) { /* do nothing */ }
+      const domain = isStr(bid.params.domain) ? bid.params.domain : topOrigin
+      const cur = getValue(bid.params, 'currency') || DEFAULT_CURRENCY
+      const bidid = getBidIdParameter('bidId', bid)
+      const transactionid = getBidIdParameter('transactionId', bid)
+      const auctionid = getBidIdParameter('auctionId', bid)
+      const bidfloor = _getBidFloor(bid)
 
       _each(bid.sizes, size => {
-        let width = 0;
-        let height = 0;
-        if (size.length && typeof size[0] === 'number' && typeof size[1] === 'number') {
-          width = size[0];
-          height = size[1];
-        }
+        const hasSizes = isArray(size) && isNumber(size[0]) && isNumber(size[1])
+        const width = hasSizes ? size[0] : 0;
+        const height = hasSizes ? size[1] : 0;
+
         bidRequests.push({
           method: 'GET',
           url: OTM_BID_URL,
           data: {
-            tz: tz,
+            tz,
             w: width,
             h: height,
-            domain: domain,
+            domain,
             l: referrer,
-            s: tid,
-            cur: cur,
-            bidid: bidid,
-            transactionid: transactionid,
-            auctionid: auctionid,
-            bidfloor: bidfloor,
+            s: bid.params.tid,
+            cur,
+            bidid,
+            transactionid,
+            auctionid,
+            bidfloor,
           },
         })
       })
@@ -81,10 +90,9 @@ export const spec = {
    * Generate response.
    *
    * @param serverResponse
-   * @param request
    * @returns {[]|*[]}
    */
-  interpretResponse: function (serverResponse, request) {
+  interpretResponse: function (serverResponse) {
     logInfo('serverResponse', serverResponse.body);
 
     const responsesBody = serverResponse ? serverResponse.body : {};
@@ -102,7 +110,7 @@ export const spec = {
             width: bid.w,
             height: bid.h,
             creativeId: bid.creativeid,
-            currency: bid.currency || 'RUB',
+            currency: bid.currency || DEFAULT_CURRENCY,
             netRevenue: true,
             ad: bid.ad,
             ttl: bid.ttl,
@@ -132,12 +140,12 @@ function _getBidFloor(bid) {
     return bid.params.bidfloor ? bid.params.bidfloor : 0;
   }
 
-  let floor = bid.getFloor({
-    currency: DEF_CUR,
+  const floor = bid.getFloor({
+    currency: DEFAULT_CURRENCY,
     mediaType: '*',
     size: '*'
   });
-  if (isPlainObject(floor) && !isNaN(floor.floor) && floor.currency === DEF_CUR) {
+  if (isPlainObject(floor) && !isNaN(floor.floor) && floor.currency === DEFAULT_CURRENCY) {
     return floor.floor;
   }
   return 0;
diff --git a/modules/prebidServerBidAdapter/index.js b/modules/prebidServerBidAdapter/index.js
index d30fd5bf810..62f550eb216 100644
--- a/modules/prebidServerBidAdapter/index.js
+++ b/modules/prebidServerBidAdapter/index.js
@@ -38,6 +38,7 @@ import {find, includes} from '../../src/polyfill.js';
 import { S2S_VENDORS } from './config.js';
 import { ajax } from '../../src/ajax.js';
 import {hook} from '../../src/hook.js';
+import {getGlobal} from '../../src/prebidGlobal.js';
 
 const getConfig = config.getConfig;
 
@@ -755,21 +756,64 @@ Object.assign(ORTB2.prototype, {
         deepSetValue(imp, 'ext.prebid.storedauctionresponse.id', storedAuctionResponseBid.storedAuctionResponse.toString());
       }
 
-      const getFloorBid = find(firstBidRequest.bids, bid => bid.adUnitCode === adUnit.code && typeof bid.getFloor === 'function');
+      const floor = (() => {
+        // we have to pick a floor for the imp - here we attempt to find the minimum floor
+        // across all bids for this adUnit
+
+        const convertCurrency = typeof getGlobal().convertCurrency !== 'function'
+          ? (amount) => amount
+          : (amount, from, to) => {
+            if (from === to) return amount;
+            let result = null;
+            try {
+              result = getGlobal().convertCurrency(amount, from, to);
+            } catch (e) {
+            }
+            return result;
+          }
+        const s2sCurrency = config.getConfig('currency.adServerCurrency') || DEFAULT_S2S_CURRENCY;
+
+        return adUnit.bids
+          .map((bid) => this.getBidRequest(imp.id, bid.bidder))
+          .map((bid) => {
+            if (!bid || typeof bid.getFloor !== 'function') return;
+            try {
+              const {currency, floor} = bid.getFloor({
+                currency: s2sCurrency
+              });
+              return {
+                currency,
+                floor: parseFloat(floor)
+              }
+            } catch (e) {
+              logError('PBS: getFloor threw an error: ', e);
+            }
+          })
+          .reduce((min, floor) => {
+            // if any bid does not have a valid floor, do not attempt to send any to PBS
+            if (floor == null || floor.currency == null || floor.floor == null || isNaN(floor.floor)) {
+              min.min = null;
+            }
+            if (min.min === null) {
+              return min;
+            }
+            // otherwise, pick the minimum one (or, in some strange confluence of circumstances, the one in the best currency)
+            if (min.ref == null) {
+              min.ref = min.min = floor;
+            } else {
+              const value = convertCurrency(floor.floor, floor.currency, min.ref.currency);
+              if (value != null && value < min.ref.floor) {
+                min.ref.floor = value;
+                min.min = floor;
+              }
+            }
+            return min;
+          }, {}).min
+      })();
 
-      if (getFloorBid) {
-        let floorInfo;
-        try {
-          floorInfo = getFloorBid.getFloor({
-            currency: config.getConfig('currency.adServerCurrency') || DEFAULT_S2S_CURRENCY,
-          });
-        } catch (e) {
-          logError('PBS: getFloor threw an error: ', e);
-        }
-        if (floorInfo && floorInfo.currency && !isNaN(parseFloat(floorInfo.floor))) {
-          imp.bidfloor = parseFloat(floorInfo.floor);
-          imp.bidfloorcur = floorInfo.currency
-        }
+      if (floor) {
+        imp.bidfloor = floor.floor;
+        imp.bidfloorcur = floor.currency
       }
 
       if (imp.banner || imp.video || imp.native) {
diff --git a/modules/pubmaticBidAdapter.js b/modules/pubmaticBidAdapter.js
index 0667ac0fc74..d64c6092afa 100644
--- a/modules/pubmaticBidAdapter.js
+++ b/modules/pubmaticBidAdapter.js
@@ -977,6 +977,25 @@ function _blockedIabCategoriesValidation(payload, blockedIabCategories) {
   }
 }
 
+function _allowedIabCategoriesValidation(payload, allowedIabCategories) {
+  allowedIabCategories = allowedIabCategories
+    .filter(function(category) {
+      if (typeof category === 'string') { // returns only strings
+        return true;
+      } else {
+        logWarn(LOG_WARN_PREFIX + 'acat: Each category should be a string, ignoring category: ' + category);
+        return false;
+      }
+    })
+    .map(category => category.trim()) // trim all categories
+    .filter((category, index, arr) => arr.indexOf(category) === index); // return unique values only
+
+  if (allowedIabCategories.length > 0) {
+    logWarn(LOG_WARN_PREFIX + 'acat: Selected: ', allowedIabCategories);
+    payload.ext.acat = allowedIabCategories;
+  }
+}
+
 function _assignRenderer(newBid, request) {
   let bidParams, context, adUnitCode;
   if (request.bidderRequest && request.bidderRequest.bids) {
@@ -1082,6 +1101,7 @@ export const spec = {
     var dctrArr = [];
     var bid;
     var blockedIabCategories = [];
+    var allowedIabCategories = [];
 
     validBidRequests.forEach(originalBid => {
       bid = deepClone(originalBid);
@@ -1113,6 +1133,9 @@ export const spec = {
       if (bid.params.hasOwnProperty('bcat') && isArray(bid.params.bcat)) {
         blockedIabCategories = blockedIabCategories.concat(bid.params.bcat);
       }
+      if (bid.params.hasOwnProperty('acat') && isArray(bid.params.acat)) {
+        allowedIabCategories = allowedIabCategories.concat(bid.params.acat);
+      }
       var impObj = _createImpressionObject(bid, conf);
       if (impObj) {
         payload.imp.push(impObj);
@@ -1182,7 +1205,7 @@ export const spec = {
     }
 
     _handleEids(payload, validBidRequests);
-    _blockedIabCategoriesValidation(payload, blockedIabCategories);
+
     _handleFlocId(payload, validBidRequests);
     // First Party Data
     const commonFpd = config.getConfig('ortb2') || {};
@@ -1192,7 +1215,16 @@ export const spec = {
     if (commonFpd.user) {
       mergeDeep(payload, {user: commonFpd.user});
     }
-
+    if (commonFpd.bcat) {
+      blockedIabCategories = blockedIabCategories.concat(commonFpd.bcat)
+    }
+    if (commonFpd.ext?.prebid?.bidderparams?.[bidderRequest.bidderCode]?.acat) {
+      const acatParams = commonFpd.ext.prebid.bidderparams[bidderRequest.bidderCode].acat;
+      _allowedIabCategoriesValidation(payload, acatParams);
+    } else if (allowedIabCategories.length) {
+      _allowedIabCategoriesValidation(payload, allowedIabCategories);
+    }
+    _blockedIabCategoriesValidation(payload, blockedIabCategories);
     // Note: Do not move this block up
     // if site object is set in Prebid config then we need to copy required fields from site into app and unset the site object
     if (typeof config.getConfig('app') === 'object') {
diff --git a/modules/seedingAllianceBidAdapter.js b/modules/seedingAllianceBidAdapter.js
index 05dcf15909a..a071cdfea80 100755
--- a/modules/seedingAllianceBidAdapter.js
+++ b/modules/seedingAllianceBidAdapter.js
@@ -8,7 +8,7 @@ import { config } from '../src/config.js';
 
 const BIDDER_CODE = 'seedingAlliance';
 const DEFAULT_CUR = 'EUR';
-const ENDPOINT_URL = 'https://b.nativendo.de/cds/rtb/bid?format=openrtb2.5&ssp=nativendo';
+const ENDPOINT_URL = 'https://b.nativendo.de/cds/rtb/bid?format=openrtb2.5&ssp=pb';
 
 const NATIVE_ASSET_IDS = {0: 'title', 1: 'body', 2: 'sponsoredBy', 3: 'image', 4: 'cta', 5: 'icon'};
 
@@ -124,7 +124,8 @@ export const spec = {
       user: {},
       regs: {
         ext: {
-          gdpr: 0
+          gdpr: 0,
+          pb_ver: '$prebid.version$'
         }
       }
     };
@@ -187,11 +188,14 @@ registerBidder(spec);
 function parseNative(bid) {
   const {assets, link, imptrackers} = bid.adm.native;
 
+  let clickUrl = link.url.replace(/\$\{AUCTION_PRICE\}/g, bid.price);
+
   if (link.clicktrackers) {
     link.clicktrackers.forEach(function (clicktracker, index) {
       link.clicktrackers[index] = clicktracker.replace(/\$\{AUCTION_PRICE\}/g, bid.price);
     });
   }
+
   if (imptrackers) {
     imptrackers.forEach(function (imptracker, index) {
       imptrackers[index] = imptracker.replace(/\$\{AUCTION_PRICE\}/g, bid.price);
@@ -199,8 +203,8 @@ function parseNative(bid) {
   }
 
   const result = {
-    url: link.url,
-    clickUrl: link.url,
+    url: clickUrl,
+    clickUrl: clickUrl,
     clickTrackers: link.clicktrackers || undefined,
     impressionTrackers: imptrackers || undefined
   };
diff --git a/modules/userId/index.js b/modules/userId/index.js
index e656673befb..44fbc871bb5 100644
--- a/modules/userId/index.js
+++ b/modules/userId/index.js
@@ -125,11 +125,6 @@
  * @property {(function|undefined)} callback - function that will return an id
  */
 
-/**
-  * @typedef {Object} RefreshUserIdsOptions
-  * @property {(string[]|undefined)} submoduleNames - submodules to refresh
-  */
-
 import {find, includes} from '../../src/polyfill.js';
 import {config} from '../../src/config.js';
 import * as events from '../../src/events.js';
@@ -199,6 +194,8 @@ export let auctionDelay;
 /** @type {(string|undefined)} */
 let ppidSource;
 
+let configListener;
+
 /** @param {Submodule[]} submodules */
 export function setSubmoduleRegistry(submodules) {
   submoduleRegistry = submodules;
@@ -473,8 +470,8 @@ function getSubmoduleId(submodules, sourceName) {
     return {};
   }
   const submodule = submodules.filter(sub => isPlainObject(sub.idObj) &&
-  Object.keys(sub.idObj).length && USER_IDS_CONFIG[Object.keys(sub.idObj)[0]].source === sourceName)
-  return !isEmpty(submodule) ? submodule[0].idObj : []
+    Object.keys(sub.idObj).length && USER_IDS_CONFIG[Object.keys(sub.idObj)[0]]?.source === sourceName);
+  return !isEmpty(submodule) ? submodule[0].idObj : [];
 }
 
 /**
@@ -519,59 +516,133 @@ function addIdDataToAdUnitBids(adUnits, submodules) {
   });
 }
 
-/**
- * This is a common function that will initialize subModules if not already done and it will also execute subModule callbacks
- */
-function initializeSubmodulesAndExecuteCallbacks(continueAuction) {
-  let delayed = false;
-
-  // initialize submodules only when undefined
-  if (typeof initializedSubmodules === 'undefined') {
-    initializedSubmodules = initSubmodules(submodules, gdprDataHandler.getConsentData());
-    if (initializedSubmodules.length) {
-      setPrebidServerEidPermissions(initializedSubmodules);
-      // list of submodules that have callbacks that need to be executed
-      const submodulesWithCallbacks = initializedSubmodules.filter(item => isFn(item.callback));
-
-      if (submodulesWithCallbacks.length) {
-        if (continueAuction && auctionDelay > 0) {
-          // delay auction until ids are available
-          delayed = true;
-          let continued = false;
-          const continueCallback = function () {
-            if (!continued) {
-              continued = true;
-              continueAuction();
-            }
-          }
-          logInfo(`${MODULE_NAME} - auction delayed by ${auctionDelay} at most to fetch ids`);
+function delayFor(ms) {
+  return new Promise((resolve) => setTimeout(resolve, ms));
+}
 
-          timeoutID = setTimeout(continueCallback, auctionDelay);
-          processSubmoduleCallbacks(submodulesWithCallbacks, continueCallback);
+function idSystemInitializer({delay = delayFor} = {}) {
+  /**
+   * @returns a {promise, resolve, reject} trio where `promise` is resolved by calling `resolve` or `reject`.
+   */
+  function breakpoint() {
+    const [SUCCESS, FAIL, RESULT] = [0, 1, 2];
+    const status = {};
+
+    function finisher(slot) {
+      return function (val) {
+        if (status[slot] != null) {
+          status[slot](val);
         } else {
-          // wait for auction complete before processing submodule callbacks
-          events.on(CONSTANTS.EVENTS.AUCTION_END, function auctionEndHandler() {
-            events.off(CONSTANTS.EVENTS.AUCTION_END, auctionEndHandler);
-
-            // when syncDelay is zero, process callbacks now, otherwise delay process with a setTimeout
-            if (syncDelay > 0) {
-              setTimeout(function () {
-                processSubmoduleCallbacks(submodulesWithCallbacks);
-              }, syncDelay);
-            } else {
-              processSubmoduleCallbacks(submodulesWithCallbacks);
-            }
-          });
+          status[slot] = true;
+          status[RESULT] = val;
         }
       }
     }
+
+    return {
+      promise: new Promise((resolve, reject) => {
+        if (status[SUCCESS] != null) {
+          resolve(status[RESULT]);
+        } else if (status[FAIL] != null) {
+          reject(status[RESULT]);
+        } else {
+          status[SUCCESS] = resolve;
+          status[FAIL] = reject;
+        }
+      }),
+      resolve: finisher(SUCCESS),
+      reject: finisher(FAIL)
+    }
   }
 
-  if (continueAuction && !delayed) {
-    continueAuction();
+  const startInit = breakpoint();
+  const startCallbacks = breakpoint();
+  let cancel;
+  let initialized = false;
+
+  function cancelAndTry(promise) {
+    if (cancel != null) {
+      cancel.reject();
+    }
+    cancel = breakpoint();
+    return Promise.race([promise, cancel.promise]);
   }
+
+  // grab a reference to global vars so that the promise chains remain isolated;
+  // multiple calls to `init` (from tests) might otherwise cause them to interfere with each other
+  let initModules = initializedSubmodules;
+  let allModules = submodules;
+
+  function checkRefs(fn) {
+    // unfortunately tests have their own global state that needs to be guarded, so even if we keep ours tidy,
+    // we cannot let things like submodule callbacks run (they pollute things like the global `server` XHR mock)
+    return function(...args) {
+      if (initModules === initializedSubmodules && allModules === submodules) {
+        return fn(...args);
+      }
+    }
+  }
+
+  let done = cancelAndTry(
+    startInit.promise
+      .then(() => gdprDataHandler.promise)
+      .then(checkRefs((consentData) => {
+        initSubmodules(initModules, allModules, consentData);
+      }))
+      .then(() => startCallbacks.promise)
+      .then(checkRefs(() => {
+        const modWithCb = initModules.filter(item => isFn(item.callback));
+        if (modWithCb.length) {
+          return new Promise((resolve) => processSubmoduleCallbacks(modWithCb, resolve));
+        }
+      }))
+  );
+
+  /**
+   * with `ready` = true, starts initialization; with `refresh` = true, reinitialize submodules (optionally
+   * filtered by `submoduleNames`).
+   */
+  return function ({refresh = false, submoduleNames = null, ready = false} = {}) {
+    if (ready && !initialized) {
+      initialized = true;
+      startInit.resolve();
+      // submodule callbacks should run immediately if `auctionDelay` > 0, or `syncDelay` ms after the
+      // auction ends otherwise
+      if (auctionDelay > 0) {
+        startCallbacks.resolve();
+      } else {
+        events.on(CONSTANTS.EVENTS.AUCTION_END, function auctionEndHandler() {
+          events.off(CONSTANTS.EVENTS.AUCTION_END, auctionEndHandler);
+          delay(syncDelay).then(startCallbacks.resolve);
+        });
+      }
+    }
+    if (refresh) {
+      done = cancelAndTry(
+        done
+          .catch(() => null)
+          .then(() => gdprDataHandler.promise) // fetch again in case a refresh was forced before this was resolved
+          .then(checkRefs((consentData) => {
+            const cbModules = initSubmodules(
+              initModules,
+              allModules.filter((sm) => submoduleNames == null || submoduleNames.includes(sm.submodule.name)),
+              consentData,
+              true
+            ).filter((sm) => {
+              return sm.callback != null;
+            });
+            if (cbModules.length) {
+              return new Promise((resolve) => processSubmoduleCallbacks(cbModules, resolve));
+            }
+          }))
+      );
+    }
+    return done;
+  };
 }
 
+let initIdSystem;
+
 /**
  * Hook is executed before adapters, but after consentManagement. Consent data is requied because
  * this module requires GDPR consent with Purpose #1 to save data locally.
@@ -581,9 +652,11 @@ function initializeSubmodulesAndExecuteCallbacks(continueAuction) {
  * @param {Object} reqBidsConfigObj required; This is the same param that's used in pbjs.requestBids.
  * @param {function} fn required; The next function in the chain, used by hook.js
  */
-export function requestBidsHook(fn, reqBidsConfigObj) {
-  // initialize submodules only when undefined
-  initializeSubmodulesAndExecuteCallbacks(function () {
+export function requestBidsHook(fn, reqBidsConfigObj, {delay = delayFor} = {}) {
+  Promise.race([
+    getUserIdsAsync(),
+    delay(auctionDelay)
+  ]).then(() => {
     // pass available user id data to bid adapters
     addIdDataToAdUnitBids(reqBidsConfigObj.adUnits || getGlobal().adUnits, initializedSubmodules);
 
@@ -616,9 +689,7 @@ export function requestBidsHook(fn, reqBidsConfigObj) {
  * Simple use case will be passing these UserIds to A9 wrapper solution
  */
 function getUserIds() {
-  // initialize submodules only when undefined
-  initializeSubmodulesAndExecuteCallbacks();
-  return getCombinedSubmoduleIds(initializedSubmodules);
+  return getCombinedSubmoduleIds(initializedSubmodules)
 }
 
 /**
@@ -626,9 +697,7 @@ function getUserIds() {
  * Simple use case will be passing these UserIds to A9 wrapper solution
  */
 function getUserIdsAsEids() {
-  // initialize submodules only when undefined
-  initializeSubmodulesAndExecuteCallbacks();
-  return createEidsArray(getCombinedSubmoduleIds(initializedSubmodules));
+  return createEidsArray(getUserIds())
 }
 
 /**
@@ -637,33 +706,33 @@ function getUserIdsAsEids() {
  */
 
 function getUserIdsAsEidBySource(sourceName) {
-  initializeSubmodulesAndExecuteCallbacks();
   return createEidsArray(getSubmoduleId(initializedSubmodules, sourceName))[0];
-};
+}
 
 /**
  * This function will be exposed in global-name-space so that userIds for a source can be exposed
  * Sample use case is exposing this function to ESP
  */
 function getEncryptedEidsForSource(source, encrypt, customFunction) {
-  let eidsSignals = {};
-
-  if (isFn(customFunction)) {
-    logInfo(`${MODULE_NAME} - Getting encrypted signal from custom function : ${customFunction.name} & source : ${source} `);
-    // Publishers are expected to define a common function which will be proxy for signal function.
-    const customSignals = customFunction(source);
-    eidsSignals[source] = customSignals ? encryptSignals(customSignals) : null; // by default encrypt using base64 to avoid JSON errors
-  } else {
-    // initialize signal with eids by default
-    const eid = getUserIdsAsEidBySource(source);
-    logInfo(`${MODULE_NAME} - Getting encrypted signal for eids :${JSON.stringify(eid)}`);
-    if (!isEmpty(eid)) {
-      eidsSignals[eid.source] = encrypt === true ? encryptSignals(eid) : eid.uids[0].id; // If encryption is enabled append version (1||) and encrypt entire object
+  return initIdSystem().then(() => {
+    let eidsSignals = {};
+
+    if (isFn(customFunction)) {
+      logInfo(`${MODULE_NAME} - Getting encrypted signal from custom function : ${customFunction.name} & source : ${source} `);
+      // Publishers are expected to define a common function which will be proxy for signal function.
+      const customSignals = customFunction(source);
+      eidsSignals[source] = customSignals ? encryptSignals(customSignals) : null; // by default encrypt using base64 to avoid JSON errors
+    } else {
+      // initialize signal with eids by default
+      const eid = getUserIdsAsEidBySource(source);
+      logInfo(`${MODULE_NAME} - Getting encrypted signal for eids :${JSON.stringify(eid)}`);
+      if (!isEmpty(eid)) {
+        eidsSignals[eid.source] = encrypt === true ? encryptSignals(eid) : eid.uids[0].id; // If encryption is enabled append version (1||) and encrypt entire object
+      }
     }
-  }
-  const promise = Promise.resolve(eidsSignals[source]);
-  logInfo(`${MODULE_NAME} - Fetching encrypted eids: ${eidsSignals[source]}`);
-  return promise;
+    logInfo(`${MODULE_NAME} - Fetching encrypted eids: ${eidsSignals[source]}`);
+    return eidsSignals[source];
+  })
 }
 
 function encryptSignals(signals, version = 1) {
@@ -705,57 +774,37 @@ function registerSignalSources() {
 }
 
 /**
-* This function will be exposed in the global-name-space so that userIds can be refreshed after initialization.
-* @param {RefreshUserIdsOptions} options
-*/
-function refreshUserIds(options, callback) {
-  let submoduleNames = options ? options.submoduleNames : null;
-  if (!submoduleNames) {
-    submoduleNames = [];
-  }
-
-  initializeSubmodulesAndExecuteCallbacks(function() {
-    let consentData = gdprDataHandler.getConsentData()
-
-    // gdpr consent with purpose one is required, otherwise exit immediately
-    let {userIdModules, hasValidated} = validateGdprEnforcement(submodules, consentData);
-    if (!hasValidated && !hasGDPRConsent(consentData)) {
-      logWarn(`${MODULE_NAME} - gdpr permission not valid for local storage or cookies, exit module`);
-      return;
-    }
-
-    // we always want the latest consentData stored, even if we don't execute any submodules
-    const storedConsentData = getStoredConsentData();
-    setStoredConsentData(consentData);
-
-    let callbackSubmodules = [];
-    for (let submodule of userIdModules) {
-      if (submoduleNames.length > 0 &&
-        submoduleNames.indexOf(submodule.submodule.name) === -1) {
-        continue;
-      }
-
-      logInfo(`${MODULE_NAME} - refreshing ${submodule.submodule.name}`);
-      populateSubmoduleId(submodule, consentData, storedConsentData, true);
-      updateInitializedSubmodules(submodule);
-
-      if (initializedSubmodules.length) {
-        setPrebidServerEidPermissions(initializedSubmodules);
-      }
-
-      if (isFn(submodule.callback)) {
-        callbackSubmodules.push(submodule);
+ * Force (re)initialization of ID submodules.
+ *
+ * This will force a refresh of the specified ID submodules regardless of `auctionDelay` / `syncDelay` settings, and
+ * return a promise that resolves to the same value as `getUserIds()` when the refresh is complete.
+ * If a refresh is already in progress, it will be canceled (rejecting promises returned by previous calls to `refreshUserIds`).
+ *
+ * @param submoduleNames? submodules to refresh. If omitted, refresh all submodules.
+ * @param callback? called when the refresh is complete
+ */
+function refreshUserIds({submoduleNames} = {}, callback) {
+  return initIdSystem({refresh: true, submoduleNames})
+    .then(() => {
+      if (callback && isFn(callback)) {
+        callback();
       }
-    }
-
-    if (callbackSubmodules.length > 0) {
-      processSubmoduleCallbacks(callbackSubmodules);
-    }
+      return getUserIds();
+    });
+}
 
-    if (callback) {
-      callback();
-    }
-  });
+/**
+ * @returns a promise that resolves to the same value as `getUserIds()`, but only once all ID submodules have completed
+ * initialization. This can also be used to synchronize calls to other ID accessors, e.g.
+ *
+ * ```
+ * pbjs.getUserIdsAsync().then(() => {
+ *   const eids = pbjs.getUserIdsAsEids(); // guaranteed to be completely initialized at this point
+ * });
+ * ```
+ */
+function getUserIdsAsync() {
+  return initIdSystem().then(() => getUserIds(), () => getUserIdsAsync());
 }
 
 /**
@@ -816,12 +865,7 @@ function populateSubmoduleId(submodule, consentData, storedConsentData, forceRef
   }
 }
 
-/**
- * @param {SubmoduleContainer[]} submodules
- * @param {ConsentData} consentData
- * @returns {SubmoduleContainer[]} initialized submodules
- */
-function initSubmodules(submodules, consentData) {
+function initSubmodules(dest, submodules, consentData, forceRefresh = false) {
   // gdpr consent with purpose one is required, otherwise exit immediately
   let { userIdModules, hasValidated } = validateGdprEnforcement(submodules, consentData);
   if (!hasValidated && !hasGDPRConsent(consentData)) {
@@ -833,25 +877,30 @@ function initSubmodules(submodules, consentData) {
   const storedConsentData = getStoredConsentData();
   setStoredConsentData(consentData);
 
-  return userIdModules.reduce((carry, submodule) => {
-    populateSubmoduleId(submodule, consentData, storedConsentData, false);
+  const initialized = userIdModules.reduce((carry, submodule) => {
+    populateSubmoduleId(submodule, consentData, storedConsentData, forceRefresh);
     carry.push(submodule);
     return carry;
   }, []);
+  if (initialized.length) {
+    setPrebidServerEidPermissions(initialized);
+  }
+  initialized.forEach(updateInitializedSubmodules.bind(null, dest));
+  return initialized;
 }
 
-function updateInitializedSubmodules(submodule) {
+function updateInitializedSubmodules(dest, submodule) {
   let updated = false;
-  for (let i = 0; i < initializedSubmodules.length; i++) {
-    if (submodule.config.name.toLowerCase() === initializedSubmodules[i].config.name.toLowerCase()) {
+  for (let i = 0; i < dest.length; i++) {
+    if (submodule.config.name.toLowerCase() === dest[i].config.name.toLowerCase()) {
       updated = true;
-      initializedSubmodules[i] = submodule;
+      dest[i] = submodule;
       break;
     }
   }
 
   if (!updated) {
-    initializedSubmodules.push(submodule);
+    dest.push(submodule);
   }
 }
 
@@ -900,8 +949,9 @@ function updateSubmodules() {
   // do this to avoid reprocessing submodules
   const addedSubmodules = submoduleRegistry.filter(i => !find(submodules, j => j.name === i.name));
 
+  submodules.splice(0, submodules.length);
   // find submodule and the matching configuration, if found create and append a SubmoduleContainer
-  submodules = addedSubmodules.map(i => {
+  addedSubmodules.map(i => {
     const submoduleConfig = find(configs, j => j.name && (j.name.toLowerCase() === i.name.toLowerCase() ||
       (i.aliasName && j.name.toLowerCase() === i.aliasName.toLowerCase())));
     if (submoduleConfig && i.name !== submoduleConfig.name) submoduleConfig.name = i.name;
@@ -912,7 +962,8 @@ function updateSubmodules() {
       callback: undefined,
       idObj: undefined
     } : null;
-  }).filter(submodule => submodule !== null);
+  }).filter(submodule => submodule !== null)
+    .forEach((sm) => submodules.push(sm));
 
   if (!addedUserIdHook && submodules.length) {
     // priority value 40 will load after consentManagement with a priority of 50
@@ -938,12 +989,17 @@ export function attachIdSystem(submodule) {
  * so a callback is added to fire after the consentManagement module.
  * @param {{getConfig:function}} config
  */
-export function init(config) {
+export function init(config, {delay = delayFor} = {}) {
   ppidSource = undefined;
   submodules = [];
   configRegistry = [];
   addedUserIdHook = false;
-  initializedSubmodules = undefined;
+  initializedSubmodules = [];
+  initIdSystem = idSystemInitializer({delay});
+  if (configListener != null) {
+    configListener();
+  }
+  submoduleRegistry = [];
 
   // list of browser enabled storage types
   validStorageTypes = [
@@ -962,7 +1018,7 @@ export function init(config) {
   }
 
   // listen for config userSyncs to be set
-  config.getConfig('userSync', conf => {
+  configListener = config.getConfig('userSync', conf => {
     // Note: support for 'usersync' was dropped as part of Prebid.js 4.0
     const userSync = conf.userSync;
     ppidSource = userSync.ppid;
@@ -971,6 +1027,7 @@ export function init(config) {
       syncDelay = isNumber(userSync.syncDelay) ? userSync.syncDelay : DEFAULT_SYNC_DELAY;
       auctionDelay = isNumber(userSync.auctionDelay) ? userSync.auctionDelay : NO_AUCTION_DELAY;
       updateSubmodules();
+      initIdSystem({ready: true});
     }
   });
 
@@ -980,6 +1037,7 @@ export function init(config) {
   (getGlobal()).getEncryptedEidsForSource = getEncryptedEidsForSource;
   (getGlobal()).registerSignalSources = registerSignalSources;
   (getGlobal()).refreshUserIds = refreshUserIds;
+  (getGlobal()).getUserIdsAsync = getUserIdsAsync;
   (getGlobal()).getUserIdsAsEidBySource = getUserIdsAsEidBySource;
 }
 
diff --git a/modules/vibrantmediaBidAdapter.js b/modules/vibrantmediaBidAdapter.js
index b6fe51c43bc..0613f722af8 100644
--- a/modules/vibrantmediaBidAdapter.js
+++ b/modules/vibrantmediaBidAdapter.js
@@ -6,13 +6,14 @@
  * Note: Only BANNER and VIDEO are currently supported by the prebid server.
  */
 
-import {logError, logInfo} from '../src/utils.js';
+import {logError, triggerPixel} from '../src/utils.js';
 import {registerBidder} from '../src/adapters/bidderFactory.js';
 import {BANNER, NATIVE, VIDEO} from '../src/mediaTypes.js';
 import {OUTSTREAM} from '../src/video.js';
 
 const BIDDER_CODE = 'vibrantmedia';
 const VIBRANT_MEDIA_PREBID_URL = 'https://prebid.intellitxt.com/prebid';
+const VALID_PIXEL_URL_REGEX = /^https?:\/\/[a-zA-Z0-9-]+(\.[a-zA-Z0-9-]+)+([/?].*)?$/;
 const SUPPORTED_MEDIA_TYPES = [BANNER, NATIVE, VIDEO];
 
 /**
@@ -51,6 +52,10 @@ const isBaseUrl = function(url) {
   return (endOfDomain === -1) || (endOfDomain === (urlMinusScheme.length - 1));
 };
 
+const isValidPixelUrl = function (candidateUrl) {
+  return VALID_PIXEL_URL_REGEX.test(candidateUrl);
+};
+
 /**
  * Returns transformed bid requests that are in a format native to the prebid server.
  *
@@ -213,7 +218,9 @@ export const spec = {
    * @param {*} bidData the data associated with the won bid. See example above for data format.
    */
   onBidWon: function(bidData) {
-    logInfo('Bid won: ' + JSON.stringify(bidData));
+    if (bidData && bidData.meta && isValidPixelUrl(bidData.meta.wp)) {
+      triggerPixel(`${bidData.meta.wp}${bidData.status}`);
+    }
   }
 };
 
diff --git a/package-lock.json b/package-lock.json
index e40addfc54d..c4e86036f99 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "prebid.js",
-  "version": "6.20.0-pre",
+  "version": "6.23.0-pre",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
@@ -31,11 +31,12 @@
         "@wdio/concise-reporter": "^7.5.2",
         "@wdio/local-runner": "^7.5.2",
         "@wdio/mocha-framework": "^7.5.2",
-        "@wdio/spec-reporter": "^7.5.2",
+        "@wdio/spec-reporter": "^7.19.0",
         "@wdio/sync": "^7.5.2",
         "ajv": "6.12.3",
         "assert": "^2.0.0",
         "babel-loader": "^8.0.5",
+        "babel-register": "^6.26.0",
         "body-parser": "^1.19.0",
         "chai": "^4.2.0",
         "coveralls": "^3.1.0",
@@ -3277,14 +3278,14 @@
       }
     },
     "node_modules/@wdio/spec-reporter": {
-      "version": "7.16.14",
-      "resolved": "https://registry.npmjs.org/@wdio/spec-reporter/-/spec-reporter-7.16.14.tgz",
-      "integrity": "sha512-hpS2rLXo91lfrit5/pjDSbff2lqQe+k07/JPOJ48W+ZPSI+ib7rSldI4JFYU4YuKN1TnhkbhxRBMib3bF3Fs+Q==",
+      "version": "7.19.1",
+      "resolved": "https://registry.npmjs.org/@wdio/spec-reporter/-/spec-reporter-7.19.1.tgz",
+      "integrity": "sha512-qnZkn3VcyBPtcorUtpyCFE8v5ubyWmR7mFETXNzyriHyvjvk+NeFCWaFcIehpXYXiAmNpAwyfnZoIY6tkKQixQ==",
       "dev": true,
       "dependencies": {
         "@types/easy-table": "^0.0.33",
-        "@wdio/reporter": "7.16.14",
-        "@wdio/types": "7.16.14",
+        "@wdio/reporter": "7.19.1",
+        "@wdio/types": "7.19.1",
         "chalk": "^4.0.0",
         "easy-table": "^1.1.1",
         "pretty-ms": "^7.0.0"
@@ -3296,6 +3297,58 @@
         "@wdio/cli": "^7.0.0"
       }
     },
+    "node_modules/@wdio/spec-reporter/node_modules/@wdio/reporter": {
+      "version": "7.19.1",
+      "resolved": "https://registry.npmjs.org/@wdio/reporter/-/reporter-7.19.1.tgz",
+      "integrity": "sha512-sWmBBV4dPCZkGk9Qq0m35T/vHGen0N10nH4osQcVP3IZJqpo2eLIH4w+X6EUbjZ2GdgOA2bLMMzb1bl9JqnGPg==",
+      "dev": true,
+      "dependencies": {
+        "@types/diff": "^5.0.0",
+        "@types/node": "^17.0.4",
+        "@types/object-inspect": "^1.8.0",
+        "@types/supports-color": "^8.1.0",
+        "@types/tmp": "^0.2.0",
+        "@wdio/types": "7.19.1",
+        "diff": "^5.0.0",
+        "fs-extra": "^10.0.0",
+        "object-inspect": "^1.10.3",
+        "supports-color": "8.1.1"
+      },
+      "engines": {
+        "node": ">=12.0.0"
+      }
+    },
+    "node_modules/@wdio/spec-reporter/node_modules/@wdio/reporter/node_modules/supports-color": {
+      "version": "8.1.1",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz",
+      "integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==",
+      "dev": true,
+      "dependencies": {
+        "has-flag": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/supports-color?sponsor=1"
+      }
+    },
+    "node_modules/@wdio/spec-reporter/node_modules/@wdio/types": {
+      "version": "7.19.1",
+      "resolved": "https://registry.npmjs.org/@wdio/types/-/types-7.19.1.tgz",
+      "integrity": "sha512-mOodKlmvYxpj8P5BhjggEGpXuiRSlsyn2ClG8QqJ3lfXgOtOVEzFNfv/Ai7TkHr+lHDQNXLjllCjSqoCHhwlqg==",
+      "dev": true,
+      "dependencies": {
+        "@types/node": "^17.0.4",
+        "got": "^11.8.1"
+      },
+      "engines": {
+        "node": ">=12.0.0"
+      },
+      "peerDependencies": {
+        "typescript": "^4.6.2"
+      }
+    },
     "node_modules/@wdio/spec-reporter/node_modules/ansi-styles": {
       "version": "4.3.0",
       "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
@@ -4291,6 +4344,113 @@
         "node": ">=0.8.0"
       }
     },
+    "node_modules/babel-core": {
+      "version": "6.26.3",
+      "resolved": "https://registry.npmjs.org/babel-core/-/babel-core-6.26.3.tgz",
+      "integrity": "sha512-6jyFLuDmeidKmUEb3NM+/yawG0M2bDZ9Z1qbZP59cyHLz8kYGKYwpJP0UwUKKUiTRNvxfLesJnTedqczP7cTDA==",
+      "dev": true,
+      "dependencies": {
+        "babel-code-frame": "^6.26.0",
+        "babel-generator": "^6.26.0",
+        "babel-helpers": "^6.24.1",
+        "babel-messages": "^6.23.0",
+        "babel-register": "^6.26.0",
+        "babel-runtime": "^6.26.0",
+        "babel-template": "^6.26.0",
+        "babel-traverse": "^6.26.0",
+        "babel-types": "^6.26.0",
+        "babylon": "^6.18.0",
+        "convert-source-map": "^1.5.1",
+        "debug": "^2.6.9",
+        "json5": "^0.5.1",
+        "lodash": "^4.17.4",
+        "minimatch": "^3.0.4",
+        "path-is-absolute": "^1.0.1",
+        "private": "^0.1.8",
+        "slash": "^1.0.0",
+        "source-map": "^0.5.7"
+      }
+    },
+    "node_modules/babel-core/node_modules/debug": {
+      "version": "2.6.9",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+      "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+      "dev": true,
+      "dependencies": {
+        "ms": "2.0.0"
+      }
+    },
+    "node_modules/babel-core/node_modules/json5": {
+      "version": "0.5.1",
+      "resolved": "https://registry.npmjs.org/json5/-/json5-0.5.1.tgz",
+      "integrity": "sha1-Hq3nrMASA0rYTiOWdn6tn6VJWCE=",
+      "dev": true,
+      "bin": {
+        "json5": "lib/cli.js"
+      }
+    },
+    "node_modules/babel-core/node_modules/ms": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+      "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
+      "dev": true
+    },
+    "node_modules/babel-core/node_modules/slash": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/slash/-/slash-1.0.0.tgz",
+      "integrity": "sha1-xB8vbDn8FtHNF61LXYlhFK5HDVU=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/babel-generator": {
+      "version": "6.26.1",
+      "resolved": "https://registry.npmjs.org/babel-generator/-/babel-generator-6.26.1.tgz",
+      "integrity": "sha512-HyfwY6ApZj7BYTcJURpM5tznulaBvyio7/0d4zFOeMPUmfxkCjHocCuoLa2SAGzBI8AREcH3eP3758F672DppA==",
+      "dev": true,
+      "dependencies": {
+        "babel-messages": "^6.23.0",
+        "babel-runtime": "^6.26.0",
+        "babel-types": "^6.26.0",
+        "detect-indent": "^4.0.0",
+        "jsesc": "^1.3.0",
+        "lodash": "^4.17.4",
+        "source-map": "^0.5.7",
+        "trim-right": "^1.0.1"
+      }
+    },
+    "node_modules/babel-generator/node_modules/detect-indent": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/detect-indent/-/detect-indent-4.0.0.tgz",
+      "integrity": "sha1-920GQ1LN9Docts5hnE7jqUdd4gg=",
+      "dev": true,
+      "dependencies": {
+        "repeating": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/babel-generator/node_modules/jsesc": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-1.3.0.tgz",
+      "integrity": "sha1-RsP+yMGJKxKwgz25vHYiF226s0s=",
+      "dev": true,
+      "bin": {
+        "jsesc": "bin/jsesc"
+      }
+    },
+    "node_modules/babel-helpers": {
+      "version": "6.24.1",
+      "resolved": "https://registry.npmjs.org/babel-helpers/-/babel-helpers-6.24.1.tgz",
+      "integrity": "sha1-NHHenK7DiOXIUOWX5Yom3fN2ArI=",
+      "dev": true,
+      "dependencies": {
+        "babel-runtime": "^6.22.0",
+        "babel-template": "^6.24.1"
+      }
+    },
     "node_modules/babel-loader": {
       "version": "8.2.3",
       "resolved": "https://registry.npmjs.org/babel-loader/-/babel-loader-8.2.3.tgz",
@@ -4336,6 +4496,15 @@
         "node": ">=4.0.0"
       }
     },
+    "node_modules/babel-messages": {
+      "version": "6.23.0",
+      "resolved": "https://registry.npmjs.org/babel-messages/-/babel-messages-6.23.0.tgz",
+      "integrity": "sha1-8830cDhYA1sqKVHG7F7fbGLyYw4=",
+      "dev": true,
+      "dependencies": {
+        "babel-runtime": "^6.22.0"
+      }
+    },
     "node_modules/babel-plugin-dynamic-import-node": {
       "version": "2.3.3",
       "resolved": "https://registry.npmjs.org/babel-plugin-dynamic-import-node/-/babel-plugin-dynamic-import-node-2.3.3.tgz",
@@ -4392,6 +4561,50 @@
         "babel-runtime": "^6.22.0"
       }
     },
+    "node_modules/babel-register": {
+      "version": "6.26.0",
+      "resolved": "https://registry.npmjs.org/babel-register/-/babel-register-6.26.0.tgz",
+      "integrity": "sha1-btAhFz4vy0htestFxgCahW9kcHE=",
+      "dev": true,
+      "dependencies": {
+        "babel-core": "^6.26.0",
+        "babel-runtime": "^6.26.0",
+        "core-js": "^2.5.0",
+        "home-or-tmp": "^2.0.0",
+        "lodash": "^4.17.4",
+        "mkdirp": "^0.5.1",
+        "source-map-support": "^0.4.15"
+      }
+    },
+    "node_modules/babel-register/node_modules/core-js": {
+      "version": "2.6.12",
+      "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.6.12.tgz",
+      "integrity": "sha512-Kb2wC0fvsWfQrgk8HU5lW6U/Lcs8+9aaYcy4ZFc6DDlo4nZ7n70dEgE5rtR0oG6ufKDUnrwfWL1mXR5ljDatrQ==",
+      "deprecated": "core-js@<3.4 is no longer maintained and not recommended for usage due to the number of issues. Because of the V8 engine whims, feature detection in old core-js versions could cause a slowdown up to 100x even if nothing is polyfilled. Please, upgrade your dependencies to the actual version of core-js.",
+      "dev": true,
+      "hasInstallScript": true
+    },
+    "node_modules/babel-register/node_modules/mkdirp": {
+      "version": "0.5.6",
+      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.6.tgz",
+      "integrity": "sha512-FP+p8RB8OWpF3YZBCrP5gtADmtXApB5AMLn+vdyA+PyxCjrCs00mjyUozssO33cwDeT3wNGdLxJ5M//YqtHAJw==",
+      "dev": true,
+      "dependencies": {
+        "minimist": "^1.2.6"
+      },
+      "bin": {
+        "mkdirp": "bin/cmd.js"
+      }
+    },
+    "node_modules/babel-register/node_modules/source-map-support": {
+      "version": "0.4.18",
+      "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.4.18.tgz",
+      "integrity": "sha512-try0/JqxPLF9nOjvSta7tVondkP5dwgyLDjVoyMDlmjugT2lRZ1OfsrYTkCd2hkDnJTKRbO/Rl3orm8vlsUzbA==",
+      "dev": true,
+      "dependencies": {
+        "source-map": "^0.5.6"
+      }
+    },
     "node_modules/babel-runtime": {
       "version": "6.26.0",
       "resolved": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.26.0.tgz",
@@ -4408,6 +4621,81 @@
       "deprecated": "core-js@<3.4 is no longer maintained and not recommended for usage due to the number of issues. Because of the V8 engine whims, feature detection in old core-js versions could cause a slowdown up to 100x even if nothing is polyfilled. Please, upgrade your dependencies to the actual version of core-js.",
       "hasInstallScript": true
     },
+    "node_modules/babel-template": {
+      "version": "6.26.0",
+      "resolved": "https://registry.npmjs.org/babel-template/-/babel-template-6.26.0.tgz",
+      "integrity": "sha1-3gPi0WOWsGn0bdn/+FIfsaDjXgI=",
+      "dev": true,
+      "dependencies": {
+        "babel-runtime": "^6.26.0",
+        "babel-traverse": "^6.26.0",
+        "babel-types": "^6.26.0",
+        "babylon": "^6.18.0",
+        "lodash": "^4.17.4"
+      }
+    },
+    "node_modules/babel-traverse": {
+      "version": "6.26.0",
+      "resolved": "https://registry.npmjs.org/babel-traverse/-/babel-traverse-6.26.0.tgz",
+      "integrity": "sha1-RqnL1+3MYsjlwGTi0tjQ9ANXZu4=",
+      "dev": true,
+      "dependencies": {
+        "babel-code-frame": "^6.26.0",
+        "babel-messages": "^6.23.0",
+        "babel-runtime": "^6.26.0",
+        "babel-types": "^6.26.0",
+        "babylon": "^6.18.0",
+        "debug": "^2.6.8",
+        "globals": "^9.18.0",
+        "invariant": "^2.2.2",
+        "lodash": "^4.17.4"
+      }
+    },
+    "node_modules/babel-traverse/node_modules/debug": {
+      "version": "2.6.9",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+      "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+      "dev": true,
+      "dependencies": {
+        "ms": "2.0.0"
+      }
+    },
+    "node_modules/babel-traverse/node_modules/globals": {
+      "version": "9.18.0",
+      "resolved": "https://registry.npmjs.org/globals/-/globals-9.18.0.tgz",
+      "integrity": "sha512-S0nG3CLEQiY/ILxqtztTWH/3iRRdyBLw6KMDxnKMchrtbj2OFmehVh0WUCfW3DUrIgx/qFrJPICrq4Z4sTR9UQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/babel-traverse/node_modules/ms": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+      "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
+      "dev": true
+    },
+    "node_modules/babel-types": {
+      "version": "6.26.0",
+      "resolved": "https://registry.npmjs.org/babel-types/-/babel-types-6.26.0.tgz",
+      "integrity": "sha1-o7Bz+Uq0nrb6Vc1lInozQ4BjJJc=",
+      "dev": true,
+      "dependencies": {
+        "babel-runtime": "^6.26.0",
+        "esutils": "^2.0.2",
+        "lodash": "^4.17.4",
+        "to-fast-properties": "^1.0.3"
+      }
+    },
+    "node_modules/babel-types/node_modules/to-fast-properties": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-1.0.3.tgz",
+      "integrity": "sha1-uDVx+k2MJbguIxsG46MFXeTKGkc=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
     "node_modules/babelify": {
       "version": "10.0.0",
       "resolved": "https://registry.npmjs.org/babelify/-/babelify-10.0.0.tgz",
@@ -4420,6 +4708,15 @@
         "@babel/core": "^7.0.0"
       }
     },
+    "node_modules/babylon": {
+      "version": "6.18.0",
+      "resolved": "https://registry.npmjs.org/babylon/-/babylon-6.18.0.tgz",
+      "integrity": "sha512-q/UEjfGJ2Cm3oKV71DJz9d25TPnq5rhBVL2Q4fA5wcC3jcrdn7+SssEybFIxwAvvP+YCsCYNKughoF33GxgycQ==",
+      "dev": true,
+      "bin": {
+        "babylon": "bin/babylon.js"
+      }
+    },
     "node_modules/bach": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/bach/-/bach-1.2.0.tgz",
@@ -5337,14 +5634,20 @@
       }
     },
     "node_modules/caniuse-lite": {
-      "version": "1.0.30001314",
-      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001314.tgz",
-      "integrity": "sha512-0zaSO+TnCHtHJIbpLroX7nsD+vYuOVjl3uzFbJO1wMVbuveJA0RK2WcQA9ZUIOiO0/ArMiMgHJLxfEZhQiC0kw==",
+      "version": "1.0.30001320",
+      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001320.tgz",
+      "integrity": "sha512-MWPzG54AGdo3nWx7zHZTefseM5Y1ccM7hlQKHRqJkPozUaw3hNbBTMmLn16GG2FUzjR13Cr3NPfhIieX5PzXDA==",
       "dev": true,
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/browserslist"
-      }
+      "funding": [
+        {
+          "type": "opencollective",
+          "url": "https://opencollective.com/browserslist"
+        },
+        {
+          "type": "tidelift",
+          "url": "https://tidelift.com/funding/github/npm/caniuse-lite"
+        }
+      ]
     },
     "node_modules/caseless": {
       "version": "0.12.0",
@@ -12765,6 +13068,19 @@
         "node": "*"
       }
     },
+    "node_modules/home-or-tmp": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/home-or-tmp/-/home-or-tmp-2.0.0.tgz",
+      "integrity": "sha1-42w/LSyufXRqhX440Y1fMqeILbg=",
+      "dev": true,
+      "dependencies": {
+        "os-homedir": "^1.0.0",
+        "os-tmpdir": "^1.0.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
     "node_modules/homedir-polyfill": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/homedir-polyfill/-/homedir-polyfill-1.0.3.tgz",
@@ -13094,6 +13410,15 @@
         "node": ">= 0.10"
       }
     },
+    "node_modules/invariant": {
+      "version": "2.2.4",
+      "resolved": "https://registry.npmjs.org/invariant/-/invariant-2.2.4.tgz",
+      "integrity": "sha512-phJfQVBuaJM5raOpJjSfkiD6BpbCE4Ns//LaXl6wGYtUBY83nWS6Rf9tXm2e8VaK60JEjYldbPif/A2B1C2gNA==",
+      "dev": true,
+      "dependencies": {
+        "loose-envify": "^1.0.0"
+      }
+    },
     "node_modules/invert-kv": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/invert-kv/-/invert-kv-1.0.0.tgz",
@@ -15579,6 +15904,18 @@
         "url": "https://github.com/sponsors/wooorm"
       }
     },
+    "node_modules/loose-envify": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/loose-envify/-/loose-envify-1.4.0.tgz",
+      "integrity": "sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==",
+      "dev": true,
+      "dependencies": {
+        "js-tokens": "^3.0.0 || ^4.0.0"
+      },
+      "bin": {
+        "loose-envify": "cli.js"
+      }
+    },
     "node_modules/loud-rejection": {
       "version": "1.6.0",
       "resolved": "https://registry.npmjs.org/loud-rejection/-/loud-rejection-1.6.0.tgz",
@@ -16637,9 +16974,9 @@
       }
     },
     "node_modules/minimist": {
-      "version": "1.2.5",
-      "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz",
-      "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==",
+      "version": "1.2.6",
+      "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.6.tgz",
+      "integrity": "sha512-Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q==",
       "dev": true
     },
     "node_modules/minimist-options": {
@@ -17735,6 +18072,15 @@
         "readable-stream": "^2.0.1"
       }
     },
+    "node_modules/os-homedir": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz",
+      "integrity": "sha1-/7xJiDNuDoM94MFox+8VISGqf7M=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
     "node_modules/os-locale": {
       "version": "1.4.0",
       "resolved": "https://registry.npmjs.org/os-locale/-/os-locale-1.4.0.tgz",
@@ -18331,6 +18677,15 @@
         "node": ">=0.8"
       }
     },
+    "node_modules/private": {
+      "version": "0.1.8",
+      "resolved": "https://registry.npmjs.org/private/-/private-0.1.8.tgz",
+      "integrity": "sha512-VvivMrbvd2nKkiG38qjULzlc+4Vx4wm/whI9pQD35YrARNnhxeiRktSOhSukRLFNlzg6Br/cJPet5J/u19r/mg==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
     "node_modules/process-nextick-args": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz",
@@ -21501,6 +21856,15 @@
         "node": ">=8"
       }
     },
+    "node_modules/trim-right": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/trim-right/-/trim-right-1.0.1.tgz",
+      "integrity": "sha1-yy4SAwZ+DI3h9hQJS5/kVwTqYAM=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
     "node_modules/trough": {
       "version": "1.0.5",
       "resolved": "https://registry.npmjs.org/trough/-/trough-1.0.5.tgz",
@@ -21616,6 +21980,20 @@
       "integrity": "sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c=",
       "dev": true
     },
+    "node_modules/typescript": {
+      "version": "4.6.3",
+      "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.6.3.tgz",
+      "integrity": "sha512-yNIatDa5iaofVozS/uQJEl3JRWLKKGJKh6Yaiv0GLGSuhpFJe7P3SbHZ8/yjAHRQwKRoA6YZqlfjXWmVzoVSMw==",
+      "dev": true,
+      "peer": true,
+      "bin": {
+        "tsc": "bin/tsc",
+        "tsserver": "bin/tsserver"
+      },
+      "engines": {
+        "node": ">=4.2.0"
+      }
+    },
     "node_modules/typescript-compare": {
       "version": "0.0.2",
       "resolved": "https://registry.npmjs.org/typescript-compare/-/typescript-compare-0.0.2.tgz",
@@ -25688,19 +26066,58 @@
       }
     },
     "@wdio/spec-reporter": {
-      "version": "7.16.14",
-      "resolved": "https://registry.npmjs.org/@wdio/spec-reporter/-/spec-reporter-7.16.14.tgz",
-      "integrity": "sha512-hpS2rLXo91lfrit5/pjDSbff2lqQe+k07/JPOJ48W+ZPSI+ib7rSldI4JFYU4YuKN1TnhkbhxRBMib3bF3Fs+Q==",
+      "version": "7.19.1",
+      "resolved": "https://registry.npmjs.org/@wdio/spec-reporter/-/spec-reporter-7.19.1.tgz",
+      "integrity": "sha512-qnZkn3VcyBPtcorUtpyCFE8v5ubyWmR7mFETXNzyriHyvjvk+NeFCWaFcIehpXYXiAmNpAwyfnZoIY6tkKQixQ==",
       "dev": true,
       "requires": {
         "@types/easy-table": "^0.0.33",
-        "@wdio/reporter": "7.16.14",
-        "@wdio/types": "7.16.14",
+        "@wdio/reporter": "7.19.1",
+        "@wdio/types": "7.19.1",
         "chalk": "^4.0.0",
         "easy-table": "^1.1.1",
         "pretty-ms": "^7.0.0"
       },
       "dependencies": {
+        "@wdio/reporter": {
+          "version": "7.19.1",
+          "resolved": "https://registry.npmjs.org/@wdio/reporter/-/reporter-7.19.1.tgz",
+          "integrity": "sha512-sWmBBV4dPCZkGk9Qq0m35T/vHGen0N10nH4osQcVP3IZJqpo2eLIH4w+X6EUbjZ2GdgOA2bLMMzb1bl9JqnGPg==",
+          "dev": true,
+          "requires": {
+            "@types/diff": "^5.0.0",
+            "@types/node": "^17.0.4",
+            "@types/object-inspect": "^1.8.0",
+            "@types/supports-color": "^8.1.0",
+            "@types/tmp": "^0.2.0",
+            "@wdio/types": "7.19.1",
+            "diff": "^5.0.0",
+            "fs-extra": "^10.0.0",
+            "object-inspect": "^1.10.3",
+            "supports-color": "8.1.1"
+          },
+          "dependencies": {
+            "supports-color": {
+              "version": "8.1.1",
+              "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz",
+              "integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==",
+              "dev": true,
+              "requires": {
+                "has-flag": "^4.0.0"
+              }
+            }
+          }
+        },
+        "@wdio/types": {
+          "version": "7.19.1",
+          "resolved": "https://registry.npmjs.org/@wdio/types/-/types-7.19.1.tgz",
+          "integrity": "sha512-mOodKlmvYxpj8P5BhjggEGpXuiRSlsyn2ClG8QqJ3lfXgOtOVEzFNfv/Ai7TkHr+lHDQNXLjllCjSqoCHhwlqg==",
+          "dev": true,
+          "requires": {
+            "@types/node": "^17.0.4",
+            "got": "^11.8.1"
+          }
+        },
         "ansi-styles": {
           "version": "4.3.0",
           "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
@@ -26496,6 +26913,105 @@
         }
       }
     },
+    "babel-core": {
+      "version": "6.26.3",
+      "resolved": "https://registry.npmjs.org/babel-core/-/babel-core-6.26.3.tgz",
+      "integrity": "sha512-6jyFLuDmeidKmUEb3NM+/yawG0M2bDZ9Z1qbZP59cyHLz8kYGKYwpJP0UwUKKUiTRNvxfLesJnTedqczP7cTDA==",
+      "dev": true,
+      "requires": {
+        "babel-code-frame": "^6.26.0",
+        "babel-generator": "^6.26.0",
+        "babel-helpers": "^6.24.1",
+        "babel-messages": "^6.23.0",
+        "babel-register": "^6.26.0",
+        "babel-runtime": "^6.26.0",
+        "babel-template": "^6.26.0",
+        "babel-traverse": "^6.26.0",
+        "babel-types": "^6.26.0",
+        "babylon": "^6.18.0",
+        "convert-source-map": "^1.5.1",
+        "debug": "^2.6.9",
+        "json5": "^0.5.1",
+        "lodash": "^4.17.4",
+        "minimatch": "^3.0.4",
+        "path-is-absolute": "^1.0.1",
+        "private": "^0.1.8",
+        "slash": "^1.0.0",
+        "source-map": "^0.5.7"
+      },
+      "dependencies": {
+        "debug": {
+          "version": "2.6.9",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+          "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+          "dev": true,
+          "requires": {
+            "ms": "2.0.0"
+          }
+        },
+        "json5": {
+          "version": "0.5.1",
+          "resolved": "https://registry.npmjs.org/json5/-/json5-0.5.1.tgz",
+          "integrity": "sha1-Hq3nrMASA0rYTiOWdn6tn6VJWCE=",
+          "dev": true
+        },
+        "ms": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+          "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
+          "dev": true
+        },
+        "slash": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/slash/-/slash-1.0.0.tgz",
+          "integrity": "sha1-xB8vbDn8FtHNF61LXYlhFK5HDVU=",
+          "dev": true
+        }
+      }
+    },
+    "babel-generator": {
+      "version": "6.26.1",
+      "resolved": "https://registry.npmjs.org/babel-generator/-/babel-generator-6.26.1.tgz",
+      "integrity": "sha512-HyfwY6ApZj7BYTcJURpM5tznulaBvyio7/0d4zFOeMPUmfxkCjHocCuoLa2SAGzBI8AREcH3eP3758F672DppA==",
+      "dev": true,
+      "requires": {
+        "babel-messages": "^6.23.0",
+        "babel-runtime": "^6.26.0",
+        "babel-types": "^6.26.0",
+        "detect-indent": "^4.0.0",
+        "jsesc": "^1.3.0",
+        "lodash": "^4.17.4",
+        "source-map": "^0.5.7",
+        "trim-right": "^1.0.1"
+      },
+      "dependencies": {
+        "detect-indent": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/detect-indent/-/detect-indent-4.0.0.tgz",
+          "integrity": "sha1-920GQ1LN9Docts5hnE7jqUdd4gg=",
+          "dev": true,
+          "requires": {
+            "repeating": "^2.0.0"
+          }
+        },
+        "jsesc": {
+          "version": "1.3.0",
+          "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-1.3.0.tgz",
+          "integrity": "sha1-RsP+yMGJKxKwgz25vHYiF226s0s=",
+          "dev": true
+        }
+      }
+    },
+    "babel-helpers": {
+      "version": "6.24.1",
+      "resolved": "https://registry.npmjs.org/babel-helpers/-/babel-helpers-6.24.1.tgz",
+      "integrity": "sha1-NHHenK7DiOXIUOWX5Yom3fN2ArI=",
+      "dev": true,
+      "requires": {
+        "babel-runtime": "^6.22.0",
+        "babel-template": "^6.24.1"
+      }
+    },
     "babel-loader": {
       "version": "8.2.3",
       "resolved": "https://registry.npmjs.org/babel-loader/-/babel-loader-8.2.3.tgz",
@@ -26530,6 +27046,15 @@
         }
       }
     },
+    "babel-messages": {
+      "version": "6.23.0",
+      "resolved": "https://registry.npmjs.org/babel-messages/-/babel-messages-6.23.0.tgz",
+      "integrity": "sha1-8830cDhYA1sqKVHG7F7fbGLyYw4=",
+      "dev": true,
+      "requires": {
+        "babel-runtime": "^6.22.0"
+      }
+    },
     "babel-plugin-dynamic-import-node": {
       "version": "2.3.3",
       "resolved": "https://registry.npmjs.org/babel-plugin-dynamic-import-node/-/babel-plugin-dynamic-import-node-2.3.3.tgz",
@@ -26577,6 +27102,47 @@
         "babel-runtime": "^6.22.0"
       }
     },
+    "babel-register": {
+      "version": "6.26.0",
+      "resolved": "https://registry.npmjs.org/babel-register/-/babel-register-6.26.0.tgz",
+      "integrity": "sha1-btAhFz4vy0htestFxgCahW9kcHE=",
+      "dev": true,
+      "requires": {
+        "babel-core": "^6.26.0",
+        "babel-runtime": "^6.26.0",
+        "core-js": "^2.5.0",
+        "home-or-tmp": "^2.0.0",
+        "lodash": "^4.17.4",
+        "mkdirp": "^0.5.1",
+        "source-map-support": "^0.4.15"
+      },
+      "dependencies": {
+        "core-js": {
+          "version": "2.6.12",
+          "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.6.12.tgz",
+          "integrity": "sha512-Kb2wC0fvsWfQrgk8HU5lW6U/Lcs8+9aaYcy4ZFc6DDlo4nZ7n70dEgE5rtR0oG6ufKDUnrwfWL1mXR5ljDatrQ==",
+          "dev": true
+        },
+        "mkdirp": {
+          "version": "0.5.6",
+          "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.6.tgz",
+          "integrity": "sha512-FP+p8RB8OWpF3YZBCrP5gtADmtXApB5AMLn+vdyA+PyxCjrCs00mjyUozssO33cwDeT3wNGdLxJ5M//YqtHAJw==",
+          "dev": true,
+          "requires": {
+            "minimist": "^1.2.6"
+          }
+        },
+        "source-map-support": {
+          "version": "0.4.18",
+          "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.4.18.tgz",
+          "integrity": "sha512-try0/JqxPLF9nOjvSta7tVondkP5dwgyLDjVoyMDlmjugT2lRZ1OfsrYTkCd2hkDnJTKRbO/Rl3orm8vlsUzbA==",
+          "dev": true,
+          "requires": {
+            "source-map": "^0.5.6"
+          }
+        }
+      }
+    },
     "babel-runtime": {
       "version": "6.26.0",
       "resolved": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.26.0.tgz",
@@ -26593,6 +27159,79 @@
         }
       }
     },
+    "babel-template": {
+      "version": "6.26.0",
+      "resolved": "https://registry.npmjs.org/babel-template/-/babel-template-6.26.0.tgz",
+      "integrity": "sha1-3gPi0WOWsGn0bdn/+FIfsaDjXgI=",
+      "dev": true,
+      "requires": {
+        "babel-runtime": "^6.26.0",
+        "babel-traverse": "^6.26.0",
+        "babel-types": "^6.26.0",
+        "babylon": "^6.18.0",
+        "lodash": "^4.17.4"
+      }
+    },
+    "babel-traverse": {
+      "version": "6.26.0",
+      "resolved": "https://registry.npmjs.org/babel-traverse/-/babel-traverse-6.26.0.tgz",
+      "integrity": "sha1-RqnL1+3MYsjlwGTi0tjQ9ANXZu4=",
+      "dev": true,
+      "requires": {
+        "babel-code-frame": "^6.26.0",
+        "babel-messages": "^6.23.0",
+        "babel-runtime": "^6.26.0",
+        "babel-types": "^6.26.0",
+        "babylon": "^6.18.0",
+        "debug": "^2.6.8",
+        "globals": "^9.18.0",
+        "invariant": "^2.2.2",
+        "lodash": "^4.17.4"
+      },
+      "dependencies": {
+        "debug": {
+          "version": "2.6.9",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+          "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+          "dev": true,
+          "requires": {
+            "ms": "2.0.0"
+          }
+        },
+        "globals": {
+          "version": "9.18.0",
+          "resolved": "https://registry.npmjs.org/globals/-/globals-9.18.0.tgz",
+          "integrity": "sha512-S0nG3CLEQiY/ILxqtztTWH/3iRRdyBLw6KMDxnKMchrtbj2OFmehVh0WUCfW3DUrIgx/qFrJPICrq4Z4sTR9UQ==",
+          "dev": true
+        },
+        "ms": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+          "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
+          "dev": true
+        }
+      }
+    },
+    "babel-types": {
+      "version": "6.26.0",
+      "resolved": "https://registry.npmjs.org/babel-types/-/babel-types-6.26.0.tgz",
+      "integrity": "sha1-o7Bz+Uq0nrb6Vc1lInozQ4BjJJc=",
+      "dev": true,
+      "requires": {
+        "babel-runtime": "^6.26.0",
+        "esutils": "^2.0.2",
+        "lodash": "^4.17.4",
+        "to-fast-properties": "^1.0.3"
+      },
+      "dependencies": {
+        "to-fast-properties": {
+          "version": "1.0.3",
+          "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-1.0.3.tgz",
+          "integrity": "sha1-uDVx+k2MJbguIxsG46MFXeTKGkc=",
+          "dev": true
+        }
+      }
+    },
     "babelify": {
       "version": "10.0.0",
       "resolved": "https://registry.npmjs.org/babelify/-/babelify-10.0.0.tgz",
@@ -26600,6 +27239,12 @@
       "dev": true,
       "requires": {}
     },
+    "babylon": {
+      "version": "6.18.0",
+      "resolved": "https://registry.npmjs.org/babylon/-/babylon-6.18.0.tgz",
+      "integrity": "sha512-q/UEjfGJ2Cm3oKV71DJz9d25TPnq5rhBVL2Q4fA5wcC3jcrdn7+SssEybFIxwAvvP+YCsCYNKughoF33GxgycQ==",
+      "dev": true
+    },
     "bach": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/bach/-/bach-1.2.0.tgz",
@@ -27323,9 +27968,9 @@
       }
     },
     "caniuse-lite": {
-      "version": "1.0.30001314",
-      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001314.tgz",
-      "integrity": "sha512-0zaSO+TnCHtHJIbpLroX7nsD+vYuOVjl3uzFbJO1wMVbuveJA0RK2WcQA9ZUIOiO0/ArMiMgHJLxfEZhQiC0kw==",
+      "version": "1.0.30001320",
+      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001320.tgz",
+      "integrity": "sha512-MWPzG54AGdo3nWx7zHZTefseM5Y1ccM7hlQKHRqJkPozUaw3hNbBTMmLn16GG2FUzjR13Cr3NPfhIieX5PzXDA==",
       "dev": true
     },
     "caseless": {
@@ -33269,6 +33914,16 @@
       "integrity": "sha512-tzcUFauisWKNHaRkN4Wjl/ZA07gENAjFl3J/c480dprkGTg5EQstgaNFqBfUqCq54kZRIEcreTsAgF/m2quD7A==",
       "dev": true
     },
+    "home-or-tmp": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/home-or-tmp/-/home-or-tmp-2.0.0.tgz",
+      "integrity": "sha1-42w/LSyufXRqhX440Y1fMqeILbg=",
+      "dev": true,
+      "requires": {
+        "os-homedir": "^1.0.0",
+        "os-tmpdir": "^1.0.1"
+      }
+    },
     "homedir-polyfill": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/homedir-polyfill/-/homedir-polyfill-1.0.3.tgz",
@@ -33517,6 +34172,15 @@
       "integrity": "sha512-agE4QfB2Lkp9uICn7BAqoscw4SZP9kTE2hxiFI3jBPmXJfdqiahTbUuKGsMoN2GtqL9AxhYioAcVvgsb1HvRbA==",
       "dev": true
     },
+    "invariant": {
+      "version": "2.2.4",
+      "resolved": "https://registry.npmjs.org/invariant/-/invariant-2.2.4.tgz",
+      "integrity": "sha512-phJfQVBuaJM5raOpJjSfkiD6BpbCE4Ns//LaXl6wGYtUBY83nWS6Rf9tXm2e8VaK60JEjYldbPif/A2B1C2gNA==",
+      "dev": true,
+      "requires": {
+        "loose-envify": "^1.0.0"
+      }
+    },
     "invert-kv": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/invert-kv/-/invert-kv-1.0.0.tgz",
@@ -35473,6 +36137,15 @@
       "integrity": "sha512-vM6rUVCVUJJt33bnmHiZEvr7wPT78ztX7rojL+LW51bHtLh6HTjx84LA5W4+oa6aKEJA7jJu5LR6vQRBpA5DVg==",
       "dev": true
     },
+    "loose-envify": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/loose-envify/-/loose-envify-1.4.0.tgz",
+      "integrity": "sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==",
+      "dev": true,
+      "requires": {
+        "js-tokens": "^3.0.0 || ^4.0.0"
+      }
+    },
     "loud-rejection": {
       "version": "1.6.0",
       "resolved": "https://registry.npmjs.org/loud-rejection/-/loud-rejection-1.6.0.tgz",
@@ -36279,9 +36952,9 @@
       }
     },
     "minimist": {
-      "version": "1.2.5",
-      "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz",
-      "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==",
+      "version": "1.2.6",
+      "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.6.tgz",
+      "integrity": "sha512-Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q==",
       "dev": true
     },
     "minimist-options": {
@@ -37161,6 +37834,12 @@
         "readable-stream": "^2.0.1"
       }
     },
+    "os-homedir": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz",
+      "integrity": "sha1-/7xJiDNuDoM94MFox+8VISGqf7M=",
+      "dev": true
+    },
     "os-locale": {
       "version": "1.4.0",
       "resolved": "https://registry.npmjs.org/os-locale/-/os-locale-1.4.0.tgz",
@@ -37601,6 +38280,12 @@
       "integrity": "sha512-GA3TdL8szPK4AQ2YnOe/b+Y1jUFwmmGMMK/qbY7VcE3Z7FU8JstbKiKRzO6CIiAKPhTO8m01NoQ0V5f3jc4OGg==",
       "dev": true
     },
+    "private": {
+      "version": "0.1.8",
+      "resolved": "https://registry.npmjs.org/private/-/private-0.1.8.tgz",
+      "integrity": "sha512-VvivMrbvd2nKkiG38qjULzlc+4Vx4wm/whI9pQD35YrARNnhxeiRktSOhSukRLFNlzg6Br/cJPet5J/u19r/mg==",
+      "dev": true
+    },
     "process-nextick-args": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz",
@@ -40163,6 +40848,12 @@
       "integrity": "sha512-c1PTsA3tYrIsLGkJkzHF+w9F2EyxfXGo4UyJc4pFL++FMjnq0HJS69T3M7d//gKrFKwy429bouPescbjecU+Zw==",
       "dev": true
     },
+    "trim-right": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/trim-right/-/trim-right-1.0.1.tgz",
+      "integrity": "sha1-yy4SAwZ+DI3h9hQJS5/kVwTqYAM=",
+      "dev": true
+    },
     "trough": {
       "version": "1.0.5",
       "resolved": "https://registry.npmjs.org/trough/-/trough-1.0.5.tgz",
@@ -40255,6 +40946,13 @@
       "integrity": "sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c=",
       "dev": true
     },
+    "typescript": {
+      "version": "4.6.3",
+      "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.6.3.tgz",
+      "integrity": "sha512-yNIatDa5iaofVozS/uQJEl3JRWLKKGJKh6Yaiv0GLGSuhpFJe7P3SbHZ8/yjAHRQwKRoA6YZqlfjXWmVzoVSMw==",
+      "dev": true,
+      "peer": true
+    },
     "typescript-compare": {
       "version": "0.0.2",
       "resolved": "https://registry.npmjs.org/typescript-compare/-/typescript-compare-0.0.2.tgz",
diff --git a/package.json b/package.json
index 47bcc94404f..9e5d68ac5e8 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "prebid.js",
-  "version": "6.20.0-pre",
+  "version": "6.23.0-pre",
   "description": "Header Bidding Management Library",
   "main": "src/prebid.js",
   "scripts": {
@@ -43,11 +43,12 @@
     "@wdio/concise-reporter": "^7.5.2",
     "@wdio/local-runner": "^7.5.2",
     "@wdio/mocha-framework": "^7.5.2",
-    "@wdio/spec-reporter": "^7.5.2",
+    "@wdio/spec-reporter": "^7.19.0",
     "@wdio/sync": "^7.5.2",
     "ajv": "6.12.3",
     "assert": "^2.0.0",
     "babel-loader": "^8.0.5",
+    "babel-register": "^6.26.0",
     "body-parser": "^1.19.0",
     "chai": "^4.2.0",
     "coveralls": "^3.1.0",
diff --git a/src/adapters/bidderFactory.js b/src/adapters/bidderFactory.js
index 87bc7a45491..382c93b0d25 100644
--- a/src/adapters/bidderFactory.js
+++ b/src/adapters/bidderFactory.js
@@ -14,6 +14,7 @@ import { ADPOD } from '../mediaTypes.js';
 import { getHook, hook } from '../hook.js';
 import { getCoreStorageManager } from '../storageManager.js';
 import {auctionManager} from '../auctionManager.js';
+import { bidderSettings } from '../bidderSettings.js';
 
 export const storage = getCoreStorageManager('bidderFactory');
 
@@ -235,6 +236,11 @@ export function newBidder(spec) {
         onBid: (bid) => {
           const bidRequest = bidRequestMap[bid.requestId];
           if (bidRequest) {
+            bid.adapterCode = bidRequest.bidder;
+            if (isInvalidAlternateBidder(bid.bidderCode, bidRequest.bidder)) {
+              logWarn(`${bid.bidderCode} is not a registered partner or known bidder of ${bidRequest.bidder}, hence continuing without bid. If you wish to support this bidder, please mark allowAlternateBidderCodes as true in bidderSettings.`);
+              return;
+            }
             // creating a copy of original values as cpm and currency are modified later
             bid.originalCpm = bid.cpm;
             bid.originalCurrency = bid.currency;
@@ -250,6 +256,17 @@ export function newBidder(spec) {
     }
   });
 
+  function isInvalidAlternateBidder(responseBidder, requestBidder) {
+    let allowAlternateBidderCodes = bidderSettings.get(requestBidder, 'allowAlternateBidderCodes');
+    let alternateBiddersList = bidderSettings.get(requestBidder, 'allowedAlternateBidderCodes');
+    if (!!responseBidder && !!requestBidder && requestBidder !== responseBidder) {
+      if ((allowAlternateBidderCodes !== undefined && !allowAlternateBidderCodes) || (isArray(alternateBiddersList) && (alternateBiddersList[0] !== '*' && !alternateBiddersList.includes(responseBidder)))) {
+        return true;
+      }
+    }
+    return false;
+  }
+
   function registerSyncs(responses, gdprConsent, uspConsent) {
     registerSyncInner(spec, responses, gdprConsent, uspConsent);
   }
diff --git a/src/auction.js b/src/auction.js
index ae5c3c6156b..c55334bcd3d 100644
--- a/src/auction.js
+++ b/src/auction.js
@@ -848,13 +848,7 @@ function groupByPlacement(bidsByPlacement, bid) {
 function getTimedOutBids(bidderRequests, timelyBidders) {
   const timedOutBids = bidderRequests
     .map(bid => (bid.bids || []).filter(bid => !timelyBidders.has(bid.bidder)))
-    .reduce(flatten, [])
-    .map(bid => ({
-      bidId: bid.bidId,
-      bidder: bid.bidder,
-      adUnitCode: bid.adUnitCode,
-      auctionId: bid.auctionId,
-    }));
+    .reduce(flatten, []);
 
   return timedOutBids;
 }
diff --git a/test/fake-server/bundle.js b/test/fake-server/bundle.js
new file mode 100644
index 00000000000..b0430458083
--- /dev/null
+++ b/test/fake-server/bundle.js
@@ -0,0 +1,41 @@
+const fs = require('fs');
+const path = require('path');
+const makeBundle = require('../../gulpfile.js');
+const argv = require('yargs').argv;
+const host = argv.host || 'localhost';
+const port = argv.port || 4444;
+const dev = argv.dev || false;
+
+const REPLACE = {
+  'https://ib.adnxs.com/ut/v3/prebid': `http://${host}:${port}/appnexus`
+};
+
+const replaceStrings = (() => {
+  const rules = Object.entries(REPLACE).map(([orig, repl]) => {
+    return [new RegExp(orig, 'g'), repl];
+  });
+  return function(text) {
+    return rules.reduce((text, [pat, repl]) => text.replace(pat, repl), text);
+  }
+})();
+
+const getBundle = (() => {
+  const cache = {};
+  return function (modules = []) {
+    modules = Array.isArray(modules) ? [...modules] : [modules];
+    modules.sort();
+    const key = modules.join(',');
+    if (!cache.hasOwnProperty(key)) {
+      cache[key] = makeBundle(modules, dev).then(replaceStrings);
+    }
+    return cache[key];
+  }
+})();
+
+module.exports = function (req, res, next) {
+  res.type('text/javascript');
+  getBundle(req.query.modules).then((bundle) => {
+    res.write(bundle);
+    next();
+  }).catch(next);
+}
diff --git a/test/fake-server/fake-responder.js b/test/fake-server/fake-responder.js
index c884b00ca9c..a44d02260e7 100644
--- a/test/fake-server/fake-responder.js
+++ b/test/fake-server/fake-responder.js
@@ -6,9 +6,6 @@ const path = require('path');
 // path to the fixture directory
 const fixturesPath = path.join(__dirname, 'fixtures');
 
-// An object storing 'Request-Response' pairs.
-let REQ_RES_MAP = generateFixtures(fixturesPath);
-
 /**
  * Matches 'req.body' with the responseBody pair
  * @param {object} requestBody - `req.body` of incoming request hitting middleware 'fakeResponder'.
@@ -16,8 +13,8 @@ let REQ_RES_MAP = generateFixtures(fixturesPath);
  */
 const matchResponse = function (requestBody) {
   let actualUuids = [];
-
-  const requestResponsePairs = Object.keys(REQ_RES_MAP).map(testName => REQ_RES_MAP[testName]);
+  let reqResMap = generateFixtures(fixturesPath);
+  const requestResponsePairs = Object.keys(reqResMap).map(testName => reqResMap[testName]);
 
   // delete 'uuid' property
   requestBody.tags.forEach(body => {
@@ -38,8 +35,22 @@ const matchResponse = function (requestBody) {
   requestResponsePairs
     .forEach(reqRes => { reqRes.request.httpRequest && reqRes.request.httpRequest.body.tags.forEach(body => body.uuid && delete body.uuid) });
 
+  const match = requestResponsePairs.filter(reqRes => reqRes.request.httpRequest && deepEqual(reqRes.request.httpRequest.body.tags, requestBody.tags));
+
+  try {
+    if (match.length === 0) {
+      throw new Error('No mock response found');
+    } else if (match.length > 1) {
+      throw new Error('More than one mock response found')
+    }
+  } catch (e) {
+    console.error(e);
+    console.error('Tags:', JSON.stringify(requestBody.tags, null, 2));
+    throw e;
+  }
+
   // match the 'actual' requestBody with the 'expected' requestBody and find the 'responseBody'
-  const responseBody = requestResponsePairs.filter(reqRes => reqRes.request.httpRequest && deepEqual(reqRes.request.httpRequest.body.tags, requestBody.tags))[0].response.httpResponse.body;
+  const responseBody = match[0].response.httpResponse.body;
 
   // ENABLE THE FOLLOWING CODE FOR TROUBLE-SHOOTING FAKED REQUESTS; COMMENT AGAIN WHEN DONE
   // console.log('value found for responseBody:', responseBody);
diff --git a/test/fake-server/fixtures/basic-banner/request.json b/test/fake-server/fixtures/basic-banner/request.json
index ea85b5a6842..6b355cd24c0 100644
--- a/test/fake-server/fixtures/basic-banner/request.json
+++ b/test/fake-server/fixtures/basic-banner/request.json
@@ -58,4 +58,4 @@
 			"user": {}
 		}
 	}
-}
\ No newline at end of file
+}
diff --git a/test/fake-server/fixtures/basic-outstream/request.json b/test/fake-server/fixtures/basic-outstream/request.json
index 611a518fc2d..e9f3302ab4c 100644
--- a/test/fake-server/fixtures/basic-outstream/request.json
+++ b/test/fake-server/fixtures/basic-outstream/request.json
@@ -20,7 +20,7 @@
         "disable_psa": true,
         "video": {
           "skippable": true,
-          "playback_method": ["auto_play_sound_off"]
+          "playback_method": 2
         },
         "hb_source": 1
       }, {
@@ -40,11 +40,11 @@
         "disable_psa": true,
         "video": {
           "skippable": true,
-          "playback_method": ["auto_play_sound_off"]
+          "playback_method": 2
         },
         "hb_source": 1
       }],
       "user": {}
     }
   }
-}
\ No newline at end of file
+}
diff --git a/test/fake-server/index.js b/test/fake-server/index.js
index 752648c6746..e93bcfd465f 100644
--- a/test/fake-server/index.js
+++ b/test/fake-server/index.js
@@ -5,8 +5,9 @@ const morgan = require('morgan');
 const bodyParser = require('body-parser');
 const argv = require('yargs').argv;
 const fakeResponder = require('./fake-responder.js');
+const bundleMaker = require('./bundle.js');
 
-const PORT = argv.port || '3000';
+const PORT = argv.port || '4444';
 
 // Initialize express app
 const app = express();
@@ -24,7 +25,11 @@ app.use(function(req, res, next) {
   next();
 });
 
-app.post('/', fakeResponder, (req, res) => {
+app.get('/bundle', bundleMaker, (req, res) => {
+  res.send();
+});
+
+app.post('/appnexus', fakeResponder, (req, res) => {
   res.send();
 });
 
diff --git a/test/helpers/consentData.js b/test/helpers/consentData.js
new file mode 100644
index 00000000000..17ddc583f88
--- /dev/null
+++ b/test/helpers/consentData.js
@@ -0,0 +1,6 @@
+import {gdprDataHandler} from 'src/adapterManager.js';
+
+export function mockGdprConsent(sandbox, getConsentData = () => null) {
+  sandbox.stub(gdprDataHandler, 'promise').get(() => Promise.resolve(getConsentData()));
+  sandbox.stub(gdprDataHandler, 'getConsentData').callsFake(getConsentData)
+}
diff --git a/test/helpers/testing-utils.js b/test/helpers/testing-utils.js
index 76e2b652a79..81f22ca471d 100644
--- a/test/helpers/testing-utils.js
+++ b/test/helpers/testing-utils.js
@@ -1,13 +1,51 @@
 /* eslint-disable no-console */
-module.exports = {
+const {expect} = require('chai');
+const utils = {
   host: (process.env.TEST_SERVER_HOST) ? process.env.TEST_SERVER_HOST : 'localhost',
   protocol: (process.env.TEST_SERVER_PROTOCOL) ? 'https' : 'http',
+  testPageURL: function(name) {
+    return `${utils.protocol}://${utils.host}:9999/test/pages/${name}`
+  },
   waitForElement: function(elementRef, time = 2000) {
     let element = $(elementRef);
     element.waitForExist({timeout: time});
   },
-  switchFrame: function(frameRef, frameName) {
+  switchFrame: function(frameRef) {
     let iframe = $(frameRef);
     browser.switchToFrame(iframe);
+  },
+  loadAndWaitForElement(url, selector, pause = 3000, timeout = 2000, retries = 3, attempt = 1) {
+    browser.url(url);
+    browser.pause(pause);
+    if (selector != null) {
+      try {
+        utils.waitForElement(selector, timeout);
+      } catch (e) {
+        if (attempt < retries) {
+          utils.loadAndWaitForElement(url, selector, pause, timeout, retries, attempt + 1);
+        }
+      }
+    }
+  },
+  setupTest({url, waitFor, expectGAMCreative = null, pause = 3000, timeout = 2000, retries = 3}, name, fn) {
+    describe(name, function () {
+      this.retries(retries);
+      before(() => utils.loadAndWaitForElement(url, waitFor, pause, timeout, retries));
+      fn.call(this);
+      if (expectGAMCreative) {
+        expectGAMCreative = expectGAMCreative === true ? waitFor : expectGAMCreative;
+        it(`should render GAM creative`, () => {
+          utils.switchFrame(expectGAMCreative);
+          const creative = [
+            '> a > img', // banner
+            '> div[class="card"]' // native
+          ].map((child) => `body > div[class="GoogleActiveViewElement"] ${child}`)
+            .join(', ');
+          expect($(creative).isExisting()).to.be.true;
+        });
+      }
+    });
   }
 }
+
+module.exports = utils;
diff --git a/test/pages/banner.html b/test/pages/banner.html
index 75993cefb39..2e88d356647 100644
--- a/test/pages/banner.html
+++ b/test/pages/banner.html
@@ -7,7 +7,7 @@
 	<title>Prebid.js Banner Example</title>
 
 	<!-- Prebid.js -->
-	<script async src="../../build/dist/prebid.js"></script>
+	<script async src="http://localhost:4444/bundle?modules=appnexusBidAdapter"></script>
 
 	<!-- Google Publisher Tag -->
 	<script async src="https://www.googletagservices.com/tag/js/gpt.js"></script>
diff --git a/test/pages/bidderSettings.html b/test/pages/bidderSettings.html
index 015ad3ca45f..205fc250be1 100644
--- a/test/pages/bidderSettings.html
+++ b/test/pages/bidderSettings.html
@@ -1,7 +1,7 @@
 <html>
 
 <head>
-  <script async src="../../build/dist/prebid.js"></script>
+  <script async src="http://localhost:4444/bundle?modules=appnexusBidAdapter"></script>
   <script async src="https://www.googletagservices.com/tag/js/gpt.js"></script>
   <script>
     var PREBID_TIMEOUT = 5000;
@@ -124,4 +124,4 @@ <h5>Div-1</h5>
   </div>
 </body>
 
-</html>
\ No newline at end of file
+</html>
diff --git a/test/pages/consent_mgt_gdpr.html b/test/pages/consent_mgt_gdpr.html
index 02b367b3c7c..2fd9e963d60 100644
--- a/test/pages/consent_mgt_gdpr.html
+++ b/test/pages/consent_mgt_gdpr.html
@@ -1,7 +1,6 @@
 <html>
-
 <head>
-  <script async src="../../../build/dist/prebid.js"></script>
+  <script async src="http://localhost:4444/bundle?modules=appnexusBidAdapter&modules=consentManagement&modules=gpdrEnforcement"></script>
   <script async src="https://www.googletagservices.com/tag/js/gpt.js"></script>
   <script>
     (function (window, document) {
@@ -205,4 +204,4 @@ <h5>Div-1</h5>
   </div>
 </body>
 
-</html>
\ No newline at end of file
+</html>
diff --git a/test/pages/currency.html b/test/pages/currency.html
index 7f196e60d5e..84abe75147c 100644
--- a/test/pages/currency.html
+++ b/test/pages/currency.html
@@ -9,7 +9,7 @@
 
 <html>
 <head>
-    <script async src="../../../build/dist/prebid.js"></script>
+    <script async src="http://localhost:4444/bundle?modules=appnexusBidAdapter&modules=currency"></script>
     <script async src="https://www.googletagservices.com/tag/js/gpt.js"></script>
     <script>
         var FAILSAFE_TIMEOUT = 3300;
@@ -80,7 +80,7 @@
                 "currency": {
                     "adServerCurrency": "GBP",
                     "granularityMultiplier": 1,
-                    "defaultRates": { "USD": { "GBP": 0.80 }}
+                    "rates": { "USD": { "GBP": 0.80 }}
                 }
             });
             pbjs.addAdUnits(adUnits);
diff --git a/test/pages/instream.html b/test/pages/instream.html
index c1e2358b754..887b509813a 100644
--- a/test/pages/instream.html
+++ b/test/pages/instream.html
@@ -16,7 +16,7 @@
     <script src="https://cdnjs.cloudflare.com/ajax/libs/videojs-vast-vpaid/2.0.2/videojs_5.vast.vpaid.min.js"></script>
 
     <!-- prebid.js -->
-    <script src="../../build/dist/prebid.js" async=true></script>
+    <script src="http://localhost:4444/bundle?modules=appnexusBidAdapter&modules=dfpAdServerVideo" async=true></script>
 
 
     <script>
@@ -50,13 +50,14 @@
 
       pbjs.que.push(function(){
         pbjs.onEvent('auctionEnd', function() {
+            console.log(pbjs.getAdserverTargeting('video1'));
           let pEl = document.createElement('p');
           pEl.innerText = 'PREBID HAS FINISHED';
           pEl.id = 'statusText';
           let parDiv = document.getElementById('event-window');
           parDiv.appendChild(pEl);
         });
-        
+
         pbjs.addAdUnits(videoAdUnit);
         pbjs.setConfig({
                     debug: true,
@@ -65,6 +66,7 @@
                     }
                 });
         pbjs.requestBids({
+          timeout: 10000,
           bidsBackHandler : function(bids) {
             var videoUrl = pbjs.adServers.dfp.buildVideoUrl({
               adUnit: videoAdUnit,
@@ -97,8 +99,7 @@ <h2>Prebid Video -- video.js</h2>
     <video id="vid1" class="video-js vjs-default-skin vjs-big-play-centered" controls
            data-setup='{}'
            width='640'
-           height='480'
-    >
+           height='480'>
         <source src="http://vjs.zencdn.net/v/oceans.mp4" type='video/mp4'/>
         <source src="http://vjs.zencdn.net/v/oceans.webm" type='video/webm'/>
         <source src="http://vjs.zencdn.net/v/oceans.ogv" type='video/ogg'/>
diff --git a/test/pages/multiple_bidders.html b/test/pages/multiple_bidders.html
index 0117f8f8371..b743306d1ba 100644
--- a/test/pages/multiple_bidders.html
+++ b/test/pages/multiple_bidders.html
@@ -4,7 +4,7 @@
 
 <head>
   <script async src="//www.googletagservices.com/tag/js/gpt.js"></script>
-  <script async src="../../build/dist/prebid.js"></script>
+  <script async src="http://localhost:4444/bundle?modules=appnexusBidAdapter"></script>
   <meta charset="utf-8">
   <style>
     body {
@@ -111,4 +111,4 @@ <h3>div-banner</h3>
   </div>
 </body>
 
-</html>
\ No newline at end of file
+</html>
diff --git a/test/pages/native.html b/test/pages/native.html
index dcee4e41d40..d5216dfb6e7 100644
--- a/test/pages/native.html
+++ b/test/pages/native.html
@@ -7,7 +7,7 @@
 	<title>Prebid.js Native Example</title>
 
 	<!-- Prebid.js -->
-	<script async src="../../build/dist/prebid.js"></script>
+	<script async src="http://localhost:4444/bundle?modules=appnexusBidAdapter"></script>
 
 	<!-- Google Publisher Tag -->
 	<script async src="https://www.googletagservices.com/tag/js/gpt.js"></script>
diff --git a/test/pages/outstream.html b/test/pages/outstream.html
index 262c15ed02a..96a219f02af 100644
--- a/test/pages/outstream.html
+++ b/test/pages/outstream.html
@@ -7,7 +7,7 @@
 	<title>Prebid.js Video Outstream Example</title>
 
 	<!-- Load Prebid.js -->
-	<script async src="../../build/dist/prebid.js"></script>
+	<script async src="http://localhost:4444/bundle?modules=appnexusBidAdapter"></script>
 
 	<!-- Load Google Publisher Tag -->
 	<script async src="https://securepubads.g.doubleclick.net/tag/js/gpt.js"></script>
diff --git a/test/pages/priceGranularity.html b/test/pages/priceGranularity.html
deleted file mode 100644
index 7eae83f673a..00000000000
--- a/test/pages/priceGranularity.html
+++ /dev/null
@@ -1,133 +0,0 @@
-<html>
-
-<head>
-  <script async src="../../build/dist/prebid.js"></script>
-  <script async src="https://www.googletagservices.com/tag/js/gpt.js"></script>
-  <script>
-    var PREBID_TIMEOUT = 5000;
-
-    var adUnits = [{
-      code: 'div-gpt-ad-1460505748561-0',
-      mediaTypes: {
-        banner: {
-          sizes: [[300, 250], [300, 600]],
-        }
-      },
-      // Replace this object to test a new Adapter!
-      bids: [{
-        bidder: 'appnexus',
-        params: {
-          placementId: 13144370
-        }
-      }]
-
-    }, {
-      code: '/19968336/prebid_native_example_2',
-      sizes: [
-        [1, 1]
-      ],
-      mediaTypes: {
-        native: {
-          title: {
-            required: true
-          },
-          body: {
-            required: true
-          },
-          image: {
-            required: true
-          },
-          sponsoredBy: {
-            required: true
-          },
-          icon: {
-            required: false
-          },
-        }
-      },
-      bids: [{
-        bidder: 'appnexus',
-        params: {
-          placementId: 13232354,
-          allowSmallerSizes: true
-        }
-      }]
-    }];
-
-    var pbjs = pbjs || {};
-    pbjs.que = pbjs.que || [];
-
-  </script>
-
-  <script>
-    var googletag = googletag || {};
-    googletag.cmd = googletag.cmd || [];
-    const customPriceGranularity = {
-      "buckets": [{
-        "precision": 2,  //default is 2 if omitted - means 2.1234 rounded to 2 decimal places = 2.12
-        "min": 0,
-        "max": 5,
-        "increment": 0.01  // from $0 to $5, 1-cent increments
-      },
-      {
-        "precision": 2,
-        "min": 5,
-        "max": 8,
-        "increment": 0.05  // from $5 to $8, round down to the previous 5-cent increment
-      },
-      {
-        "precision": 2,
-        "min": 8,
-        "max": 40,
-        "increment": 0.5   // from $8 to $40, round down to the previous 50-cent increment
-      }]
-    };
-    googletag.cmd.push(function () {
-      googletag.pubads().disableInitialLoad();
-    });
-
-    pbjs.que.push(function () {
-      pbjs.addAdUnits(adUnits);
-      pbjs.setConfig({
-        priceGranularity: customPriceGranularity
-      });
-      pbjs.requestBids({
-        bidsBackHandler: sendAdserverRequest,
-        timeout: PREBID_TIMEOUT
-      });
-    });
-
-    function sendAdserverRequest() {
-      if (pbjs.adserverRequestSent) return;
-      pbjs.adserverRequestSent = true;
-      googletag.cmd.push(function () {
-        pbjs.que.push(function () {
-          pbjs.setTargetingForGPTAsync();
-          googletag.pubads().refresh();
-        });
-      });
-    }
-
-  </script>
-
-  <script>
-    googletag.cmd.push(function () {
-      googletag.defineSlot('/19968336/header-bid-tag-0', [[300, 250], [300, 600]], 'div-gpt-ad-1460505748561-0').addService(googletag.pubads());
-
-      googletag.pubads().enableSingleRequest();
-      googletag.enableServices();
-    });
-  </script>
-</head>
-
-<body>
-  <h2>Prebid.js Test</h2>
-  <h5>Div-1</h5>
-  <div id='div-gpt-ad-1460505748561-0'>
-    <script type='text/javascript'>
-      googletag.cmd.push(function () { googletag.display('div-gpt-ad-1460505748561-0'); });
-    </script>
-  </div>
-</body>
-
-</html>
\ No newline at end of file
diff --git a/test/pages/sizeConfig.html b/test/pages/sizeConfig.html
deleted file mode 100644
index a4aef89e44a..00000000000
--- a/test/pages/sizeConfig.html
+++ /dev/null
@@ -1,144 +0,0 @@
-<html>
-
-<head>
-  <script async src="../../build/dist/prebid.js"></script>
-  <script async src="https://www.googletagservices.com/tag/js/gpt.js"></script>
-  <script>
-    var PREBID_TIMEOUT = 5000;
-
-    var adUnits = [{
-      code: 'div-gpt-ad-1460505748561-0',
-      mediaTypes: {
-        banner: {
-          sizes: [[300, 250], [300, 600]],
-        }
-      },
-      // Replace this object to test a new Adapter!
-      bids: [{
-        bidder: 'appnexus',
-        params: {
-          placementId: 13144370
-        }
-      }]
-
-    }, {
-      code: '/19968336/prebid_native_example_2',
-      sizes: [
-        [1, 1]
-      ],
-      mediaTypes: {
-        native: {
-          title: {
-            required: true
-          },
-          body: {
-            required: true
-          },
-          image: {
-            required: true
-          },
-          sponsoredBy: {
-            required: true
-          },
-          icon: {
-            required: false
-          },
-        }
-      },
-      bids: [{
-        bidder: 'appnexus',
-        params: {
-          placementId: 13232354,
-          allowSmallerSizes: true
-        }
-      }]
-    }];
-
-    var pbjs = pbjs || {};
-    pbjs.que = pbjs.que || [];
-
-  </script>
-
-  <script>
-    var googletag = googletag || {};
-    googletag.cmd = googletag.cmd || [];
-    googletag.cmd.push(function () {
-      googletag.pubads().disableInitialLoad();
-    });
-
-    pbjs.que.push(function () {
-      pbjs.addAdUnits(adUnits);
-      pbjs.setConfig({
-        sizeConfig: [{
-          'mediaQuery': '(min-width: 1600px)',
-          'sizesSupported': [
-            [300, 600],
-            [970, 90],
-            [728, 90],
-            [300, 250]
-          ],
-          'labels': ['desktop-hd']
-        }, {
-          'mediaQuery': '(min-width: 1200px)',
-          'sizesSupported': [
-            [300, 600],
-            [728, 90],
-            [300, 250]
-          ],
-          'labels': ['desktop']
-        }, {
-          'mediaQuery': '(min-width: 768px) and (max-width: 1199px)',
-          'sizesSupported': [
-            [300, 600],
-            [300, 250]
-          ],
-          'labels': ['tablet']
-        }, {
-          'mediaQuery': '(min-width: 0px)',
-          'sizesSupported': [
-            [300, 250],
-            [300, 600]
-          ],
-          'labels': ['phone']
-        }]
-      });
-      pbjs.requestBids({
-        bidsBackHandler: sendAdserverRequest,
-        timeout: PREBID_TIMEOUT
-      });
-    });
-
-    function sendAdserverRequest() {
-      if (pbjs.adserverRequestSent) return;
-      pbjs.adserverRequestSent = true;
-      googletag.cmd.push(function () {
-        pbjs.que.push(function () {
-          pbjs.setTargetingForGPTAsync();
-          googletag.pubads().refresh();
-        });
-      });
-    }
-
-  </script>
-
-  <script>
-    googletag.cmd.push(function () {
-      googletag.defineSlot('/19968336/header-bid-tag-0', [[300, 250], [300, 600]], 'div-gpt-ad-1460505748561-0').addService(googletag.pubads());
-
-      googletag.pubads().enableSingleRequest();
-      googletag.enableServices();
-    });
-  </script>
-</head>
-
-<body>
-  <h2>Prebid.js Test</h2>
-  <h5>Div-1</h5>
-  <div id='div-gpt-ad-1460505748561-0'>
-    <script type='text/javascript'>
-      googletag.cmd.push(function () { googletag.display('div-gpt-ad-1460505748561-0'); });
-    </script>
-  </div>
-</body>
-
-</html>
\ No newline at end of file
diff --git a/test/pages/userSync.html b/test/pages/userSync.html
deleted file mode 100644
index 3d848906ae3..00000000000
--- a/test/pages/userSync.html
+++ /dev/null
@@ -1,123 +0,0 @@
-<html>
-
-<head>
-  <script async src="../../build/dist/prebid.js"></script>
-  <script async src="https://www.googletagservices.com/tag/js/gpt.js"></script>
-  <script>
-    var PREBID_TIMEOUT = 5000;
-
-    var adUnits = [{
-      code: 'div-gpt-ad-1460505748561-0',
-      mediaTypes: {
-        banner: {
-          sizes: [[300, 250], [300, 600]],
-        }
-      },
-      // Replace this object to test a new Adapter!
-      bids: [{
-        bidder: 'appnexus',
-        params: {
-          placementId: 13144370
-        }
-      }]
-
-    }, {
-      code: '/19968336/prebid_native_example_2',
-      sizes: [
-        [1, 1]
-      ],
-      mediaTypes: {
-        native: {
-          title: {
-            required: true
-          },
-          body: {
-            required: true
-          },
-          image: {
-            required: true
-          },
-          sponsoredBy: {
-            required: true
-          },
-          icon: {
-            required: false
-          },
-        }
-      },
-      bids: [{
-        bidder: 'appnexus',
-        params: {
-          placementId: 13232354,
-          allowSmallerSizes: true
-        }
-      }]
-    }];
-
-    var pbjs = pbjs || {};
-    pbjs.que = pbjs.que || [];
-
-  </script>
-
-  <script>
-    var googletag = googletag || {};
-    googletag.cmd = googletag.cmd || [];
-    googletag.cmd.push(function () {
-      googletag.pubads().disableInitialLoad();
-    });
-
-    pbjs.que.push(function () {
-      pbjs.addAdUnits(adUnits);
-      pbjs.setConfig({
-        userSync: {
-          filterSettings: {
-            iframe: {
-              bidders: ['appnexus'],   // '*' means all bidders
-              filter: 'include'
-            }
-          },
-          syncDelay: 5000,
-          syncsPerBidder: 3,
-          auctionDelay: 1000
-        }
-      });
-      pbjs.requestBids({
-        bidsBackHandler: sendAdserverRequest,
-        timeout: PREBID_TIMEOUT
-      });
-    });
-
-    function sendAdserverRequest() {
-      if (pbjs.adserverRequestSent) return;
-      pbjs.adserverRequestSent = true;
-      googletag.cmd.push(function () {
-        pbjs.que.push(function () {
-          pbjs.setTargetingForGPTAsync();
-          googletag.pubads().refresh();
-        });
-      });
-    }
-
-  </script>
-
-  <script>
-    googletag.cmd.push(function () {
-      googletag.defineSlot('/19968336/header-bid-tag-0', [[300, 250], [300, 600]], 'div-gpt-ad-1460505748561-0').addService(googletag.pubads());
-
-      googletag.pubads().enableSingleRequest();
-      googletag.enableServices();
-    });
-  </script>
-</head>
-
-<body>
-  <h2>Prebid.js Test</h2>
-  <h5>Div-1</h5>
-  <div id='div-gpt-ad-1460505748561-0'>
-    <script type='text/javascript'>
-      googletag.cmd.push(function () { googletag.display('div-gpt-ad-1460505748561-0'); });
-    </script>
-  </div>
-</body>
-
-</html>
\ No newline at end of file
diff --git a/test/spec/auctionmanager_spec.js b/test/spec/auctionmanager_spec.js
index a0435a83051..b5a4789366a 100644
--- a/test/spec/auctionmanager_spec.js
+++ b/test/spec/auctionmanager_spec.js
@@ -941,6 +941,8 @@ describe('auctionmanager.js', function () {
           const timedOutBids = bidTimeoutCall.args[1];
           assert.equal(timedOutBids.length, 1);
           assert.equal(timedOutBids[0].bidder, BIDDER_CODE1);
+          // Check that additional properties are available
+          assert.equal(timedOutBids[0].params.placementId, 'id');
 
           const auctionEndCall = eventsEmitSpy.withArgs(CONSTANTS.EVENTS.AUCTION_END).getCalls()[0];
           const auctionProps = auctionEndCall.args[1];
diff --git a/test/spec/e2e/banner/basic_banner_ad.spec.js b/test/spec/e2e/banner/basic_banner_ad.spec.js
index 7088bd3eade..e8103581d9d 100644
--- a/test/spec/e2e/banner/basic_banner_ad.spec.js
+++ b/test/spec/e2e/banner/basic_banner_ad.spec.js
@@ -1,35 +1,24 @@
 const expect = require('chai').expect;
-const { host, protocol, waitForElement, switchFrame } = require('../../../helpers/testing-utils');
+const {setupTest, testPageURL} = require('../../../helpers/testing-utils');
 
-const TEST_PAGE_URL = `${protocol}://${host}:9999/test/pages/banner.html?pbjs_debug=true`;
+const TEST_PAGE_URL = testPageURL('banner.html?pbjs_debug=true');
 const CREATIVE_IFRAME_ID = 'google_ads_iframe_/19968336/header-bid-tag-0_0';
 const CREATIVE_IFRAME_CSS_SELECTOR = 'iframe[id="' + CREATIVE_IFRAME_ID + '"]';
 
 const EXPECTED_TARGETING_KEYS = {
   'hb_format': 'banner',
-  'hb_source': 'client',
   'hb_pb': '0.50',
   'hb_bidder': 'appnexus',
   'hb_format_appnexus': 'banner',
-  'hb_source_appnexus': 'client',
   'hb_pb_appnexus': '0.50',
   'hb_bidder_appnexus': 'appnexus'
 };
 
-describe('Prebid.js Banner Ad Unit Test', function () {
-  this.retries(3);
-  before(function loadTestPage() {
-    browser.url(TEST_PAGE_URL);
-    browser.pause(3000);
-    try {
-      waitForElement(CREATIVE_IFRAME_CSS_SELECTOR, 3000);
-    } catch (e) {
-      // If creative Iframe didn't load, repeat the steps again!
-      // Due to some reason if the Ad server doesn't respond, the test case will time out after 60000 ms as defined in file wdio.conf.js
-      loadTestPage();
-    }
-  });
-
+setupTest({
+  url: TEST_PAGE_URL,
+  waitFor: CREATIVE_IFRAME_CSS_SELECTOR,
+  expectGAMCreative: true
+}, 'Prebid.js Banner Ad Unit Test', function () {
   it('should load the targeting keys with correct values', function () {
     const result = browser.execute(function () {
       return window.pbjs.getAdserverTargeting('div-gpt-ad-1460505748561-1');
@@ -41,10 +30,4 @@ describe('Prebid.js Banner Ad Unit Test', function () {
     expect(targetingKeys.hb_adid_appnexus).to.be.a('string');
     expect(targetingKeys.hb_size).to.satisfy((size) => size === '300x250' || '300x600');
   });
-
-  it('should render the Banner Ad on the page', function () {
-    switchFrame(CREATIVE_IFRAME_CSS_SELECTOR, CREATIVE_IFRAME_ID);
-    const ele = $('body > div[class="GoogleActiveViewElement"] > a > img');
-    expect(ele.isExisting()).to.be.true;
-  });
 });
diff --git a/test/spec/e2e/instream/basic_instream_video_ad.spec.js b/test/spec/e2e/instream/basic_instream_video_ad.spec.js
index b712f90bf63..02d218f9175 100644
--- a/test/spec/e2e/instream/basic_instream_video_ad.spec.js
+++ b/test/spec/e2e/instream/basic_instream_video_ad.spec.js
@@ -1,36 +1,23 @@
 const expect = require('chai').expect;
-const { host, protocol, waitForElement } = require('../../../helpers/testing-utils');
+const { testPageURL, setupTest } = require('../../../helpers/testing-utils');
 
-const TEST_PAGE_URL = `${protocol}://${host}:9999/test/pages/instream.html?pbjs_debug=true`;
+const TEST_PAGE_URL = testPageURL('instream.html?pbjs_debug=true');
 const ALERT_BOX_CSS_SELECTOR = 'div[id="event-window"] > p[id="statusText"]';
 
 const EXPECTED_TARGETING_KEYS = {
   hb_format: 'video',
-  hb_source: 'client',
   hb_size: '640x480',
   hb_pb: '10.00',
   hb_bidder: 'appnexus',
   hb_format_appnexus: 'video',
-  hb_source_appnexus: 'client',
   hb_size_appnexus: '640x480',
   hb_pb_appnexus: '10.00',
   hb_bidder_appnexus: 'appnexus'
 };
-
-describe('Prebid.js Instream Video Ad Test', function () {
-  this.retries(3);
-  before(function loadTestPage() {
-    browser.url(TEST_PAGE_URL);
-    browser.pause(5000);
-    try {
-      waitForElement(ALERT_BOX_CSS_SELECTOR, 3000);
-    } catch (e) {
-      // If creative Iframe didn't load, repeat the steps again!
-      // Due to some reason if the Ad server doesn't respond, the test case will time out after 60000 ms as defined in file wdio.conf.js
-      loadTestPage();
-    }
-  });
-
+setupTest({
+  url: TEST_PAGE_URL,
+  waitFor: ALERT_BOX_CSS_SELECTOR,
+}, 'Prebid.js Instream Video Ad Test', function () {
   it('should load the targeting keys with correct values', function () {
     const result = browser.execute(function () {
       return window.top.pbjs.getAdserverTargeting('video1');
@@ -41,8 +28,6 @@ describe('Prebid.js Instream Video Ad Test', function () {
     expect(targetingKeys.hb_adid).to.be.a('string');
     expect(targetingKeys.hb_adid_appnexus).to.be.a('string');
     expect(targetingKeys.hb_uuid).to.be.a('string');
-    expect(targetingKeys.hb_cache_id).to.be.a('string');
     expect(targetingKeys.hb_uuid_appnexus).to.be.a('string');
-    expect(targetingKeys.hb_cache_id_appnexus).to.be.a('string');
   });
 });
diff --git a/test/spec/e2e/modules/e2e_bidderSettings.spec.js b/test/spec/e2e/modules/e2e_bidderSettings.spec.js
index 2c0ba484654..f8aedfea652 100644
--- a/test/spec/e2e/modules/e2e_bidderSettings.spec.js
+++ b/test/spec/e2e/modules/e2e_bidderSettings.spec.js
@@ -1,12 +1,10 @@
 const expect = require('chai').expect;
-const { host, protocol, waitForElement, switchFrame } = require('../../../helpers/testing-utils');
+const {testPageURL, setupTest} = require('../../../helpers/testing-utils');
 
-const TEST_PAGE_URL = `${protocol}://${host}:9999/test/pages/bidderSettings.html?pbjs_debug=true`;
+const TEST_PAGE_URL = testPageURL('bidderSettings.html?pbjs_debug=true');
 const CREATIVE_IFRAME_CSS_SELECTOR = 'iframe[id="google_ads_iframe_/19968336/header-bid-tag-0_0"]';
 
 const EXPECTED_TARGETING_KEYS = {
-  hb_source: 'client',
-  hb_source_appnexus: 'client',
   hb_pb_appnexus: '10.00',
   hb_native_title_appn: 'This is a Prebid Native Creative',
   hb_native_linkurl: 'http://prebid.org/dev-docs/show-native-ads.html',
@@ -20,23 +18,14 @@ const EXPECTED_TARGETING_KEYS = {
   hb_native_brand_appn: 'Prebid.org',
   hb_bidder: 'appnexus',
   hb_format_appnexus: 'native',
-  hb_size_appnexus: '0x0'
-}
-
-describe('Prebid.js Bidder Settings Ad Unit Test', function () {
-  this.retries(3);
-  before(function loadTestPage() {
-    browser.url(TEST_PAGE_URL);
-    browser.pause(3000);
-    try {
-      waitForElement(CREATIVE_IFRAME_CSS_SELECTOR, 2000);
-    } catch (e) {
-      // If creative Iframe didn't load, repeat the steps again!
-      // Due to some reason if the Ad server doesn't respond, the test case will time out after 60000 ms as defined in file wdio.conf.js
-      loadTestPage();
-    }
-  });
+  hb_size_appnexus: '0x0',
+};
 
+setupTest({
+  url: TEST_PAGE_URL,
+  waitFor: CREATIVE_IFRAME_CSS_SELECTOR,
+  expectGAMCreative: true
+}, 'Prebid.js Bidder Settings Ad Unit Test', function () {
   it('should load the targeting keys with correct values', function () {
     const result = browser.execute(function () {
       return window.pbjs.getAdserverTargeting('/19968336/prebid_native_example_2');
@@ -44,18 +33,9 @@ describe('Prebid.js Bidder Settings Ad Unit Test', function () {
 
     const targetingKeys = result['/19968336/prebid_native_example_2'];
     expect(targetingKeys).to.include(EXPECTED_TARGETING_KEYS);
-    expect(targetingKeys.hb_adid).to.be.a('string');
-    expect(targetingKeys.hb_native_body).to.be.a('string');
-    expect(targetingKeys.hb_native_body_appne).to.be.a('string');
-    expect(targetingKeys.hb_native_icon).to.be.a('string');
-    expect(targetingKeys.hb_native_icon_appne).to.be.a('string');
-    expect(targetingKeys.hb_native_image).to.be.a('string');
-    expect(targetingKeys.hb_adid_appnexus).to.be.a('string');
-  });
-
-  it('should render the Banner Ad on the page', function () {
-    switchFrame(CREATIVE_IFRAME_CSS_SELECTOR);
-    const ele = $('body > div[class="GoogleActiveViewElement"] > a > img');
-    expect(ele.isExisting()).to.be.true;
+    // check that custom (bidderSettings) keys are present
+    expect(targetingKeys.apn_adId).to.be.a('string');
+    expect(targetingKeys.apn_adId).to.equal(targetingKeys.hb_adid);
+    expect(targetingKeys.apn_pbMg).to.equal('10.00');
   });
 });
diff --git a/test/spec/e2e/modules/e2e_consent_mgt_gdpr.spec.js b/test/spec/e2e/modules/e2e_consent_mgt_gdpr.spec.js
index 4e0e7da49ea..5b5ea2ef2cd 100644
--- a/test/spec/e2e/modules/e2e_consent_mgt_gdpr.spec.js
+++ b/test/spec/e2e/modules/e2e_consent_mgt_gdpr.spec.js
@@ -1,12 +1,12 @@
+/**
+ TODO: old CMP no longer works; see if we can fix this with https://github.com/prebid/Prebid.js/issues/6377
 const expect = require('chai').expect;
-const { host, protocol, switchFrame, waitForElement } = require('../../../helpers/testing-utils');
+const { testPageURL, switchFrame, waitForElement } = require('../../../helpers/testing-utils');
 
-const TEST_PAGE_URL = `${protocol}://${host}:9999/test/pages/consent_mgt_gdpr.html?pbjs_debug=true`;
+const TEST_PAGE_URL = testPageURL('consent_mgt_gdpr.html?pbjs_debug=true');
 const CREATIVE_IFRAME_CSS_SELECTOR = 'iframe[id="google_ads_iframe_/19968336/header-bid-tag-0_0"]';
 
 const EXPECTED_TARGETING_KEYS = {
-  hb_source: 'client',
-  hb_source_appnexus: 'client',
   hb_pb_appnexus: '10.00',
   hb_native_title_appn: 'This is a Prebid Native Creative',
   hb_native_linkurl: 'http://prebid.org/dev-docs/show-native-ads.html',
@@ -59,3 +59,4 @@ describe('Prebid.js GDPR Ad Unit Test', function () {
     expect(ele.isExisting()).to.be.true;
   });
 });
+**/
diff --git a/test/spec/e2e/modules/e2e_currency.spec.js b/test/spec/e2e/modules/e2e_currency.spec.js
index 8d8da5c5d45..e4eeeab4f5e 100644
--- a/test/spec/e2e/modules/e2e_currency.spec.js
+++ b/test/spec/e2e/modules/e2e_currency.spec.js
@@ -1,40 +1,18 @@
 const expect = require('chai').expect;
-const { host, protocol, waitForElement, switchFrame } = require('../../../helpers/testing-utils');
+const { testPageURL, setupTest } = require('../../../helpers/testing-utils');
 
-const TEST_PAGE_URL = `${protocol}://${host}:9999/test/pages/currency.html?pbjs_debug=true`;
+const TEST_PAGE_URL = testPageURL('currency.html?pbjs_debug=true');
 const CREATIVE_IFRAME_CSS_SELECTOR = 'iframe[id="google_ads_iframe_/19968336/header-bid-tag-0_0"]';
 
 const EXPECTED_TARGETING_KEYS = {
-  hb_source: 'client',
-  hb_source_appnexus: 'client',
-  hb_native_title_appn: 'This is a Prebid Native Creative',
-  hb_native_linkurl: 'http://prebid.org/dev-docs/show-native-ads.html',
-  hb_format: 'native',
-  hb_native_brand: 'Prebid.org',
-  hb_size: '0x0',
-  hb_bidder_appnexus: 'appnexus',
-  hb_native_linkurl_ap: 'http://prebid.org/dev-docs/show-native-ads.html',
-  hb_native_title: 'This is a Prebid Native Creative',
-  hb_native_brand_appn: 'Prebid.org',
-  hb_bidder: 'appnexus',
-  hb_format_appnexus: 'native',
-  hb_size_appnexus: '0x0'
+  hb_pb: '8.00' // response is 10; currency conversion is set to 0.8
 }
 
-describe('Prebid.js Currency Ad Unit Test', function () {
-  this.retries(3);
-  before(function loadTestPage() {
-    browser.url(TEST_PAGE_URL);
-    browser.pause(5000);
-    try {
-      waitForElement(CREATIVE_IFRAME_CSS_SELECTOR, 2000);
-    } catch (e) {
-      // If creative Iframe didn't load, repeat the steps again!
-      // Due to some reason if the Ad server doesn't respond, the test case will time out after 60000 ms as defined in file wdio.conf.js
-      loadTestPage();
-    }
-  });
-
+setupTest({
+  url: TEST_PAGE_URL,
+  waitFor: CREATIVE_IFRAME_CSS_SELECTOR,
+  expectGAMCreative: true
+}, 'Prebid.js Currency Ad Unit Test', function () {
   it('should load the targeting keys with correct values', function () {
     const result = browser.execute(function () {
       return window.pbjs.getAdserverTargeting('/19968336/prebid_native_example_2');
@@ -42,20 +20,5 @@ describe('Prebid.js Currency Ad Unit Test', function () {
 
     const targetingKeys = result['/19968336/prebid_native_example_2'];
     expect(targetingKeys).to.include(EXPECTED_TARGETING_KEYS);
-    expect(targetingKeys.hb_adid).to.be.a('string');
-    expect(targetingKeys.hb_pb).to.be.a('string');
-    expect(targetingKeys.hb_pb_appnexus).to.be.a('string');
-    expect(targetingKeys.hb_native_body).to.be.a('string');
-    expect(targetingKeys.hb_native_body_appne).to.be.a('string');
-    expect(targetingKeys.hb_native_icon).to.be.a('string');
-    expect(targetingKeys.hb_native_icon_appne).to.be.a('string');
-    expect(targetingKeys.hb_native_image).to.be.a('string');
-    expect(targetingKeys.hb_adid_appnexus).to.be.a('string');
-  });
-
-  it('should render the Banner Ad on the page', function () {
-    switchFrame(CREATIVE_IFRAME_CSS_SELECTOR);
-    const ele = $('body > div[class="GoogleActiveViewElement"] > a > img');
-    expect(ele.isExisting()).to.be.true;
   });
-});
+})
diff --git a/test/spec/e2e/modules/e2e_priceGranularity.spec.js b/test/spec/e2e/modules/e2e_priceGranularity.spec.js
deleted file mode 100644
index 157961d69ea..00000000000
--- a/test/spec/e2e/modules/e2e_priceGranularity.spec.js
+++ /dev/null
@@ -1,61 +0,0 @@
-const expect = require('chai').expect;
-const { host, protocol, switchFrame, waitForElement } = require('../../../helpers/testing-utils');
-
-const TEST_PAGE_URL = `${protocol}://${host}:9999/test/pages/priceGranularity.html?pbjs_debug=true`;
-const CREATIVE_IFRAME_CSS_SELECTOR = 'iframe[id="google_ads_iframe_/19968336/header-bid-tag-0_0"]';
-
-const EXPECTED_TARGETING_KEYS = {
-  hb_source: 'client',
-  hb_source_appnexus: 'client',
-  hb_pb_appnexus: '10.00',
-  hb_native_title_appn: 'This is a Prebid Native Creative',
-  hb_native_linkurl: 'http://prebid.org/dev-docs/show-native-ads.html',
-  hb_format: 'native',
-  hb_native_brand: 'Prebid.org',
-  hb_size: '0x0',
-  hb_bidder_appnexus: 'appnexus',
-  hb_native_linkurl_ap: 'http://prebid.org/dev-docs/show-native-ads.html',
-  hb_native_title: 'This is a Prebid Native Creative',
-  hb_pb: '10.00',
-  hb_native_brand_appn: 'Prebid.org',
-  hb_bidder: 'appnexus',
-  hb_format_appnexus: 'native',
-  hb_size_appnexus: '0x0'
-}
-
-describe('Prebid.js Price Granularity Ad Unit Test', function () {
-  this.retries(3);
-  before(function loadTestPage() {
-    browser.url(TEST_PAGE_URL);
-    browser.pause(3000);
-    try {
-      waitForElement(CREATIVE_IFRAME_CSS_SELECTOR, 2000);
-    } catch (e) {
-      // If creative Iframe didn't load, repeat the steps again!
-      // Due to some reason if the Ad server doesn't respond, the test case will time out after 60000 ms as defined in file wdio.conf.js
-      loadTestPage();
-    }
-  });
-
-  it('should load the targeting keys with correct values', function () {
-    const result = browser.execute(function () {
-      return window.pbjs.getAdserverTargeting('/19968336/prebid_native_example_2');
-    });
-
-    const targetingKeys = result['/19968336/prebid_native_example_2'];
-    expect(targetingKeys).to.include(EXPECTED_TARGETING_KEYS);
-    expect(targetingKeys.hb_adid).to.be.a('string');
-    expect(targetingKeys.hb_native_body).to.be.a('string');
-    expect(targetingKeys.hb_native_body_appne).to.be.a('string');
-    expect(targetingKeys.hb_native_icon).to.be.a('string');
-    expect(targetingKeys.hb_native_icon_appne).to.be.a('string');
-    expect(targetingKeys.hb_native_image).to.be.a('string');
-    expect(targetingKeys.hb_adid_appnexus).to.be.a('string');
-  });
-
-  it('should render the Banner Ad on the page', function () {
-    switchFrame(CREATIVE_IFRAME_CSS_SELECTOR);
-    const ele = $('body > div[class="GoogleActiveViewElement"] > a > img');
-    expect(ele.isExisting()).to.be.true;
-  });
-});
diff --git a/test/spec/e2e/modules/e2e_sizeConfig.spec.js b/test/spec/e2e/modules/e2e_sizeConfig.spec.js
deleted file mode 100644
index a37e6d49122..00000000000
--- a/test/spec/e2e/modules/e2e_sizeConfig.spec.js
+++ /dev/null
@@ -1,61 +0,0 @@
-const expect = require('chai').expect;
-const { host, protocol, switchFrame, waitForElement } = require('../../../helpers/testing-utils');
-
-const TEST_PAGE_URL = `${protocol}://${host}:9999/test/pages/sizeConfig.html?pbjs_debug=true`;
-const CREATIVE_IFRAME_CSS_SELECTOR = 'iframe[id="google_ads_iframe_/19968336/header-bid-tag-0_0"]';
-
-const EXPECTED_TARGETING_KEYS = {
-  hb_source: 'client',
-  hb_source_appnexus: 'client',
-  hb_pb_appnexus: '10.00',
-  hb_native_title_appn: 'This is a Prebid Native Creative',
-  hb_native_linkurl: 'http://prebid.org/dev-docs/show-native-ads.html',
-  hb_format: 'native',
-  hb_native_brand: 'Prebid.org',
-  hb_size: '0x0',
-  hb_bidder_appnexus: 'appnexus',
-  hb_native_linkurl_ap: 'http://prebid.org/dev-docs/show-native-ads.html',
-  hb_native_title: 'This is a Prebid Native Creative',
-  hb_pb: '10.00',
-  hb_native_brand_appn: 'Prebid.org',
-  hb_bidder: 'appnexus',
-  hb_format_appnexus: 'native',
-  hb_size_appnexus: '0x0'
-}
-
-describe('Prebid.js Size Config Ad Unit Test', function () {
-  this.retries(3);
-  before(function loadTestPage() {
-    browser.url(TEST_PAGE_URL);
-    browser.pause(3000);
-    try {
-      waitForElement(CREATIVE_IFRAME_CSS_SELECTOR, 2000);
-    } catch (e) {
-      // If creative Iframe didn't load, repeat the steps again!
-      // Due to some reason if the Ad server doesn't respond, the test case will time out after 60000 ms as defined in file wdio.conf.js
-      loadTestPage();
-    }
-  });
-
-  it('should load the targeting keys with correct values', function () {
-    const result = browser.execute(function () {
-      return window.pbjs.getAdserverTargeting('/19968336/prebid_native_example_2');
-    });
-
-    const targetingKeys = result['/19968336/prebid_native_example_2'];
-    expect(targetingKeys).to.include(EXPECTED_TARGETING_KEYS);
-    expect(targetingKeys.hb_adid).to.be.a('string');
-    expect(targetingKeys.hb_native_body).to.be.a('string');
-    expect(targetingKeys.hb_native_body_appne).to.be.a('string');
-    expect(targetingKeys.hb_native_icon).to.be.a('string');
-    expect(targetingKeys.hb_native_icon_appne).to.be.a('string');
-    expect(targetingKeys.hb_native_image).to.be.a('string');
-    expect(targetingKeys.hb_adid_appnexus).to.be.a('string');
-  });
-
-  it('should render the Banner Ad on the page', function () {
-    switchFrame(CREATIVE_IFRAME_CSS_SELECTOR);
-    const ele = $('body > div[class="GoogleActiveViewElement"] > a > img');
-    expect(ele.isExisting()).to.be.true;
-  });
-});
diff --git a/test/spec/e2e/modules/e2e_userSync.spec.js b/test/spec/e2e/modules/e2e_userSync.spec.js
deleted file mode 100644
index d945bfd3278..00000000000
--- a/test/spec/e2e/modules/e2e_userSync.spec.js
+++ /dev/null
@@ -1,61 +0,0 @@
-const expect = require('chai').expect;
-const { host, protocol, switchFrame, waitForElement } = require('../../../helpers/testing-utils');
-
-const TEST_PAGE_URL = `${protocol}://${host}:9999/test/pages/userSync.html?pbjs_debug=true`;
-const CREATIVE_IFRAME_CSS_SELECTOR = 'iframe[id="google_ads_iframe_/19968336/header-bid-tag-0_0"]';
-
-const EXPECTED_TARGETING_KEYS = {
-  hb_source: 'client',
-  hb_source_appnexus: 'client',
-  hb_pb_appnexus: '10.00',
-  hb_native_title_appn: 'This is a Prebid Native Creative',
-  hb_native_linkurl: 'http://prebid.org/dev-docs/show-native-ads.html',
-  hb_format: 'native',
-  hb_native_brand: 'Prebid.org',
-  hb_size: '0x0',
-  hb_bidder_appnexus: 'appnexus',
-  hb_native_linkurl_ap: 'http://prebid.org/dev-docs/show-native-ads.html',
-  hb_native_title: 'This is a Prebid Native Creative',
-  hb_pb: '10.00',
-  hb_native_brand_appn: 'Prebid.org',
-  hb_bidder: 'appnexus',
-  hb_format_appnexus: 'native',
-  hb_size_appnexus: '0x0'
-}
-
-describe('Prebid.js User Sync Ad Unit Test', function () {
-  this.retries(3);
-  before(function loadTestPage() {
-    browser.url(TEST_PAGE_URL);
-    browser.pause(3000);
-    try {
-      waitForElement(CREATIVE_IFRAME_CSS_SELECTOR, 2000);
-    } catch (e) {
-      // If creative Iframe didn't load, repeat the steps again!
-      // Due to some reason if the Ad server doesn't respond, the test case will time out after 60000 ms as defined in file wdio.conf.js
-      loadTestPage();
-    }
-  });
-
-  it('should load the targeting keys with correct values', function () {
-    const result = browser.execute(function () {
-      return window.pbjs.getAdserverTargeting('/19968336/prebid_native_example_2');
-    });
-
-    const targetingKeys = result['/19968336/prebid_native_example_2'];
-    expect(targetingKeys).to.include(EXPECTED_TARGETING_KEYS);
-    expect(targetingKeys.hb_adid).to.be.a('string');
-    expect(targetingKeys.hb_native_body).to.be.a('string');
-    expect(targetingKeys.hb_native_body_appne).to.be.a('string');
-    expect(targetingKeys.hb_native_icon).to.be.a('string');
-    expect(targetingKeys.hb_native_icon_appne).to.be.a('string');
-    expect(targetingKeys.hb_native_image).to.be.a('string');
-    expect(targetingKeys.hb_adid_appnexus).to.be.a('string');
-  });
-
-  it('should render the Banner Ad on the page', function () {
-    switchFrame(CREATIVE_IFRAME_CSS_SELECTOR);
-    const ele = $('body > div[class="GoogleActiveViewElement"] > a > img');
-    expect(ele.isExisting()).to.be.true;
-  });
-});
diff --git a/test/spec/e2e/multi-bidder/e2e_multiple_bidders.spec.js b/test/spec/e2e/multi-bidder/e2e_multiple_bidders.spec.js
index a67e2bd6db5..ef34cdc98f1 100644
--- a/test/spec/e2e/multi-bidder/e2e_multiple_bidders.spec.js
+++ b/test/spec/e2e/multi-bidder/e2e_multiple_bidders.spec.js
@@ -1,12 +1,10 @@
 const expect = require('chai').expect;
-const { host, protocol, waitForElement, switchFrame } = require('../../../helpers/testing-utils');
+const { testPageURL, setupTest } = require('../../../helpers/testing-utils');
 
-const TEST_PAGE_URL = `${protocol}://${host}:9999/test/pages/multiple_bidders.html?pbjs_debug=true`;
+const TEST_PAGE_URL = testPageURL('multiple_bidders.html?pbjs_debug=true');
 const CREATIVE_BANNER_CSS_SELECTOR = 'iframe[id="google_ads_iframe_/19968336/prebid_multiformat_test_0"]';
 
 const EXPECTED_TARGETING_KEYS = {
-  hb_source: 'client',
-  hb_source_adasta: 'client',
   hb_pb_adasta: '10.00',
   hb_native_title_adas: 'This is a Prebid Native Creative',
   hb_native_linkurl: 'http://prebid.org/dev-docs/show-multi-format-ads.html',
@@ -23,20 +21,11 @@ const EXPECTED_TARGETING_KEYS = {
   hb_size_adasta: '0x0'
 };
 
-describe('Prebid.js Multiple Bidder Ad Unit Test', function () {
-  this.retries(3);
-  before(function loadTestPage() {
-    browser.url(TEST_PAGE_URL);
-    browser.pause(5000);
-    try {
-      waitForElement(CREATIVE_BANNER_CSS_SELECTOR, 3000);
-    } catch (e) {
-      // If creative Iframe didn't load, repeat the steps again!
-      // Due to some reason if the Ad server doesn't respond, the test case will time out after 60000 ms as defined in file wdio.conf.js
-      loadTestPage();
-    }
-  });
-
+setupTest({
+  url: TEST_PAGE_URL,
+  waitFor: CREATIVE_BANNER_CSS_SELECTOR,
+  expectGAMCreative: true,
+}, 'Prebid.js Multiple Bidder Ad Unit Test', function () {
   it('should load the targeting keys with correct values', function () {
     const result = browser.execute(function () {
       return window.pbjs.getAdserverTargeting('div-banner-native-2');
@@ -44,24 +33,5 @@ describe('Prebid.js Multiple Bidder Ad Unit Test', function () {
 
     const targetingKeys = result['div-banner-native-2'];
     expect(targetingKeys).to.include(EXPECTED_TARGETING_KEYS);
-    expect(targetingKeys.hb_adid).to.be.a('string');
-    expect(targetingKeys.hb_native_image).to.be.a('string');
-    expect(targetingKeys.hb_native_image_adas).to.be.a('string');
-    expect(targetingKeys.hb_adid_adasta).to.be.a('string');
-  });
-
-  it('should render the Banner Ad on the page', function () {
-    switchFrame(CREATIVE_BANNER_CSS_SELECTOR);
-    let ele = $('body > div[class="GoogleActiveViewElement"] > a > img');
-    expect(ele.isExisting()).to.be.true;
   });
-
-  // it('should render the native ad on the  page', function () {
-  //   browser.switchToParentFrame();
-  //   waitForElement(CREATIVE_NATIVE_CSS_SELECTOR, 3000);
-  //   switchFrame(CREATIVE_NATIVE_CSS_SELECTOR);
-
-  //   let ele = $('body > div[class="GoogleActiveViewElement"] > div[class="card"]');
-  //   expect(ele.isExisting()).to.be.true;
-  // });
-});
+})
diff --git a/test/spec/e2e/native/basic_native_ad.spec.js b/test/spec/e2e/native/basic_native_ad.spec.js
index 418bcf271a3..4167046b553 100644
--- a/test/spec/e2e/native/basic_native_ad.spec.js
+++ b/test/spec/e2e/native/basic_native_ad.spec.js
@@ -1,12 +1,10 @@
 const expect = require('chai').expect;
-const { host, protocol, switchFrame, waitForElement } = require('../../../helpers/testing-utils');
+const { setupTest, testPageURL } = require('../../../helpers/testing-utils');
 
-const TEST_PAGE_URL = `${protocol}://${host}:9999/test/pages/native.html`;
+const TEST_PAGE_URL = testPageURL('native.html?pbjs_debug=true');
 const CREATIVE_IFRAME_CSS_SELECTOR = 'iframe[id="google_ads_iframe_/19968336/prebid_native_example_1_0"]';
 
 const EXPECTED_TARGETING_KEYS = {
-  hb_source: 'client',
-  hb_source_appnexus: 'client',
   hb_pb_appnexus: '10.00',
   hb_native_title_appn: 'This is a Prebid Native Creative',
   hb_native_linkurl: 'http://prebid.org/dev-docs/show-native-ads.html',
@@ -23,20 +21,11 @@ const EXPECTED_TARGETING_KEYS = {
   hb_size_appnexus: '0x0'
 }
 
-describe('Prebid.js Native Ad Unit Test', function () {
-  this.retries(3);
-  before(function loadTestPage() {
-    browser.url(TEST_PAGE_URL);
-    browser.pause(3000);
-    try {
-      waitForElement(CREATIVE_IFRAME_CSS_SELECTOR, 2000);
-    } catch (e) {
-      // If creative Iframe didn't load, repeat the steps again!
-      // Due to some reason if the Ad server doesn't respond, the test case will time out after 60000 ms as defined in file wdio.conf.js
-      loadTestPage();
-    }
-  });
-
+setupTest({
+  url: TEST_PAGE_URL,
+  waitFor: CREATIVE_IFRAME_CSS_SELECTOR,
+  expectGAMCreative: true
+}, 'Prebid.js Native Ad Unit Test', function () {
   it('should load the targeting keys with correct values', function () {
     const result = browser.execute(function () {
       return window.pbjs.getAdserverTargeting('/19968336/prebid_native_example_2');
@@ -44,18 +33,5 @@ describe('Prebid.js Native Ad Unit Test', function () {
 
     const targetingKeys = result['/19968336/prebid_native_example_2'];
     expect(targetingKeys).to.include(EXPECTED_TARGETING_KEYS);
-    expect(targetingKeys.hb_adid).to.be.a('string');
-    expect(targetingKeys.hb_native_body).to.be.a('string');
-    expect(targetingKeys.hb_native_body_appne).to.be.a('string');
-    expect(targetingKeys.hb_native_icon).to.be.a('string');
-    expect(targetingKeys.hb_native_icon_appne).to.be.a('string');
-    expect(targetingKeys.hb_native_image).to.be.a('string');
-    expect(targetingKeys.hb_adid_appnexus).to.be.a('string');
-  });
-
-  it('should render the native ad on the page', function () {
-    switchFrame(CREATIVE_IFRAME_CSS_SELECTOR);
-    const ele = $('body > div[class="GoogleActiveViewElement"] > div[class="card"]');
-    expect(ele.isExisting()).to.be.true;
   });
-});
+})
diff --git a/test/spec/e2e/outstream/basic_outstream_video_ad.spec.js b/test/spec/e2e/outstream/basic_outstream_video_ad.spec.js
index 0240b094f5e..427839fa92a 100644
--- a/test/spec/e2e/outstream/basic_outstream_video_ad.spec.js
+++ b/test/spec/e2e/outstream/basic_outstream_video_ad.spec.js
@@ -1,41 +1,24 @@
 const expect = require('chai').expect;
-const { host, protocol, waitForElement, switchFrame } = require('../../../helpers/testing-utils');
+const { setupTest, testPageURL, switchFrame } = require('../../../helpers/testing-utils');
 
-const TEST_PAGE_URL = `${protocol}://${host}:9999/test/pages/outstream.html`;
+const TEST_PAGE_URL = testPageURL('outstream.html');
 const CREATIVE_IFRAME_CSS_SELECTOR = 'div[id="video_ad_unit_1"] > div:nth-child(2) > iframe:nth-child(1)';
 
 const EXPECTED_TARGETING_KEYS = {
-  hb_cache_id: '',
-  hb_uuid: '',
   hb_format: 'video',
-  hb_source: 'client',
   hb_size: '640x480',
   hb_pb: '10.00',
   hb_bidder: 'appnexus',
   hb_format_appnexus: 'video',
-  hb_source_appnexus: 'client',
   hb_size_appnexus: '640x480',
   hb_pb_appnexus: '10.00',
   hb_bidder_appnexus: 'appnexus'
 };
 
-describe('Prebid.js Outstream Video Ad Test', function () {
-  this.retries(3);
-  before(function loadTestPage() {
-    browser.url(TEST_PAGE_URL);
-    browser.execute(function () {
-      return window.scrollBy(0, 300);
-    });
-    browser.pause(3000);
-    try {
-      waitForElement(CREATIVE_IFRAME_CSS_SELECTOR, 5000);
-    } catch (e) {
-      // If creative Iframe didn't load, repeat the steps again!
-      // Due to some reason if the Ad server doesn't respond, the test case will time out after 60000 ms as defined in file wdio.conf.js
-      loadTestPage();
-    }
-  });
-
+setupTest({
+  url: TEST_PAGE_URL,
+  waitFor: CREATIVE_IFRAME_CSS_SELECTOR,
+}, 'Prebid.js Outstream Video Ad Test', function () {
   it('should load the targeting keys with correct values', function () {
     const result = browser.execute(function () {
       return window.pbjs.getAdserverTargeting('video_ad_unit_2');
@@ -47,7 +30,7 @@ describe('Prebid.js Outstream Video Ad Test', function () {
     expect(targetingKeys.hb_adid_appnexus).to.be.a('string');
   });
 
-  it('should render the native ad on the page', function() {
+  it('should render the video ad on the page', function() {
     // skipping test in Edge due to wdio bug: https://github.com/webdriverio/webdriverio/issues/3880
     // the iframe for the video does not have a name property and id is generated automatically...
     if (browser.capabilities.browserName !== 'edge') {
diff --git a/test/spec/modules/adomikAnalyticsAdapter_spec.js b/test/spec/modules/adomikAnalyticsAdapter_spec.js
index 93822d04c88..d872d6f8e08 100644
--- a/test/spec/modules/adomikAnalyticsAdapter_spec.js
+++ b/test/spec/modules/adomikAnalyticsAdapter_spec.js
@@ -10,43 +10,34 @@ describe('Adomik Prebid Analytic', function () {
   let sendWonEventStub;
   let clock;
 
-  before(function () {
+  beforeEach(function () {
     clock = sinon.useFakeTimers();
+    sinon.spy(adomikAnalytics, 'track');
+    sendEventStub = sinon.stub(adomikAnalytics, 'sendTypedEvent');
+    sendWonEventStub = sinon.stub(adomikAnalytics, 'sendWonEvent');
+    sinon.stub(events, 'getEvents').returns([]);
+    adomikAnalytics.currentContext = undefined;
+
+    adapterManager.registerAnalyticsAdapter({
+      code: 'adomik',
+      adapter: adomikAnalytics
+    });
   });
-  after(function () {
+
+  afterEach(function () {
+    adomikAnalytics.disableAnalytics();
     clock.restore();
+    adomikAnalytics.track.restore();
+    sendEventStub.restore();
+    sendWonEventStub.restore();
+    events.getEvents.restore();
   });
 
-  describe('enableAnalytics', function () {
-    beforeEach(function () {
-      sinon.spy(adomikAnalytics, 'track');
-      sendEventStub = sinon.stub(adomikAnalytics, 'sendTypedEvent');
-      sendWonEventStub = sinon.stub(adomikAnalytics, 'sendWonEvent');
-      sinon.stub(events, 'getEvents').returns([]);
-    });
-
-    afterEach(function () {
-      adomikAnalytics.track.restore();
-      sendEventStub.restore();
-      sendWonEventStub.restore();
-      events.getEvents.restore();
-    });
-
-    after(function () {
-      adomikAnalytics.disableAnalytics();
-    });
-
+  describe('adomikAnalytics.enableAnalytics', function () {
     it('should catch all events', function (done) {
-      adapterManager.registerAnalyticsAdapter({
-        code: 'adomik',
-        adapter: adomikAnalytics
-      });
-
       const initOptions = {
         id: '123456',
-        url: 'testurl',
-        testId: '12345',
-        testValue: '1000'
+        url: 'testurl'
       };
 
       const bid = {
@@ -74,8 +65,6 @@ describe('Adomik Prebid Analytic', function () {
         uid: '123456',
         url: 'testurl',
         sampling: undefined,
-        testId: '12345',
-        testValue: '1000',
         id: '',
         timeouted: false
       });
@@ -87,8 +76,6 @@ describe('Adomik Prebid Analytic', function () {
         uid: '123456',
         url: 'testurl',
         sampling: undefined,
-        testId: '12345',
-        testValue: '1000',
         id: 'test-test-test',
         timeouted: false
       });
@@ -149,5 +136,118 @@ describe('Adomik Prebid Analytic', function () {
 
       sinon.assert.callCount(adomikAnalytics.track, 6);
     });
+
+    describe('when sampling is undefined', function () {
+      beforeEach(function() {
+        adapterManager.enableAnalytics({
+          provider: 'adomik',
+          options: { id: '123456', url: 'testurl' }
+        });
+      });
+
+      it('is enabled', function () {
+        expect(adomikAnalytics.currentContext).is.not.null;
+      });
+    });
+
+    describe('when sampling is 0', function () {
+      beforeEach(function() {
+        adapterManager.enableAnalytics({
+          provider: 'adomik',
+          options: { id: '123456', url: 'testurl', sampling: 0 }
+        });
+      });
+
+      it('is disabled', function () {
+        expect(adomikAnalytics.currentContext).to.equal(undefined);
+      });
+    });
+
+    describe('when sampling is 1', function () {
+      beforeEach(function() {
+        adapterManager.enableAnalytics({
+          provider: 'adomik',
+          options: { id: '123456', url: 'testurl', sampling: 1 }
+        });
+      });
+
+      it('is enabled', function () {
+        expect(adomikAnalytics.currentContext).is.not.null;
+      });
+    });
+
+    describe('when options is not defined', function () {
+      beforeEach(function() {
+        adapterManager.enableAnalytics({ provider: 'adomik' });
+      });
+
+      it('is disabled', function () {
+        expect(adomikAnalytics.currentContext).to.equal(undefined);
+      });
+    });
+
+    describe('when id is not defined in options', function () {
+      beforeEach(function() {
+        adapterManager.enableAnalytics({ provider: 'adomik', url: 'xxx' });
+      });
+
+      it('is disabled', function () {
+        expect(adomikAnalytics.currentContext).to.equal(undefined);
+      });
+    });
+
+    describe('when url is not defined in options', function () {
+      beforeEach(function() {
+        adapterManager.enableAnalytics({ provider: 'adomik', id: 'xxx' });
+      });
+
+      it('is disabled', function () {
+        expect(adomikAnalytics.currentContext).to.equal(undefined);
+      });
+    });
+  });
+
+  describe('adomikAnalytics.getKeyValues', function () {
+    it('returns [undefined, undefined]', function () {
+      let [testId, testValue] = adomikAnalytics.getKeyValues()
+      expect(testId).to.equal(undefined);
+      expect(testValue).to.equal(undefined);
+    });
+
+    describe('when test is in scope', function () {
+      beforeEach(function () {
+        sessionStorage.setItem(window.location.hostname + '_AdomikTestInScope', true);
+      });
+
+      it('returns [undefined, undefined]', function () {
+        let [testId, testValue] = adomikAnalytics.getKeyValues()
+        expect(testId).to.equal(undefined);
+        expect(testValue).to.equal(undefined);
+      });
+
+      describe('when key values are defined', function () {
+        beforeEach(function () {
+          sessionStorage.setItem(window.location.hostname + '_AdomikTest', '{"testId":"12345","testOptionLabel":"1000"}');
+        });
+
+        it('returns key values', function () {
+          let [testId, testValue] = adomikAnalytics.getKeyValues()
+          expect(testId).to.equal('12345');
+          expect(testValue).to.equal('1000');
+        });
+
+        describe('when preventTest is on', function () {
+          beforeEach(function () {
+            sessionStorage.setItem(window.location.hostname + '_NoAdomikTest', true);
+          });
+
+          it('returns [undefined, undefined]', function () {
+            let [testId, testValue] = adomikAnalytics.getKeyValues()
+            expect(testId).to.equal(undefined);
+            expect(testValue).to.equal(undefined);
+          });
+        });
+      });
+    });
   });
 });
diff --git a/test/spec/modules/adotBidAdapter_spec.js b/test/spec/modules/adotBidAdapter_spec.js
index c180a5f79f7..81b9c5e15e9 100644
--- a/test/spec/modules/adotBidAdapter_spec.js
+++ b/test/spec/modules/adotBidAdapter_spec.js
@@ -12,7 +12,7 @@ describe('Adot Adapter', function () {
     })
 
     it('should return true if video and isValidVideo', function () {
-      const bid = { mediaTypes: { video: { 'mimes': 1, 'minduration': 1, 'maxduration': 1, 'protocols': 1 } } };
+      const bid = { mediaTypes: { video: { 'mimes': 1, 'protocols': 1 } } };
       const isBidRequestValid = spec.isBidRequestValid(bid);
       expect(isBidRequestValid).to.equal(true);
     })
diff --git a/test/spec/modules/adyoulikeBidAdapter_spec.js b/test/spec/modules/adyoulikeBidAdapter_spec.js
index 3f9ebb3323e..3e68a10f56e 100644
--- a/test/spec/modules/adyoulikeBidAdapter_spec.js
+++ b/test/spec/modules/adyoulikeBidAdapter_spec.js
@@ -462,13 +462,15 @@ describe('Adyoulike Adapter', function () {
     'Placement': 'placement_0',
     'Vast': 'PFZBU1Q+RW1wdHkgc2FtcGxlPC92YXN0Pg==',
     'Price': 0.5,
-    'Height': 600,
+    'Height': 300,
+    'Width': 530
   }];
 
   const videoResult = [{
     cpm: 0.5,
     creativeId: undefined,
     currency: 'USD',
+    height: 300,
     netRevenue: true,
     requestId: 'bid_id_0',
     ttl: 3600,
@@ -476,7 +478,8 @@ describe('Adyoulike Adapter', function () {
     meta: {
       advertiserDomains: []
     },
-    vastXml: '<VAST>Empty sample</vast>'
+    vastXml: '<VAST>Empty sample</vast>',
+    width: 530
   }];
 
   const responseWithMultiplePlacements = [
diff --git a/test/spec/modules/apacdexBidAdapter_spec.js b/test/spec/modules/apacdexBidAdapter_spec.js
index 9b75481ada9..ff1d3b813ce 100644
--- a/test/spec/modules/apacdexBidAdapter_spec.js
+++ b/test/spec/modules/apacdexBidAdapter_spec.js
@@ -252,14 +252,14 @@ describe('ApacdexBidAdapter', function () {
 
     it('should return a properly formatted request', function () {
       const bidRequests = spec.buildRequests(bidRequest, bidderRequests)
-      expect(bidRequests.url).to.equal('https://useast.quantumdex.io/auction/apacdex')
+      expect(bidRequests.url).to.equal('https://useast.quantumdex.io/auction/pbjs')
       expect(bidRequests.method).to.equal('POST')
       expect(bidRequests.bidderRequests).to.eql(bidRequest);
     })
 
     it('should return a properly formatted request with GDPR applies set to true', function () {
       const bidRequests = spec.buildRequests(bidRequest, bidderRequests)
-      expect(bidRequests.url).to.equal('https://useast.quantumdex.io/auction/apacdex')
+      expect(bidRequests.url).to.equal('https://useast.quantumdex.io/auction/pbjs')
       expect(bidRequests.method).to.equal('POST')
       expect(bidRequests.data.gdpr.gdprApplies).to.equal(true)
       expect(bidRequests.data.gdpr.consentString).to.equal('BOJ/P2HOJ/P2HABABMAAAAAZ+A==')
@@ -268,7 +268,7 @@ describe('ApacdexBidAdapter', function () {
     it('should return a properly formatted request with GDPR applies set to false', function () {
       bidderRequests.gdprConsent.gdprApplies = false;
       const bidRequests = spec.buildRequests(bidRequest, bidderRequests)
-      expect(bidRequests.url).to.equal('https://useast.quantumdex.io/auction/apacdex')
+      expect(bidRequests.url).to.equal('https://useast.quantumdex.io/auction/pbjs')
       expect(bidRequests.method).to.equal('POST')
       expect(bidRequests.data.gdpr.gdprApplies).to.equal(false)
       expect(bidRequests.data.gdpr.consentString).to.equal('BOJ/P2HOJ/P2HABABMAAAAAZ+A==')
@@ -288,7 +288,7 @@ describe('ApacdexBidAdapter', function () {
         }
       };
       const bidRequests = spec.buildRequests(bidRequest, bidderRequests)
-      expect(bidRequests.url).to.equal('https://useast.quantumdex.io/auction/apacdex')
+      expect(bidRequests.url).to.equal('https://useast.quantumdex.io/auction/pbjs')
       expect(bidRequests.method).to.equal('POST')
       expect(bidRequests.data.gdpr.gdprApplies).to.equal(false)
       expect(bidRequests.data.gdpr).to.not.include.keys('consentString')
@@ -308,7 +308,7 @@ describe('ApacdexBidAdapter', function () {
         }
       };
       const bidRequests = spec.buildRequests(bidRequest, bidderRequests)
-      expect(bidRequests.url).to.equal('https://useast.quantumdex.io/auction/apacdex')
+      expect(bidRequests.url).to.equal('https://useast.quantumdex.io/auction/pbjs')
       expect(bidRequests.method).to.equal('POST')
       expect(bidRequests.data.gdpr.gdprApplies).to.equal(true)
       expect(bidRequests.data.gdpr).to.not.include.keys('consentString')
@@ -384,7 +384,7 @@ describe('ApacdexBidAdapter', function () {
   describe('.interpretResponse', function () {
     const bidRequests = {
       'method': 'POST',
-      'url': 'https://useast.quantumdex.io/auction/apacdex',
+      'url': 'https://useast.quantumdex.io/auction/pbjs',
       'withCredentials': true,
       'data': {
         'device': {
diff --git a/test/spec/modules/audiencerunBidAdapter_spec.js b/test/spec/modules/audiencerunBidAdapter_spec.js
index 7c1279f5073..7f1e059fa2a 100644
--- a/test/spec/modules/audiencerunBidAdapter_spec.js
+++ b/test/spec/modules/audiencerunBidAdapter_spec.js
@@ -8,65 +8,68 @@ const BID_SERVER_RESPONSE = {
   body: {
     bid: [
       {
-        'bidId': '51ef8751f9aead',
-        'zoneId': '12345abcde',
-        'crid': '5678',
-        'cpm': 8.021951999999999999,
-        'currency': 'USD',
-        'w': 728,
-        'h': 90,
-        'isNet': false,
-        'buying_type': 'rtb',
-        'syncUrl': 'https://ac.audiencerun.com/f/sync.html',
-        'adm': '<!-- test creative -->',
-        'adomain': ['example.com']
-      }
-    ]
-  }
+        bidId: '51ef8751f9aead',
+        zoneId: '12345abcde',
+        crid: '5678',
+        cpm: 8.0219519,
+        currency: 'USD',
+        w: 728,
+        h: 90,
+        isNet: false,
+        buying_type: 'rtb',
+        syncUrl: 'https://ac.audiencerun.com/f/sync.html',
+        adm: '<!-- test creative -->',
+        adomain: ['example.com'],
+      },
+    ],
+  },
 };
 
-describe('AudienceRun bid adapter tests', function() {
+describe('AudienceRun bid adapter tests', function () {
   const adapter = newBidder(spec);
 
-  describe('inherited functions', function() {
-    it('exists and is a function', function() {
+  describe('inherited functions', function () {
+    it('exists and is a function', function () {
       expect(adapter.callBids).to.exist.and.to.be.a('function');
     });
   });
 
-  describe('isBidRequestValid', function() {
+  describe('isBidRequestValid', function () {
     let bid = {
-      'bidder': 'audiencerun',
-      'params': {
-        'zoneId': '12345abcde'
+      bidder: 'audiencerun',
+      params: {
+        zoneId: '12345abcde',
       },
-      'adUnitCode': 'adunit-code',
-      'mediaTypes': {
-        'banner': {
-          'sizes': [[300, 250], [300, 600]]
-        }
+      adUnitCode: 'adunit-code',
+      mediaTypes: {
+        banner: {
+          sizes: [
+            [300, 250],
+            [300, 600],
+          ],
+        },
       },
-      'bidId': '30b31c1838de1e',
-      'bidderRequestId': '22edbae2733bf6',
-      'auctionId': '1d1a030790a475',
-      'creativeId': 'er2ee'
+      bidId: '30b31c1838de1e',
+      bidderRequestId: '22edbae2733bf6',
+      auctionId: '1d1a030790a475',
+      creativeId: 'er2ee',
     };
 
-    it('should return true when required params found', function() {
+    it('should return true when required params found', function () {
       expect(spec.isBidRequestValid(bid)).to.equal(true);
     });
 
-    it('should return true when zoneId is valid', function() {
+    it('should return true when zoneId is valid', function () {
       let bid = Object.assign({}, bid);
       delete bid.params;
       bid.params = {
-        'zoneId': '12345abcde'
+        zoneId: '12345abcde',
       };
 
       expect(spec.isBidRequestValid(bid)).to.equal(true);
     });
 
-    it('should return false when required params are not passed', function() {
+    it('should return false when required params are not passed', function () {
       let bid = Object.assign({}, bid);
       delete bid.params;
 
@@ -76,38 +79,45 @@ describe('AudienceRun bid adapter tests', function() {
     });
   });
 
-  describe('buildRequests', function() {
+  describe('buildRequests', function () {
     const bidRequests = [
       {
-        'bidder': 'audiencerun',
-        'bidId': '51ef8751f9aead',
-        'params': {
-          'zoneId': '12345abcde'
+        bidder: 'audiencerun',
+        bidId: '51ef8751f9aead',
+        params: {
+          zoneId: '12345abcde',
         },
-        'adUnitCode': 'div-gpt-ad-1460505748561-0',
-        'transactionId': 'd7b773de-ceaa-484d-89ca-d9f51b8d61ec',
-        'mediaTypes': {
-          'banner': {
-            'sizes': [[320, 50], [300, 250], [300, 600]]
-          }
+        adUnitCode: 'div-gpt-ad-1460505748561-0',
+        transactionId: 'd7b773de-ceaa-484d-89ca-d9f51b8d61ec',
+        mediaTypes: {
+          banner: {
+            sizes: [
+              [320, 50],
+              [300, 250],
+              [300, 600],
+            ],
+          },
         },
-        'bidderRequestId': '418b37f85e772c',
-        'auctionId': '18fd8b8b0bd757',
-        'bidRequestsCount': 1
-      }
+        bidderRequestId: '418b37f85e772c',
+        auctionId: '18fd8b8b0bd757',
+        bidRequestsCount: 1,
+      },
     ];
     const bidRequest = bidRequests[0];
 
-    it('sends a valid bid request to ENDPOINT via POST', function() {
+    it('sends a valid bid request to ENDPOINT via POST', function () {
       const request = spec.buildRequests(bidRequests, {
         gdprConsent: {
-          consentString: 'BOZcQl_ObPFjWAeABAESCD-AAAAjx7_______9______9uz_Ov_v_f__33e8__9v_l_7_-___u_-33d4-_1vf99yfm1-7ftr3tp_87ues2_Xur__59__3z3_NohBgA',
-          gdprApplies: true
+          consentString:
+            'BOZcQl_ObPFjWAeABAESCD-AAAAjx7_______9______9uz_Ov_v_f__33e8__9v_l_7_-___u_-33d4-_1vf99yfm1-7ftr3tp_87ues2_Xur__59__3z3_NohBgA',
+          gdprApplies: true,
         },
         refererInfo: {
-          canonicalUrl: 'https://example.com/canonical',
-          referer: 'https://example.com'
-        }
+          canonicalUrl: undefined,
+          referer: 'https://example.com',
+          numIframes: 0,
+          reachedTop: true,
+        },
       });
 
       expect(request.url).to.equal(ENDPOINT);
@@ -116,7 +126,9 @@ describe('AudienceRun bid adapter tests', function() {
       const payload = JSON.parse(request.data);
       expect(payload.gdpr).to.exist;
 
-      expect(payload.bids).to.exist.and.to.be.an('array').and.to.have.lengthOf(1);
+      expect(payload.bids)
+        .to.exist.and.to.be.an('array')
+        .and.to.have.lengthOf(1);
       expect(payload.referer).to.exist;
 
       const bid = payload.bids[0];
@@ -128,13 +140,13 @@ describe('AudienceRun bid adapter tests', function() {
       expect(bid.sizes[0].h).to.be.a('number');
     });
 
-    it('should send GDPR to endpoint and honor gdprApplies value', function() {
+    it('should send GDPR to endpoint and honor gdprApplies value', function () {
       let consentString = 'bogusConsent';
       let bidderRequest = {
-        'gdprConsent': {
-          'consentString': consentString,
-          'gdprApplies': true
-        }
+        gdprConsent: {
+          consentString: consentString,
+          gdprApplies: true,
+        },
       };
 
       const request = spec.buildRequests(bidRequests, bidderRequest);
@@ -144,10 +156,10 @@ describe('AudienceRun bid adapter tests', function() {
       expect(payload.gdpr.applies).to.equal(true);
 
       let bidderRequest2 = {
-        'gdprConsent': {
-          'consentString': consentString,
-          'gdprApplies': false
-        }
+        gdprConsent: {
+          consentString: consentString,
+          gdprApplies: false,
+        },
       };
 
       const request2 = spec.buildRequests(bidRequests, bidderRequest2);
@@ -158,19 +170,32 @@ describe('AudienceRun bid adapter tests', function() {
       expect(payload2.gdpr.applies).to.equal(false);
     });
 
-    it('should use a bidfloor with a 0 value', function() {
+    it('should use the auctionUrl passed from bid params', function () {
+      const bid = Object.assign({}, bidRequest, {
+        params: {
+          zoneId: '12345abcde',
+          auctionUrl: 'https://auction.url.audiencerun.com',
+        },
+      });
+      const request = spec.buildRequests([bid]);
+
+      expect(request.url).to.exist;
+      expect(request.url).to.equal('https://auction.url.audiencerun.com');
+    });
+
+    it('should use a bidfloor with a 0 value', function () {
       const bid = Object.assign({}, bidRequest);
       const request = spec.buildRequests([bid]);
       const payload = JSON.parse(request.data);
       expect(payload.bids[0].bidfloor).to.exist.and.to.equal(0);
-    })
+    });
 
     it('should use bidfloor param value', function () {
       const bid = Object.assign({}, bidRequest, {
         params: {
-          'bidfloor': 0.2
-        }
-      })
+          bidfloor: 0.2,
+        },
+      });
       const request = spec.buildRequests([bid]);
       const payload = JSON.parse(request.data);
       expect(payload.bids[0].bidfloor).to.exist.and.to.equal(0.2);
@@ -179,43 +204,104 @@ describe('AudienceRun bid adapter tests', function() {
     it('should use floors module value', function () {
       const bid = Object.assign({}, bidRequest, {
         params: {
-          'bidfloor': 0.5
-        }
-      })
+          bidfloor: 0.5,
+        },
+      });
       bid.getFloor = () => {
-        return { floor: 1, currency: 'USD' }
-      }
+        return { floor: 1, currency: 'USD' };
+      };
       const request = spec.buildRequests([bid]);
       const payload = JSON.parse(request.data);
       expect(payload.bids[0].bidfloor).to.exist.and.to.equal(1);
     });
+
+    it('should add userid eids information to the request', function () {
+      const bid = Object.assign({}, bidRequest);
+      bid.userId = {
+        pubcid: '01EAJWWNEPN3CYMM5N8M5VXY22',
+        unsuported: '666',
+      }
+
+      const request = spec.buildRequests([bid]);
+      const payload = JSON.parse(request.data);
+
+      expect(payload.userId).to.exist;
+      expect(payload.userId).to.deep.equal([
+        {
+          source: 'pubcid.org',
+          uids: [
+            {
+              atype: 1,
+              id: '01EAJWWNEPN3CYMM5N8M5VXY22',
+            },
+          ],
+        },
+      ]);
+    });
+
+    it('should add schain object if available', function() {
+      const bid = Object.assign({}, bidRequest)
+      bid.schain = {
+        ver: '1.0',
+        complete: 1,
+        nodes: [
+          {
+            asi: 'directseller.com',
+            sid: '00001',
+            rid: 'BidRequest1',
+            hp: 1,
+          },
+        ],
+      };
+
+      const request = spec.buildRequests([bid]);
+      const payload = JSON.parse(request.data);
+
+      expect(payload.schain).to.exist;
+      expect(payload.schain).to.deep.equal({
+        ver: '1.0',
+        complete: 1,
+        nodes: [
+          {
+            asi: 'directseller.com',
+            sid: '00001',
+            rid: 'BidRequest1',
+            hp: 1,
+          },
+        ],
+      });
+    })
   });
 
   describe('interpretResponse', function () {
-    const expectedResponse = [{
-      'requestId': '51ef8751f9aead',
-      'cpm': 8.021951999999999999,
-      'width': '728',
-      'height': '90',
-      'creativeId': '5678',
-      'currency': 'USD',
-      'netRevenue': false,
-      'ttl': 300,
-      'ad': '<!-- test creative -->',
-      'mediaType': 'banner',
-      'meta': {
-        'advertiserDomains': ['example.com']
-      }
-    }];
+    const expectedResponse = [
+      {
+        requestId: '51ef8751f9aead',
+        cpm: 8.0219519,
+        width: '728',
+        height: '90',
+        creativeId: '5678',
+        currency: 'USD',
+        netRevenue: false,
+        ttl: 300,
+        ad: '<!-- test creative -->',
+        mediaType: 'banner',
+        meta: {
+          advertiserDomains: ['example.com'],
+        },
+      },
+    ];
 
     it('should get the correct bid response by display ad', function () {
       let result = spec.interpretResponse(BID_SERVER_RESPONSE);
-      expect(Object.keys(result[0])).to.have.members(Object.keys(expectedResponse[0]));
+      expect(Object.keys(result[0])).to.have.members(
+        Object.keys(expectedResponse[0])
+      );
     });
 
     it('should handle empty bid response', function () {
       const response = {
-        body: {}
+        body: {},
       };
       let result = spec.interpretResponse(response);
       expect(result.length).to.equal(0);
@@ -223,17 +309,19 @@ describe('AudienceRun bid adapter tests', function() {
   });
 
   describe('getUserSyncs', function () {
-    const serverResponses = [ BID_SERVER_RESPONSE ];
+    const serverResponses = [BID_SERVER_RESPONSE];
     const syncOptions = { iframeEnabled: true };
 
-    it('should return empty if no server responses', function() {
+    it('should return empty if no server responses', function () {
       const syncs = spec.getUserSyncs(syncOptions, []);
-      expect(syncs).to.deep.equal([])
+      expect(syncs).to.deep.equal([]);
     });
 
     it('should return user syncs', function () {
       const syncs = spec.getUserSyncs(syncOptions, serverResponses);
-      expect(syncs).to.deep.equal([{type: 'iframe', url: 'https://ac.audiencerun.com/f/sync.html'}])
+      expect(syncs).to.deep.equal([
+        { type: 'iframe', url: 'https://ac.audiencerun.com/f/sync.html' },
+      ]);
     });
   });
 
diff --git a/test/spec/modules/cointrafficBidAdapter_spec.js b/test/spec/modules/cointrafficBidAdapter_spec.js
index 3755ddc4c4a..24570de5083 100644
--- a/test/spec/modules/cointrafficBidAdapter_spec.js
+++ b/test/spec/modules/cointrafficBidAdapter_spec.js
@@ -3,7 +3,7 @@ import { spec } from 'modules/cointrafficBidAdapter.js';
 import { config } from 'src/config.js'
 import * as utils from 'src/utils.js'
 
-const ENDPOINT_URL = 'https://appspb.cointraffic.io/pb/tmp';
+const ENDPOINT_URL = 'https://apps-pbd.ctengine.io/pb/tmp';
 
 describe('cointrafficBidAdapter', function () {
   describe('isBidRequestValid', function () {
diff --git a/test/spec/modules/colossussspBidAdapter_spec.js b/test/spec/modules/colossussspBidAdapter_spec.js
index 32f02def27e..da050b3af90 100644
--- a/test/spec/modules/colossussspBidAdapter_spec.js
+++ b/test/spec/modules/colossussspBidAdapter_spec.js
@@ -48,6 +48,10 @@ describe('ColossussspAdapter', function () {
     auctionStart: 1472239426000,
     timeout: 5000,
     uspConsent: '1YN-',
+    gdprConsent: {
+      consentString: 'xxx',
+      gdprApplies: 1
+    },
     refererInfo: {
       referer: 'http://www.example.com',
       reachedTop: true,
@@ -87,7 +91,7 @@ describe('ColossussspAdapter', function () {
     it('Returns valid data if array of bids is valid', function () {
       let data = serverRequest.data;
       expect(data).to.be.an('object');
-      expect(data).to.have.all.keys('deviceWidth', 'deviceHeight', 'language', 'secure', 'host', 'page', 'placements', 'ccpa');
+      expect(data).to.have.all.keys('deviceWidth', 'deviceHeight', 'language', 'secure', 'host', 'page', 'placements', 'ccpa', 'gdpr_consent', 'gdpr_require');
       expect(data.deviceWidth).to.be.a('number');
       expect(data.deviceHeight).to.be.a('number');
       expect(data.language).to.be.a('string');
@@ -108,6 +112,53 @@ describe('ColossussspAdapter', function () {
         expect(placement.gpid).to.be.an('string');
       }
     });
+
+    it('Returns valid video data if array of bids is valid', function () {
+      const videoBid = {
+        ...bid,
+        params: {
+          placement_id: 0,
+          traffic: 'video',
+        },
+        mediaTypes: {
+          video: {
+            playerSize: [[300, 300]],
+            minduration: 5,
+            maxduration: 60
+          }
+        }
+      }
+      let serverRequest = spec.buildRequests([videoBid], bidderRequest);
+
+      let data = serverRequest.data;
+      expect(data).to.be.an('object');
+      expect(data).to.have.all.keys('deviceWidth', 'deviceHeight', 'language', 'secure', 'host', 'page', 'placements', 'ccpa', 'gdpr_consent', 'gdpr_require');
+      expect(data.deviceWidth).to.be.a('number');
+      expect(data.deviceHeight).to.be.a('number');
+      expect(data.language).to.be.a('string');
+      expect(data.secure).to.be.within(0, 1);
+      expect(data.host).to.be.a('string');
+      expect(data.page).to.be.a('string');
+      let placements = data['placements'];
+      for (let i = 0; i < placements.length; i++) {
+        let placement = placements[i];
+        expect(placement).to.have.all.keys('placementId', 'groupId', 'eids', 'bidId', 'traffic', 'schain', 'floor', 'gpid', 'sizes',
+          'playerSize', 'minduration', 'maxduration', 'mimes', 'protocols', 'startdelay', 'placement', 'skip', 'skipafter',
+          'minbitrate', 'maxbitrate', 'delivery', 'playbackmethod', 'api', 'linearity'
+        );
+        expect(placement.schain).to.be.an('object')
+        expect(placement.placementId).to.be.a('number');
+        expect(placement.bidId).to.be.a('string');
+        expect(placement.traffic).to.be.a('string');
+        expect(placement.floor).to.be.an('object');
+        expect(placement.gpid).to.be.an('string');
+        expect(placement.sizes).to.be.an('array');
+        expect(placement.playerSize).to.be.an('array');
+        expect(placement.minduration).to.be.an('number');
+        expect(placement.maxduration).to.be.an('number');
+      }
+    });
+
     it('Returns empty data if no valid requests are passed', function () {
       serverRequest = spec.buildRequests([], bidderRequest);
       let data = serverRequest.data;
@@ -187,6 +238,49 @@ describe('ColossussspAdapter', function () {
         expect(serverResponses).to.be.an('array').that.is.empty;
       });
     });
+
+    let videoResObject = {
+      body: [{
+        requestId: '123',
+        mediaType: 'video',
+        cpm: 0.3,
+        width: 320,
+        height: 50,
+        vastUrl: '<XML>',
+        ttl: 1000,
+        creativeId: '123asd',
+        netRevenue: true,
+        currency: 'USD',
+        meta: {
+          advertiserDomains: ['google.com'],
+          advertiserId: 1234
+        }
+      }]
+    };
+    let videoServerResponses = spec.interpretResponse(videoResObject);
+    it('Returns an array of valid server video responses if response object is valid', function () {
+      expect(videoServerResponses).to.be.an('array').that.is.not.empty;
+      for (let i = 0; i < videoServerResponses.length; i++) {
+        let dataItem = videoServerResponses[i];
+        expect(dataItem).to.have.all.keys('requestId', 'cpm', 'width', 'height', 'vastUrl', 'ttl', 'creativeId',
+          'netRevenue', 'currency', 'mediaType', 'meta');
+        expect(dataItem.requestId).to.be.a('string');
+        expect(dataItem.cpm).to.be.a('number');
+        expect(dataItem.width).to.be.a('number');
+        expect(dataItem.height).to.be.a('number');
+        expect(dataItem.vastUrl).to.be.a('string');
+        expect(dataItem.ttl).to.be.a('number');
+        expect(dataItem.creativeId).to.be.a('string');
+        expect(dataItem.netRevenue).to.be.a('boolean');
+        expect(dataItem.currency).to.be.a('string');
+        expect(dataItem.mediaType).to.be.a('string');
+        expect(dataItem.meta).to.be.an('object').that.has.any.key('advertiserDomains');
+      }
+      it('Returns an empty array if invalid response is passed', function () {
+        videoServerResponses = spec.interpretResponse('invalid_response');
+        expect(videoServerResponses).to.be.an('array').that.is.empty;
+      });
+    });
   });
 
   describe('onBidWon', function () {
@@ -199,13 +293,13 @@ describe('ColossussspAdapter', function () {
   })
 
   describe('getUserSyncs', function () {
-    let userSync = spec.getUserSyncs({}, {}, {}, {});
+    let userSync = spec.getUserSyncs({}, {}, { consentString: 'xxx', gdprApplies: 1 }, { consentString: '1YN-' });
     it('Returns valid URL and type', function () {
       expect(userSync).to.be.an('array').with.lengthOf(1);
       expect(userSync[0].type).to.exist;
       expect(userSync[0].url).to.exist;
       expect(userSync[0].type).to.be.equal('hms.gif');
-      expect(userSync[0].url).to.be.equal('https://sync.colossusssp.com/hms.gif?pbjs=1&coppa=0');
+      expect(userSync[0].url).to.be.equal('https://sync.colossusssp.com/hms.gif?pbjs=1&gdpr=0&gdpr_consent=xxx&ccpa_consent=1YN-&coppa=0');
     });
   });
 });
diff --git a/test/spec/modules/consentManagementUsp_spec.js b/test/spec/modules/consentManagementUsp_spec.js
index 32fd2ddb2e2..a2b1e22ed35 100644
--- a/test/spec/modules/consentManagementUsp_spec.js
+++ b/test/spec/modules/consentManagementUsp_spec.js
@@ -140,6 +140,7 @@ describe('consentManagement', function () {
         setConsentConfig(staticConfig);
         expect(consentAPI).to.be.equal('static');
         expect(consentTimeout).to.be.equal(0); // should always return without a timeout when config is used
+        expect(uspDataHandler.getConsentData()).to.eql(staticConfig.usp.consentData.getUSPData.uspString)
         expect(staticConsentData.usPrivacy).to.be.equal(staticConfig.usp.consentData.getUSPData.uspString);
       });
     });
diff --git a/test/spec/modules/consentManagement_spec.js b/test/spec/modules/consentManagement_spec.js
index 712e311e433..b0cd0197f8b 100644
--- a/test/spec/modules/consentManagement_spec.js
+++ b/test/spec/modules/consentManagement_spec.js
@@ -281,6 +281,9 @@ describe('consentManagement', function () {
           definedInConfig: true
         });
         expect(gdprScope).to.be.equal(false);
+        const consent = gdprDataHandler.getConsentData();
+        expect(consent.consentString).to.eql(staticConfig.consentData.getTCData.tcString);
+        expect(consent.vendorData).to.eql(staticConfig.consentData.getTCData);
         expect(staticConsentData).to.be.equal(staticConfig.consentData);
       });
     });
@@ -299,6 +302,14 @@ describe('consentManagement', function () {
       allowAuctionWithoutConsent: true
     };
 
+    const staticConfig = {
+      cmpApi: 'static',
+      timeout: 7500,
+      consentData: {
+        getTCData: {}
+      }
+    }
+
     let didHookReturn;
 
     afterEach(function () {
@@ -357,6 +368,17 @@ describe('consentManagement', function () {
         expect(consent).to.be.null;
         expect(gdprDataHandler.ready).to.be.true;
       });
+
+      it('should not trip when adUnits have no size', () => {
+        setConsentConfig(staticConfig);
+        let ran = false;
+        requestBidsHook(() => {
+          ran = true;
+        }, {adUnits: [{code: 'test', mediaTypes: {video: {}}}]});
+        return gdprDataHandler.promise.then(() => {
+          expect(ran).to.be.true;
+        });
+      })
     });
 
     describe('already known consentData:', function () {
diff --git a/test/spec/modules/e_volutionBidAdapter_spec.js b/test/spec/modules/e_volutionBidAdapter_spec.js
index 1f60edda0ef..d488048060a 100644
--- a/test/spec/modules/e_volutionBidAdapter_spec.js
+++ b/test/spec/modules/e_volutionBidAdapter_spec.js
@@ -2,7 +2,7 @@ import {expect} from 'chai';
 import {spec} from '../../../modules/e_volutionBidAdapter.js';
 
 describe('EvolutionTechBidAdapter', function () {
-  let bid = {
+  let bids = [{
     bidId: '23fhj33i987f',
     bidder: 'e_volution',
     params: {
@@ -12,21 +12,55 @@ describe('EvolutionTechBidAdapter', function () {
       banner: {
         sizes: [[300, 250]],
       }
+    },
+    userId: {
+      id5id: 'id5id'
+    }
+  }, {
+    bidId: '23fhj33i987f',
+    bidder: 'e_volution',
+    params: {
+      placementId: 0
+    },
+    mediaTypes: {
+      video: {
+        playerSize: [300, 250]
+      }
+    },
+    userId: {
+      id5id: 'id5id'
+    }
+  }, {
+    bidId: '23fhj33i987f',
+    bidder: 'e_volution',
+    params: {
+      placementId: 0
+    },
+    mediaTypes: {
+      native: {}
+    },
+    userId: {
+      id5id: 'id5id'
     }
+  }];
+
+  const bidderRequest = {
+    uspConsent: 'uspConsent',
+    gdprConsent: 'gdprConsent'
   };
 
   describe('isBidRequestValid', function () {
     it('Should return true if there are bidId, params and placementId parameters present', function () {
-      expect(spec.isBidRequestValid(bid)).to.be.true;
+      expect(spec.isBidRequestValid(bids[0])).to.be.true;
     });
     it('Should return false if at least one of parameters is not present', function () {
-      delete bid.params.placementId;
-      expect(spec.isBidRequestValid(bid)).to.be.false;
+      delete bids[0].params.placementId;
+      expect(spec.isBidRequestValid(bids[0])).to.be.false;
     });
   });
 
   describe('buildRequests', function () {
-    let serverRequest = spec.buildRequests([bid]);
+    let serverRequest = spec.buildRequests(bids, bidderRequest);
     it('Creates a ServerRequest object with method, URL and data', function () {
       expect(serverRequest).to.exist;
       expect(serverRequest.method).to.exist;
@@ -42,18 +76,35 @@ describe('EvolutionTechBidAdapter', function () {
     it('Returns valid data if array of bids is valid', function () {
       let data = serverRequest.data;
       expect(data).to.be.an('object');
-      expect(data).to.have.all.keys('deviceWidth', 'deviceHeight', 'language', 'secure', 'host', 'page', 'placements');
+      expect(data).to.have.all.keys('deviceWidth', 'deviceHeight', 'language', 'secure', 'host', 'page', 'placements', 'ccpa', 'gdpr');
       expect(data.deviceWidth).to.be.a('number');
       expect(data.deviceHeight).to.be.a('number');
       expect(data.language).to.be.a('string');
       expect(data.secure).to.be.within(0, 1);
       expect(data.host).to.be.a('string');
       expect(data.page).to.be.a('string');
+      expect(data.ccpa).to.be.equal('uspConsent');
+      expect(data.gdpr).to.be.equal('gdprConsent');
+
       let placement = data['placements'][0];
-      expect(placement).to.have.keys('placementId', 'bidId', 'traffic', 'sizes', 'bidfloor');
+      expect(placement).to.have.keys('placementId', 'bidId', 'traffic', 'sizes', 'bidfloor', 'eids');
       expect(placement.placementId).to.equal(0);
       expect(placement.bidId).to.equal('23fhj33i987f');
       expect(placement.traffic).to.equal('banner');
+
+      placement = data['placements'][1];
+      expect(placement).to.have.keys('placementId', 'bidId', 'traffic', 'bidfloor', 'eids', 'wPlayer', 'hPlayer',
+        'minduration', 'maxduration', 'mimes', 'protocols', 'startdelay', 'placement', 'skip', 'skipafter', 'minbitrate',
+        'maxbitrate', 'delivery', 'playbackmethod', 'api', 'linearity');
+      expect(placement.placementId).to.equal(0);
+      expect(placement.bidId).to.equal('23fhj33i987f');
+      expect(placement.traffic).to.equal('video');
+
+      placement = data['placements'][2];
+      expect(placement).to.have.keys('placementId', 'bidId', 'traffic', 'bidfloor', 'eids', 'native');
+      expect(placement.placementId).to.equal(0);
+      expect(placement.bidId).to.equal('23fhj33i987f');
+      expect(placement.traffic).to.equal('native');
     });
     it('Returns empty data if no valid requests are passed', function () {
       serverRequest = spec.buildRequests([]);
@@ -76,7 +127,9 @@ describe('EvolutionTechBidAdapter', function () {
           netRevenue: true,
           currency: 'USD',
           dealId: '1',
-          meta: {}
+          meta: {
+            adomain: [ 'example.com' ]
+          }
         }]
       };
       let bannerResponses = spec.interpretResponse(banner);
@@ -106,7 +159,9 @@ describe('EvolutionTechBidAdapter', function () {
           netRevenue: true,
           currency: 'USD',
           dealId: '1',
-          meta: {}
+          meta: {
+            adomain: [ 'example.com' ]
+          }
         }]
       };
       let videoResponses = spec.interpretResponse(video);
@@ -139,7 +194,9 @@ describe('EvolutionTechBidAdapter', function () {
           creativeId: '2',
           netRevenue: true,
           currency: 'USD',
-          meta: {}
+          meta: {
+            adomain: [ 'example.com' ]
+          }
         }]
       };
       let nativeResponses = spec.interpretResponse(native);
diff --git a/test/spec/modules/eplanningBidAdapter_spec.js b/test/spec/modules/eplanningBidAdapter_spec.js
index 117208f9d00..921c133c5b0 100644
--- a/test/spec/modules/eplanningBidAdapter_spec.js
+++ b/test/spec/modules/eplanningBidAdapter_spec.js
@@ -2,8 +2,10 @@ import { expect } from 'chai';
 import { spec, storage } from 'modules/eplanningBidAdapter.js';
 import { newBidder } from 'src/adapters/bidderFactory.js';
 import { config } from 'src/config.js';
-import { init } from 'modules/userId/index.js';
+import {init, getIds} from 'modules/userId/index.js';
 import * as utils from 'src/utils.js';
+import {hook} from '../../../src/hook.js';
+import {getGlobal} from '../../../src/prebidGlobal.js';
 
 describe('E-Planning Adapter', function () {
   const adapter = newBidder('spec');
@@ -305,6 +307,10 @@ describe('E-Planning Adapter', function () {
     uspConsent: 'consentCcpa'
   };
 
+  before(() => {
+    hook.ready();
+  });
+
   describe('inherited functions', function () {
     it('exists and is a function', function () {
       expect(adapter.callBids).to.exist.and.to.be.a('function');
@@ -954,17 +960,22 @@ describe('E-Planning Adapter', function () {
     });
   });
   describe('Send eids', function() {
+    let sandbox;
+    beforeEach(() => {
+      sandbox = sinon.sandbox.create();
+      // TODO: bid adapters should look at request data, not call getGlobal().getUserIds
+      sandbox.stub(getGlobal(), 'getUserIds').callsFake(() => ({
+        pubcid: 'c29cb2ae-769d-42f6-891a-f53cadee823d',
+        tdid: 'D6885E90-2A7A-4E0F-87CB-7734ED1B99A3',
+        id5id: { uid: 'ID5-ZHMOL_IfFSt7_lVYX8rBZc6GH3XMWyPQOBUfr4bm0g!', ext: { linkType: 1 } }
+      }))
+    });
+
+    afterEach(() => {
+      sandbox.restore();
+    })
+
     it('should add eids to the request', function() {
-      init(config);
-      config.setConfig({
-        userSync: {
-          userIds: [
-            { name: 'id5Id', value: { 'id5id': { uid: 'ID5-ZHMOL_IfFSt7_lVYX8rBZc6GH3XMWyPQOBUfr4bm0g!', ext: { linkType: 1 } } } },
-            { name: 'pubCommonId', value: {'pubcid': 'c29cb2ae-769d-42f6-891a-f53cadee823d'} },
-            { name: 'unifiedId', value: {'tdid': 'D6885E90-2A7A-4E0F-87CB-7734ED1B99A3'} }
-          ]
-        }
-      });
       let bidRequests = [validBidView];
       const expected_id5id = encodeURIComponent(JSON.stringify({ uid: 'ID5-ZHMOL_IfFSt7_lVYX8rBZc6GH3XMWyPQOBUfr4bm0g!', ext: { linkType: 1 } }));
       const request = spec.buildRequests(bidRequests, bidderRequest);
diff --git a/test/spec/modules/ftrackIdSystem_spec.js b/test/spec/modules/ftrackIdSystem_spec.js
index 69d66d75bb1..b0843ebb99e 100644
--- a/test/spec/modules/ftrackIdSystem_spec.js
+++ b/test/spec/modules/ftrackIdSystem_spec.js
@@ -8,7 +8,11 @@ let server;
 let configMock = {
   name: 'ftrack',
   params: {
-    url: 'https://d9.flashtalking.com/d9core'
+    url: 'https://d9.flashtalking.com/d9core',
+    ids: {
+      'device id': true,
+      'single device id': true
+    }
   },
   storage: {
     name: 'ftrackId',
@@ -171,6 +175,76 @@ describe('FTRACK ID System', () => {
       appendChildStub.restore();
     });
 
+    describe(`should use the "ids" setting in the config:`, () => {
+      it(`should use default IDs if config.params.id is not populated`, () => {
+        let configMock1 = JSON.parse(JSON.stringify(configMock));
+        delete configMock1.params.ids;
+        ftrackIdSubmodule.getId(configMock1, null, null).callback();
+
+        expect(window.D9r).to.have.property('DeviceID', true);
+        expect(window.D9r).to.have.property('SingleDeviceID', true);
+        expect(window.D9r).to.not.have.property('HHID');
+      });
+
+      describe(`should use correct ID settings if config.params.id is populated`, () => {
+        it(`- any ID set as strings should not be added to window.D9r`, () => {
+          let configMock1 = JSON.parse(JSON.stringify(configMock));
+          configMock1.params.ids['device id'] = 'test device ID';
+          configMock1.params.ids['single device id'] = 'test single device ID';
+          configMock1.params.ids['household id'] = 'test household ID';
+          ftrackIdSubmodule.getId(configMock1, null, null).callback();
+
+          expect(window.D9r).to.not.have.property('DeviceID');
+          expect(window.D9r).to.not.have.property('SingleDeviceID');
+          expect(window.D9r).to.not.have.property('HHID');
+        })
+
+        it(`- any ID set to false should not be added to window.D9r`, () => {
+          let configMock1 = JSON.parse(JSON.stringify(configMock));
+          configMock1.params.ids['device id'] = false;
+          configMock1.params.ids['single device id'] = false;
+          configMock1.params.ids['household id'] = false;
+          ftrackIdSubmodule.getId(configMock1, null, null).callback();
+
+          expect(window.D9r).to.not.have.property('DeviceID');
+          expect(window.D9r).to.not.have.property('SingleDeviceID');
+          expect(window.D9r).to.not.have.property('HHID');
+        });
+
+        it(`- only device id`, () => {
+          let configMock1 = JSON.parse(JSON.stringify(configMock));
+          delete configMock1.params.ids['single device id'];
+          ftrackIdSubmodule.getId(configMock1, null, null).callback();
+
+          expect(window.D9r).to.have.property('DeviceID', true);
+          expect(window.D9r).to.not.have.property('SingleDeviceID');
+          expect(window.D9r).to.not.have.property('HHID');
+        });
+
+        it(`- only single device id`, () => {
+          let configMock1 = JSON.parse(JSON.stringify(configMock));
+          delete configMock1.params.ids['device id'];
+          ftrackIdSubmodule.getId(configMock1, null, null).callback();
+
+          expect(window.D9r).to.not.have.property('DeviceID');
+          expect(window.D9r).to.have.property('SingleDeviceID', true);
+          expect(window.D9r).to.not.have.property('HHID');
+        });
+
+        it(`- only household ID`, () => {
+          let configMock1 = JSON.parse(JSON.stringify(configMock));
+          delete configMock1.params.ids['device id'];
+          delete configMock1.params.ids['single device id'];
+          configMock1.params.ids['household id'] = true;
+          ftrackIdSubmodule.getId(configMock1, null, null).callback();
+
+          expect(window.D9r).to.not.have.property('DeviceID');
+          expect(window.D9r).to.not.have.property('SingleDeviceID');
+          expect(window.D9r).to.have.property('HHID', true);
+        });
+      });
+    })
+
     it(`should populate localstorage and return the IDS (end-to-end test)`, () => {
       let ftrackId,
         ftrackIdExp,
diff --git a/test/spec/modules/id5IdSystem_spec.js b/test/spec/modules/id5IdSystem_spec.js
index 02020fc2d3a..74c2b053ce1 100644
--- a/test/spec/modules/id5IdSystem_spec.js
+++ b/test/spec/modules/id5IdSystem_spec.js
@@ -1,21 +1,23 @@
 import {
-  id5IdSubmodule,
-  ID5_STORAGE_NAME,
-  ID5_PRIVACY_STORAGE_NAME,
-  getFromLocalStorage,
-  storeInLocalStorage,
   expDaysStr,
-  nbCacheName,
+  getFromLocalStorage,
   getNbFromCache,
+  ID5_PRIVACY_STORAGE_NAME,
+  ID5_STORAGE_NAME,
+  id5IdSubmodule,
+  nbCacheName,
+  storeInLocalStorage,
   storeNbInCache,
-  isInControlGroup
 } from 'modules/id5IdSystem.js';
-import { init, requestBidsHook, setSubmoduleRegistry, coreStorage } from 'modules/userId/index.js';
-import { config } from 'src/config.js';
-import { server } from 'test/mocks/xhr.js';
+import {coreStorage, init, requestBidsHook, setSubmoduleRegistry} from 'modules/userId/index.js';
+import {config} from 'src/config.js';
+import {server} from 'test/mocks/xhr.js';
 import * as events from 'src/events.js';
 import CONSTANTS from 'src/constants.json';
 import * as utils from 'src/utils.js';
+import 'src/prebid.js';
+import {hook} from '../../../src/hook.js';
+import {mockGdprConsent} from '../../helpers/consentData.js';
 
 let expect = require('chai').expect;
 
@@ -89,6 +91,10 @@ describe('ID5 ID System', function() {
     };
   }
 
+  before(() => {
+    hook.ready();
+  });
+
   describe('Check for valid publisher config', function() {
     it('should fail with invalid config', function() {
       // no config
@@ -308,8 +314,11 @@ describe('ID5 ID System', function() {
 
   describe('Request Bids Hook', function() {
     let adUnits;
+    let sandbox;
 
     beforeEach(function() {
+      sandbox = sinon.sandbox.create();
+      mockGdprConsent(sandbox);
       sinon.stub(events, 'getEvents').returns([]);
       coreStorage.removeDataFromLocalStorage(ID5_STORAGE_NAME);
       coreStorage.removeDataFromLocalStorage(`${ID5_STORAGE_NAME}_last`);
@@ -321,13 +330,14 @@ describe('ID5 ID System', function() {
       coreStorage.removeDataFromLocalStorage(ID5_STORAGE_NAME);
       coreStorage.removeDataFromLocalStorage(`${ID5_STORAGE_NAME}_last`);
       coreStorage.removeDataFromLocalStorage(ID5_NB_STORAGE_NAME);
+      sandbox.restore();
     });
 
     it('should add stored ID from cache to bids', function (done) {
       storeInLocalStorage(ID5_STORAGE_NAME, JSON.stringify(ID5_STORED_OBJ), 1);
 
-      setSubmoduleRegistry([id5IdSubmodule]);
       init(config);
+      setSubmoduleRegistry([id5IdSubmodule]);
       config.setConfig(getFetchLocalStorageConfig());
 
       requestBidsHook(function () {
@@ -352,8 +362,8 @@ describe('ID5 ID System', function() {
     });
 
     it('should add config value ID to bids', function (done) {
-      setSubmoduleRegistry([id5IdSubmodule]);
       init(config);
+      setSubmoduleRegistry([id5IdSubmodule]);
       config.setConfig(getValueConfig(ID5_STORED_ID));
 
       requestBidsHook(function () {
@@ -371,32 +381,32 @@ describe('ID5 ID System', function() {
       }, { adUnits });
     });
 
-    it('should set nb=1 in cache when no stored nb value exists and cached ID', function () {
+    it('should set nb=1 in cache when no stored nb value exists and cached ID', function (done) {
       storeInLocalStorage(ID5_STORAGE_NAME, JSON.stringify(ID5_STORED_OBJ), 1);
       coreStorage.removeDataFromLocalStorage(ID5_NB_STORAGE_NAME);
 
-      setSubmoduleRegistry([id5IdSubmodule]);
       init(config);
+      setSubmoduleRegistry([id5IdSubmodule]);
       config.setConfig(getFetchLocalStorageConfig());
 
-      let innerAdUnits;
-      requestBidsHook((adUnitConfig) => { innerAdUnits = adUnitConfig.adUnits }, {adUnits});
-
-      expect(getNbFromCache(ID5_TEST_PARTNER_ID)).to.be.eq(1);
+      requestBidsHook((adUnitConfig) => {
+        expect(getNbFromCache(ID5_TEST_PARTNER_ID)).to.be.eq(1);
+        done()
+      }, {adUnits});
     });
 
-    it('should increment nb in cache when stored nb value exists and cached ID', function () {
+    it('should increment nb in cache when stored nb value exists and cached ID', function (done) {
       storeInLocalStorage(ID5_STORAGE_NAME, JSON.stringify(ID5_STORED_OBJ), 1);
       storeNbInCache(ID5_TEST_PARTNER_ID, 1);
 
-      setSubmoduleRegistry([id5IdSubmodule]);
       init(config);
+      setSubmoduleRegistry([id5IdSubmodule]);
       config.setConfig(getFetchLocalStorageConfig());
 
-      let innerAdUnits;
-      requestBidsHook((adUnitConfig) => { innerAdUnits = adUnitConfig.adUnits }, {adUnits});
-
-      expect(getNbFromCache(ID5_TEST_PARTNER_ID)).to.be.eq(2);
+      requestBidsHook(() => {
+        expect(getNbFromCache(ID5_TEST_PARTNER_ID)).to.be.eq(2);
+        done()
+      }, {adUnits});
     });
 
     it('should call ID5 servers with signature and incremented nb post auction if refresh needed', function () {
@@ -407,29 +417,32 @@ describe('ID5 ID System', function() {
       let id5Config = getFetchLocalStorageConfig();
       id5Config.userSync.userIds[0].storage.refreshInSeconds = 2;
 
-      setSubmoduleRegistry([id5IdSubmodule]);
       init(config);
+      setSubmoduleRegistry([id5IdSubmodule]);
       config.setConfig(id5Config);
 
-      let innerAdUnits;
-      requestBidsHook((adUnitConfig) => { innerAdUnits = adUnitConfig.adUnits }, {adUnits});
-
-      expect(getNbFromCache(ID5_TEST_PARTNER_ID)).to.be.eq(2);
-
-      expect(server.requests).to.be.empty;
-      events.emit(CONSTANTS.EVENTS.AUCTION_END, {});
-
-      let request = server.requests[0];
-      let requestBody = JSON.parse(request.requestBody);
-      expect(request.url).to.contain(ID5_ENDPOINT);
-      expect(requestBody.s).to.eq(ID5_STORED_SIGNATURE);
-      expect(requestBody.nbPage).to.eq(2);
-
-      const responseHeader = { 'Content-Type': 'application/json' };
-      request.respond(200, responseHeader, JSON.stringify(ID5_JSON_RESPONSE));
-
-      expect(decodeURIComponent(getFromLocalStorage(ID5_STORAGE_NAME))).to.be.eq(JSON.stringify(ID5_JSON_RESPONSE));
-      expect(getNbFromCache(ID5_TEST_PARTNER_ID)).to.be.eq(0);
+      return new Promise((resolve) => {
+        requestBidsHook(() => {
+          resolve()
+        }, {adUnits});
+      }).then(() => {
+        expect(getNbFromCache(ID5_TEST_PARTNER_ID)).to.be.eq(2);
+        expect(server.requests).to.be.empty;
+        events.emit(CONSTANTS.EVENTS.AUCTION_END, {});
+        return new Promise((resolve) => setTimeout(resolve))
+      }).then(() => {
+        let request = server.requests[0];
+        let requestBody = JSON.parse(request.requestBody);
+        expect(request.url).to.contain(ID5_ENDPOINT);
+        expect(requestBody.s).to.eq(ID5_STORED_SIGNATURE);
+        expect(requestBody.nbPage).to.eq(2);
+
+        const responseHeader = { 'Content-Type': 'application/json' };
+        request.respond(200, responseHeader, JSON.stringify(ID5_JSON_RESPONSE));
+
+        expect(decodeURIComponent(getFromLocalStorage(ID5_STORAGE_NAME))).to.be.eq(JSON.stringify(ID5_JSON_RESPONSE));
+        expect(getNbFromCache(ID5_TEST_PARTNER_ID)).to.be.eq(0);
+      })
     });
   });
 
diff --git a/test/spec/modules/idImportLibrary_spec.js b/test/spec/modules/idImportLibrary_spec.js
index 9f7c0363571..d5b3e32546d 100644
--- a/test/spec/modules/idImportLibrary_spec.js
+++ b/test/spec/modules/idImportLibrary_spec.js
@@ -1,6 +1,9 @@
+import {init} from 'modules/userId/index.js';
 import * as utils from 'src/utils.js';
 import * as idImportlibrary from 'modules/idImportLibrary.js';
-
+import {getGlobal} from '../../../src/prebidGlobal.js';
+import {config} from 'src/config.js';
+import {hook} from '../../../src/hook.js';
 var expect = require('chai').expect;
 
 const mockMutationObserver = {
@@ -15,6 +18,11 @@ describe('IdImportLibrary Tests', function () {
   let clock;
   let fn = sinon.spy();
 
+  before(() => {
+    hook.ready();
+    init(config);
+  });
+
   beforeEach(function () {
     fakeServer = sinon.fakeServer.create();
     sinon.stub(utils, 'logInfo');
@@ -85,10 +93,10 @@ describe('IdImportLibrary Tests', function () {
     let refreshUserIdSpy;
     beforeEach(function() {
       let sandbox = sinon.createSandbox();
-      refreshUserIdSpy = sinon.spy(window.$$PREBID_GLOBAL$$, 'refreshUserIds');
+      refreshUserIdSpy = sinon.stub(getGlobal(), 'refreshUserIds');
       clock = sinon.useFakeTimers(1046952000000); // 2003-03-06T12:00:00Z
       mutationObserverStub = sinon.stub(window, 'MutationObserver').returns(mockMutationObserver);
-      userId = sandbox.stub(window.$$PREBID_GLOBAL$$, 'getUserIds').returns({id: {'MOCKID': '1111'}});
+      userId = sandbox.stub(getGlobal(), 'getUserIds').returns({id: {'MOCKID': '1111'}});
       fakeServer.respondWith('POST', 'URL', [200,
         {
           'Content-Type': 'application/json',
@@ -230,14 +238,14 @@ describe('IdImportLibrary Tests', function () {
       jsonSpy.restore();
       mutationObserverStub.restore();
     });
-    it('results with config inputscan without listner with no user ids ', function () {
+    it('results with config inputscan without listner with no user ids #1', function () {
       let config = { 'url': 'testUrl', 'inputscan': true, 'debounce': 0 }
       document.body.innerHTML = '<body><input  id="userid" value="test@test.com"></body>';
       idImportlibrary.setConfig(config);
       expect(config.inputscan).to.be.equal(true);
       expect(jsonSpy.calledOnce).to.equal(false);
     });
-    it('results with config inputscan without listner with no user ids ', function () {
+    it('results with config inputscan without listner with no user ids #2', function () {
       let config = { 'url': 'testUrl', 'inputscan': true, 'debounce': 0 }
       document.body.innerHTML = '<body><input  id="userid"></body>';
       idImportlibrary.setConfig(config);
diff --git a/test/spec/modules/idxIdSystem_spec.js b/test/spec/modules/idxIdSystem_spec.js
index 5cecc12c253..7d008ef0d28 100644
--- a/test/spec/modules/idxIdSystem_spec.js
+++ b/test/spec/modules/idxIdSystem_spec.js
@@ -3,6 +3,7 @@ import {find} from 'src/polyfill.js';
 import { config } from 'src/config.js';
 import { init, requestBidsHook, setSubmoduleRegistry } from 'modules/userId/index.js';
 import { storage, idxIdSubmodule } from 'modules/idxIdSystem.js';
+import {mockGdprConsent} from '../../helpers/consentData.js';
 
 const IDX_COOKIE_NAME = '_idx';
 const IDX_DUMMY_VALUE = 'idx value for testing';
@@ -85,15 +86,22 @@ describe('IDx ID System', () => {
 
   describe('requestBids hook', () => {
     let adUnits;
+    let sandbox;
 
     beforeEach(() => {
+      sandbox = sinon.sandbox.create();
+      mockGdprConsent(sandbox);
       adUnits = [getAdUnitMock()];
-      setSubmoduleRegistry([idxIdSubmodule]);
       init(config);
+      setSubmoduleRegistry([idxIdSubmodule]);
       config.setConfig(getConfigMock());
       getCookieStub.withArgs(IDX_COOKIE_NAME).returns(IDX_COOKIE_STORED);
     });
 
+    afterEach(() => {
+      sandbox.restore();
+    })
+
     it('when a stored IDx exists it is added to bids', (done) => {
       requestBidsHook(() => {
         adUnits.forEach(unit => {
diff --git a/test/spec/modules/mobfoxpbBidAdapter_spec.js b/test/spec/modules/mobfoxpbBidAdapter_spec.js
new file mode 100644
index 00000000000..766f8d1a848
--- /dev/null
+++ b/test/spec/modules/mobfoxpbBidAdapter_spec.js
@@ -0,0 +1,307 @@
+import {expect} from 'chai';
+import {spec} from '../../../modules/mobfoxpbBidAdapter.js';
+import { BANNER, VIDEO, NATIVE } from '../../../src/mediaTypes.js';
+
+describe('MobfoxHBBidAdapter', function () {
+  const bid = {
+    bidId: '23fhj33i987f',
+    bidder: 'mobfoxpb',
+    mediaTypes: {
+      [BANNER]: {
+        sizes: [[300, 250]]
+      }
+    },
+    params: {
+      placementId: 783,
+      traffic: BANNER
+    }
+  };
+
+  const bidderRequest = {
+    refererInfo: {
+      referer: 'test.com'
+    }
+  };
+
+  describe('isBidRequestValid', function () {
+    it('Should return true if there are bidId, params and key parameters present', function () {
+      expect(spec.isBidRequestValid(bid)).to.be.true;
+    });
+    it('Should return false if at least one of parameters is not present', function () {
+      delete bid.params.placementId;
+      expect(spec.isBidRequestValid(bid)).to.be.false;
+    });
+  });
+
+  describe('buildRequests', function () {
+    let serverRequest = spec.buildRequests([bid], bidderRequest);
+    it('Creates a ServerRequest object with method, URL and data', function () {
+      expect(serverRequest).to.exist;
+      expect(serverRequest.method).to.exist;
+      expect(serverRequest.url).to.exist;
+      expect(serverRequest.data).to.exist;
+    });
+    it('Returns POST method', function () {
+      expect(serverRequest.method).to.equal('POST');
+    });
+    it('Returns valid URL', function () {
+      expect(serverRequest.url).to.equal('https://bes.mobfox.com/pbjs');
+    });
+    it('Returns valid data if array of bids is valid', function () {
+      let data = serverRequest.data;
+      expect(data).to.be.an('object');
+      expect(data).to.have.all.keys('deviceWidth', 'deviceHeight', 'language', 'secure', 'host', 'page', 'placements');
+      expect(data.deviceWidth).to.be.a('number');
+      expect(data.deviceHeight).to.be.a('number');
+      expect(data.language).to.be.a('string');
+      expect(data.secure).to.be.within(0, 1);
+      expect(data.host).to.be.a('string');
+      expect(data.page).to.be.a('string');
+      expect(data.gdpr).to.not.exist;
+      expect(data.ccpa).to.not.exist;
+      let placement = data['placements'][0];
+      expect(placement).to.have.keys('placementId', 'bidId', 'traffic', 'sizes', 'schain', 'bidfloor');
+      expect(placement.placementId).to.equal(783);
+      expect(placement.bidId).to.equal('23fhj33i987f');
+      expect(placement.traffic).to.equal(BANNER);
+      expect(placement.schain).to.be.an('object');
+      expect(placement.sizes).to.be.an('array');
+      expect(placement.bidfloor).to.equal(0);
+    });
+
+    it('Returns valid data for mediatype video', function () {
+      const playerSize = [300, 300];
+      bid.mediaTypes = {};
+      bid.params.traffic = VIDEO;
+      bid.mediaTypes[VIDEO] = {
+        playerSize
+      };
+      serverRequest = spec.buildRequests([bid], bidderRequest);
+      let data = serverRequest.data;
+      expect(data).to.be.an('object');
+      let placement = data['placements'][0];
+      expect(placement).to.be.an('object');
+      expect(placement).to.have.keys('placementId', 'bidId', 'traffic', 'playerSize', 'wPlayer', 'hPlayer', 'schain', 'bidfloor',
+        'minduration', 'maxduration', 'mimes', 'protocols', 'startdelay', 'placement',
+        'skip', 'skipafter', 'minbitrate', 'maxbitrate', 'delivery', 'playbackmethod', 'api', 'linearity');
+      expect(placement.traffic).to.equal(VIDEO);
+      expect(placement.wPlayer).to.equal(playerSize[0]);
+      expect(placement.hPlayer).to.equal(playerSize[1]);
+    });
+
+    it('Returns valid data for mediatype native', function () {
+      const native = {
+        title: {
+          required: true
+        },
+        body: {
+          required: true
+        },
+        icon: {
+          required: true,
+          size: [64, 64]
+        }
+      };
+
+      bid.mediaTypes = {};
+      bid.params.traffic = NATIVE;
+      bid.mediaTypes[NATIVE] = native;
+      serverRequest = spec.buildRequests([bid], bidderRequest);
+      let data = serverRequest.data;
+      expect(data).to.be.an('object');
+      let placement = data['placements'][0];
+      expect(placement).to.be.an('object');
+      expect(placement).to.have.keys('placementId', 'bidId', 'traffic', 'native', 'schain', 'bidfloor');
+      expect(placement.traffic).to.equal(NATIVE);
+      expect(placement.native).to.equal(native);
+    });
+
+    it('Returns data with gdprConsent and without uspConsent', function () {
+      bidderRequest.gdprConsent = 'test';
+      serverRequest = spec.buildRequests([bid], bidderRequest);
+      let data = serverRequest.data;
+      expect(data.gdpr).to.exist;
+      expect(data.gdpr).to.be.a('string');
+      expect(data.gdpr).to.equal(bidderRequest.gdprConsent);
+      expect(data.ccpa).to.not.exist;
+      delete bidderRequest.gdprConsent;
+    });
+
+    it('Returns data with uspConsent and without gdprConsent', function () {
+      bidderRequest.uspConsent = 'test';
+      serverRequest = spec.buildRequests([bid], bidderRequest);
+      let data = serverRequest.data;
+      expect(data.ccpa).to.exist;
+      expect(data.ccpa).to.be.a('string');
+      expect(data.ccpa).to.equal(bidderRequest.uspConsent);
+      expect(data.gdpr).to.not.exist;
+    });
+
+    it('Returns empty data if no valid requests are passed', function () {
+      serverRequest = spec.buildRequests([]);
+      let data = serverRequest.data;
+      expect(data.placements).to.be.an('array').that.is.empty;
+    });
+  });
+  describe('interpretResponse', function () {
+    it('Should interpret banner response', function () {
+      const banner = {
+        body: [{
+          mediaType: 'banner',
+          width: 300,
+          height: 250,
+          cpm: 0.4,
+          ad: 'Test',
+          requestId: '23fhj33i987f',
+          ttl: 120,
+          creativeId: '2',
+          netRevenue: true,
+          currency: 'USD',
+          dealId: '1'
+        }]
+      };
+      let bannerResponses = spec.interpretResponse(banner);
+      expect(bannerResponses).to.be.an('array').that.is.not.empty;
+      let dataItem = bannerResponses[0];
+      expect(dataItem).to.have.all.keys('requestId', 'cpm', 'width', 'height', 'ad', 'ttl', 'creativeId',
+        'netRevenue', 'currency', 'dealId', 'mediaType', 'meta');
+      expect(dataItem.requestId).to.equal('23fhj33i987f');
+      expect(dataItem.cpm).to.equal(0.4);
+      expect(dataItem.width).to.equal(300);
+      expect(dataItem.height).to.equal(250);
+      expect(dataItem.ad).to.equal('Test');
+      expect(dataItem.ttl).to.equal(120);
+      expect(dataItem.creativeId).to.equal('2');
+      expect(dataItem.netRevenue).to.be.true;
+      expect(dataItem.currency).to.equal('USD');
+    });
+    it('Should interpret video response', function () {
+      const video = {
+        body: [{
+          vastUrl: 'test.com',
+          mediaType: 'video',
+          cpm: 0.5,
+          requestId: '23fhj33i987f',
+          ttl: 120,
+          creativeId: '2',
+          netRevenue: true,
+          currency: 'USD',
+          dealId: '1'
+        }]
+      };
+      let videoResponses = spec.interpretResponse(video);
+      expect(videoResponses).to.be.an('array').that.is.not.empty;
+
+      let dataItem = videoResponses[0];
+      expect(dataItem).to.have.all.keys('requestId', 'cpm', 'vastUrl', 'ttl', 'creativeId',
+        'netRevenue', 'currency', 'dealId', 'mediaType', 'meta');
+      expect(dataItem.requestId).to.equal('23fhj33i987f');
+      expect(dataItem.cpm).to.equal(0.5);
+      expect(dataItem.vastUrl).to.equal('test.com');
+      expect(dataItem.ttl).to.equal(120);
+      expect(dataItem.creativeId).to.equal('2');
+      expect(dataItem.netRevenue).to.be.true;
+      expect(dataItem.currency).to.equal('USD');
+    });
+    it('Should interpret native response', function () {
+      const native = {
+        body: [{
+          mediaType: 'native',
+          native: {
+            clickUrl: 'test.com',
+            title: 'Test',
+            image: 'test.com',
+            impressionTrackers: ['test.com'],
+          },
+          ttl: 120,
+          cpm: 0.4,
+          requestId: '23fhj33i987f',
+          creativeId: '2',
+          netRevenue: true,
+          currency: 'USD',
+        }]
+      };
+      let nativeResponses = spec.interpretResponse(native);
+      expect(nativeResponses).to.be.an('array').that.is.not.empty;
+
+      let dataItem = nativeResponses[0];
+      expect(dataItem).to.have.keys('requestId', 'cpm', 'ttl', 'creativeId', 'netRevenue', 'currency', 'mediaType', 'native', 'meta');
+      expect(dataItem.native).to.have.keys('clickUrl', 'impressionTrackers', 'title', 'image')
+      expect(dataItem.requestId).to.equal('23fhj33i987f');
+      expect(dataItem.cpm).to.equal(0.4);
+      expect(dataItem.native.clickUrl).to.equal('test.com');
+      expect(dataItem.native.title).to.equal('Test');
+      expect(dataItem.native.image).to.equal('test.com');
+      expect(dataItem.native.impressionTrackers).to.be.an('array').that.is.not.empty;
+      expect(dataItem.native.impressionTrackers[0]).to.equal('test.com');
+      expect(dataItem.ttl).to.equal(120);
+      expect(dataItem.creativeId).to.equal('2');
+      expect(dataItem.netRevenue).to.be.true;
+      expect(dataItem.currency).to.equal('USD');
+    });
+    it('Should return an empty array if invalid banner response is passed', function () {
+      const invBanner = {
+        body: [{
+          width: 300,
+          cpm: 0.4,
+          ad: 'Test',
+          requestId: '23fhj33i987f',
+          ttl: 120,
+          creativeId: '2',
+          netRevenue: true,
+          currency: 'USD',
+          dealId: '1'
+        }]
+      };
+
+      let serverResponses = spec.interpretResponse(invBanner);
+      expect(serverResponses).to.be.an('array').that.is.empty;
+    });
+    it('Should return an empty array if invalid video response is passed', function () {
+      const invVideo = {
+        body: [{
+          mediaType: 'video',
+          cpm: 0.5,
+          requestId: '23fhj33i987f',
+          ttl: 120,
+          creativeId: '2',
+          netRevenue: true,
+          currency: 'USD',
+          dealId: '1'
+        }]
+      };
+      let serverResponses = spec.interpretResponse(invVideo);
+      expect(serverResponses).to.be.an('array').that.is.empty;
+    });
+    it('Should return an empty array if invalid native response is passed', function () {
+      const invNative = {
+        body: [{
+          mediaType: 'native',
+          clickUrl: 'test.com',
+          title: 'Test',
+          impressionTrackers: ['test.com'],
+          ttl: 120,
+          requestId: '23fhj33i987f',
+          creativeId: '2',
+          netRevenue: true,
+          currency: 'USD',
+        }]
+      };
+      let serverResponses = spec.interpretResponse(invNative);
+      expect(serverResponses).to.be.an('array').that.is.empty;
+    });
+    it('Should return an empty array if invalid response is passed', function () {
+      const invalid = {
+        body: [{
+          ttl: 120,
+          creativeId: '2',
+          netRevenue: true,
+          currency: 'USD',
+          dealId: '1'
+        }]
+      };
+      let serverResponses = spec.interpretResponse(invalid);
+      expect(serverResponses).to.be.an('array').that.is.empty;
+    });
+  });
+});
diff --git a/test/spec/modules/nexx360BidAdapter_spec.js b/test/spec/modules/nexx360BidAdapter_spec.js
index 3d5b2554cda..1a695e5f8b3 100644
--- a/test/spec/modules/nexx360BidAdapter_spec.js
+++ b/test/spec/modules/nexx360BidAdapter_spec.js
@@ -146,6 +146,37 @@ describe('Nexx360 bid adapter tests', function () {
       }]
     },
   };
+
+  it('We verify isBidRequestValid with uncorrect bidfloorCurrency', function() {
+    const bid = { params: {
+      'account': '1067',
+      'tagId': 'luvxjvgn',
+      'bidfloorCurrency': 'AAA',
+    }};
+    expect(spec.isBidRequestValid(bid)).to.be.equal(false);
+  });
+
+  it('We verify isBidRequestValid with uncorrect bidfloor', function() {
+    const bid = { params: {
+      'account': '1067',
+      'tagId': 'luvxjvgn',
+      'bidfloorCurrency': 'EUR',
+      'bidfloor': 'EUR',
+    }};
+    expect(spec.isBidRequestValid(bid)).to.be.equal(false);
+  });
+
+  it('We verify isBidRequestValid with uncorrect keywords', function() {
+    const bid = { params: {
+      'account': '1067',
+      'tagId': 'luvxjvgn',
+      'bidfloorCurrency': 'EUR',
+      'bidfloor': 0.8,
+      'keywords': 'test',
+    }};
+    expect(spec.isBidRequestValid(bid)).to.be.equal(false);
+  });
+
   it('Verify banner build request', function () {
     const request = spec.buildRequests(DISPLAY_BID_REQUEST, DEFAULT_OPTIONS);
     expect(request).to.have.property('url').and.to.equal('https://fast.nexx360.io/prebid');
@@ -162,6 +193,24 @@ describe('Nexx360 bid adapter tests', function () {
     expect(requestContent.adUnits[0]).to.have.property('auctionId').and.to.equal('05e0a3a1-9f57-41f6-bbcb-2ba9c9e3d2d5');
     expect(requestContent.adUnits[0]).to.have.property('mediatypes').exist;
     expect(requestContent.adUnits[0].mediatypes).to.have.property('banner').exist;
+    expect(requestContent.adUnits[0]).to.have.property('bidfloor').and.to.equal(0);
+    expect(requestContent.adUnits[0]).to.have.property('bidfloorCurrency').and.to.equal('USD');
+    expect(requestContent.adUnits[0]).to.have.property('keywords');
+    expect(requestContent.adUnits[0].keywords.length).to.be.eql(0);
+  });
+
+  it('We add bidfloor and keywords', function() {
+    const DISPLAY_BID_REQUEST_2 = [ ...DISPLAY_BID_REQUEST ];
+    DISPLAY_BID_REQUEST_2[0].params.keywords = { interest: 'cars' };
+    DISPLAY_BID_REQUEST_2[0].params.bidfloor = 2.1;
+    const request = spec.buildRequests(DISPLAY_BID_REQUEST, DEFAULT_OPTIONS);
+    const requestContent = JSON.parse(request.data);
+    expect(requestContent.adUnits[0]).to.have.property('bidfloor').and.to.equal(2.1);
+    expect(requestContent.adUnits[0]).to.have.property('bidfloorCurrency').and.to.equal('USD');
+    expect(requestContent.adUnits[0]).to.have.property('keywords');
+    expect(requestContent.adUnits[0].keywords.length).to.be.eql(1);
+    expect(requestContent.adUnits[0].keywords[0].key).to.be.eql('interest');
+    expect(requestContent.adUnits[0].keywords[0].value[0]).to.be.eql('cars');
   });
 
   it('Verify banner parse response', function () {
diff --git a/test/spec/modules/otmBidAdapter_spec.js b/test/spec/modules/otmBidAdapter_spec.js
index 6eb5768c3af..ce033d0fba5 100644
--- a/test/spec/modules/otmBidAdapter_spec.js
+++ b/test/spec/modules/otmBidAdapter_spec.js
@@ -2,7 +2,7 @@ import {expect} from 'chai';
 import {spec} from 'modules/otmBidAdapter';
 
 describe('otmBidAdapter', function () {
-  it('validate_pub_params', function () {
+  it('pub_params', function () {
     expect(spec.isBidRequestValid({
       bidder: 'otm',
       params: {
@@ -12,31 +12,52 @@ describe('otmBidAdapter', function () {
     })).to.equal(true);
   });
 
-  it('validate_generated_params', function () {
-    let bidRequestData = [{
+  it('generated_params common case', function () {
+    const bidRequestData = [{
       bidId: 'bid1234',
       bidder: 'otm',
       params: {
         tid: '123',
-        bidfloor: 20
+        bidfloor: 20,
+        domain: 'github.com'
       },
       sizes: [[240, 400]]
     }];
 
-    let request = spec.buildRequests(bidRequestData);
-    let req_data = request[0].data;
+    const request = spec.buildRequests(bidRequestData);
+    const req_data = request[0].data;
 
     expect(req_data.bidid).to.equal('bid1234');
+    expect(req_data.domain).to.equal('github.com');
+  });
+
+  it('generated_params should return top level origin as domain if not defined', function () {
+    const bidRequestData = [{
+      bidId: 'bid1234',
+      bidder: 'otm',
+      params: {
+        tid: '123',
+        bidfloor: 20
+      },
+      sizes: [[240, 400]]
+    }];
+
+    const bidderRequest = {refererInfo: {referer: `https://github.com:3000/`}}
+
+    const request = spec.buildRequests(bidRequestData, bidderRequest);
+    const req_data = request[0].data;
+
+    expect(req_data.domain).to.equal(`github.com:3000`);
   });
 
-  it('validate_response_params', function () {
-    let bidRequestData = {
+  it('response_params common case', function () {
+    const bidRequestData = {
       data: {
         bidId: 'bid1234'
       }
     };
 
-    let serverResponse = {
+    const serverResponse = {
       body: [
         {
           'auctionid': '3c6f8e22-541b-485c-9214-e974d9fb1b6f',
@@ -53,9 +74,9 @@ describe('otmBidAdapter', function () {
       ]
     };
 
-    let bids = spec.interpretResponse(serverResponse, bidRequestData);
+    const bids = spec.interpretResponse(serverResponse, bidRequestData);
     expect(bids).to.have.lengthOf(1);
-    let bid = bids[0];
+    const bid = bids[0];
     expect(bid.cpm).to.equal(847.097);
     expect(bid.currency).to.equal('RUB');
     expect(bid.width).to.equal(240);
diff --git a/test/spec/modules/parrableIdSystem_spec.js b/test/spec/modules/parrableIdSystem_spec.js
index 176ba70fbcb..a6e6185bbb2 100644
--- a/test/spec/modules/parrableIdSystem_spec.js
+++ b/test/spec/modules/parrableIdSystem_spec.js
@@ -8,6 +8,7 @@ import { uspDataHandler } from 'src/adapterManager.js';
 import { init, requestBidsHook, setSubmoduleRegistry } from 'modules/userId/index.js';
 import { parrableIdSubmodule } from 'modules/parrableIdSystem.js';
 import { server } from 'test/mocks/xhr.js';
+import {mockGdprConsent} from '../../helpers/consentData.js';
 
 const storage = newStorageManager();
 
@@ -639,18 +640,22 @@ describe('Parrable ID System', function() {
 
   describe('userId requestBids hook', function() {
     let adUnits;
+    let sandbox;
 
     beforeEach(function() {
+      sandbox = sinon.sandbox.create();
+      mockGdprConsent(sandbox);
       adUnits = [getAdUnitMock()];
       writeParrableCookie({ eid: P_COOKIE_EID, ibaOptout: true });
-      setSubmoduleRegistry([parrableIdSubmodule]);
       init(config);
+      setSubmoduleRegistry([parrableIdSubmodule]);
       config.setConfig(getConfigMock());
     });
 
     afterEach(function() {
       removeParrableCookie();
       storage.setCookie(P_COOKIE_NAME, '', EXPIRED_COOKIE_DATE);
+      sandbox.restore();
     });
 
     it('when a stored Parrable ID exists it is added to bids', function(done) {
diff --git a/test/spec/modules/prebidServerBidAdapter_spec.js b/test/spec/modules/prebidServerBidAdapter_spec.js
index a0c7903091c..895099a4748 100644
--- a/test/spec/modules/prebidServerBidAdapter_spec.js
+++ b/test/spec/modules/prebidServerBidAdapter_spec.js
@@ -18,6 +18,7 @@ import { decorateAdUnitsWithNativeParams } from '../../../src/native.js';
 import { auctionManager } from '../../../src/auctionManager.js';
 import { stubAuctionIndex } from '../../helpers/indexStub.js';
 import { registerBidder } from 'src/adapters/bidderFactory.js';
+import {getGlobal} from '../../../src/prebidGlobal.js';
 
 let CONFIG = {
   accountId: '1',
@@ -1038,6 +1039,205 @@ describe('S2S Adapter', function () {
           })
         ).to.be.true;
       });
+
+      it('should find the floor when not all bidderRequests contain it', () => {
+        config.setConfig({
+          s2sConfig: {
+            ...CONFIG,
+            bidders: ['b1', 'b2']
+          },
+        });
+        const bidderRequests = [
+          {
+            ...BID_REQUESTS[0],
+            bidderCode: 'b1',
+            bids: [{
+              bidder: 'b1',
+              bidId: 1,
+            }]
+          },
+          {
+            ...BID_REQUESTS[0],
+            bidderCode: 'b2',
+            bids: [{
+              bidder: 'b2',
+              bidId: 2,
+              getFloor: () => ({
+                currency: 'CUR',
+                floor: 123
+              })
+            }],
+          }
+        ];
+        const adUnits = [
+          {
+            code: 'au1',
+            transactionId: 't1',
+            mediaTypes: {
+              banner: {sizes: [1, 1]}
+            },
+            bids: [{bidder: 'b1', bid_id: 1}]
+          },
+          {
+            code: 'au2',
+            transactionId: 't2',
+            bids: [{bidder: 'b2', bid_id: 2}],
+            mediaTypes: {
+              banner: {sizes: [1, 1]}
+            }
+          }
+        ];
+        const s2sReq = {
+          ...REQUEST,
+          ad_units: adUnits
+        }
+
+        adapter.callBids(s2sReq, bidderRequests, addBidResponse, done, ajax);
+
+        const pbsReq = JSON.parse(server.requests[server.requests.length - 1].requestBody);
+        const [imp1, imp2] = pbsReq.imp;
+
+        expect(imp1.bidfloor).to.be.undefined;
+        expect(imp1.bidfloorcur).to.be.undefined;
+
+        expect(imp2.bidfloor).to.eql(123);
+        expect(imp2.bidfloorcur).to.eql('CUR');
+      });
+
+      describe('when different bids have different floors', () => {
+        let s2sReq;
+        beforeEach(() => {
+          config.setConfig({
+            s2sConfig: {
+              ...CONFIG,
+              bidders: ['b1', 'b2', 'b3']
+            },
+          });
+          BID_REQUESTS = [
+            {
+              ...BID_REQUESTS[0],
+              bidderCode: 'b2',
+              bids: [{
+                bidder: 'b2',
+                bidId: 2,
+                getFloor: () => ({
+                  currency: '1',
+                  floor: 2
+                })
+              }],
+            },
+            {
+              ...BID_REQUESTS[0],
+              bidderCode: 'b1',
+              bids: [{
+                bidder: 'b1',
+                bidId: 1,
+                getFloor: () => ({
+                  floor: 10,
+                  currency: '0.1'
+                })
+              }]
+            },
+            {
+              ...BID_REQUESTS[0],
+              bidderCode: 'b3',
+              bids: [{
+                bidder: 'b3',
+                bidId: 3,
+                getFloor: () => ({
+                  currency: '10',
+                  floor: 1
+                })
+              }],
+            }
+          ];
+          s2sReq = {
+            ...REQUEST,
+            ad_units: [
+              {
+                code: 'au1',
+                transactionId: 't1',
+                mediaTypes: {
+                  banner: {sizes: [1, 1]}
+                },
+                bids: [
+                  {bidder: 'b2', bid_id: 2},
+                  {bidder: 'b3', bid_id: 3},
+                  {bidder: 'b1', bid_id: 1},
+                ]
+              }
+            ]
+          };
+        });
+
+        Object.entries({
+          'cannot compute a floor': (bid) => { bid.getFloor = () => { throw new Error() } },
+          'does not set a floor': (bid) => { delete bid.getFloor; },
+        }).forEach(([t, updateBid]) => {
+          it(`should not set pricefloor if any one of them ${t}`, () => {
+            updateBid(BID_REQUESTS[1].bids[0]);
+            adapter.callBids(s2sReq, BID_REQUESTS, addBidResponse, done, ajax);
+            const pbsReq = JSON.parse(server.requests[server.requests.length - 1].requestBody);
+            expect(pbsReq.imp[0].bidfloor).to.be.undefined;
+            expect(pbsReq.imp[0].bidfloorcur).to.be.undefined;
+          });
+        })
+
+        Object.entries({
+          'is available': {
+            expectDesc: 'minimum after conversion',
+            expectedFloor: 10,
+            expectedCur: '0.1',
+            conversionFn: (amount, from, to) => {
+              from = parseFloat(from);
+              to = parseFloat(to);
+              return amount * from / to;
+            },
+          },
+          'is not available': {
+            expectDesc: 'absolute minimum',
+            expectedFloor: 1,
+            expectedCur: '10',
+            conversionFn: null
+          },
+          'is not working': {
+            expectDesc: 'first',
+            expectedFloor: 2,
+            expectedCur: '1',
+            conversionFn: () => {
+              throw new Error();
+            }
+          }
+        }).forEach(([t, {expectDesc, expectedFloor, expectedCur, conversionFn}]) => {
+          describe(`and currency conversion ${t}`, () => {
+            let mockConvertCurrency;
+            const origConvertCurrency = getGlobal().convertCurrency;
+            beforeEach(() => {
+              if (conversionFn) {
+                getGlobal().convertCurrency = mockConvertCurrency = sinon.stub().callsFake(conversionFn)
+              } else {
+                mockConvertCurrency = null;
+                delete getGlobal().convertCurrency;
+              }
+            });
+
+            afterEach(() => {
+              if (origConvertCurrency != null) {
+                getGlobal().convertCurrency = origConvertCurrency;
+              } else {
+                delete getGlobal().convertCurrency;
+              }
+            })
+
+            it(`should pick the ${expectDesc}`, () => {
+              adapter.callBids(s2sReq, BID_REQUESTS, addBidResponse, done, ajax);
+              const pbsReq = JSON.parse(server.requests[server.requests.length - 1].requestBody);
+              expect(pbsReq.imp[0].bidfloor).to.eql(expectedFloor);
+              expect(pbsReq.imp[0].bidfloorcur).to.eql(expectedCur);
+            });
+          });
+        });
+      });
     });
 
     it('adds device.w and device.h even if the config lacks a device object', function () {
diff --git a/test/spec/modules/pubmaticBidAdapter_spec.js b/test/spec/modules/pubmaticBidAdapter_spec.js
index 64e95460321..7679b3cdf5a 100644
--- a/test/spec/modules/pubmaticBidAdapter_spec.js
+++ b/test/spec/modules/pubmaticBidAdapter_spec.js
@@ -3130,6 +3130,115 @@ describe('PubMatic adapter', function () {
       });
     });
 
+    describe('Request param acat checking', function() {
+      let multipleBidRequests = [
+		  {
+          bidder: 'pubmatic',
+          params: {
+			  publisherId: '301',
+			  adSlot: '/15671365/DMDemo@300x250:0',
+			  kadfloor: '1.2',
+			  pmzoneid: 'aabc, ddef',
+			  kadpageurl: 'www.publisher.com',
+			  yob: '1986',
+			  gender: 'M',
+			  lat: '12.3',
+			  lon: '23.7',
+			  wiid: '1234567890',
+			  profId: '100',
+			  verId: '200',
+			  currency: 'AUD',
+			  dctr: 'key1=val1|key2=val2,!val3'
+          },
+          placementCode: '/19968336/header-bid-tag-1',
+          sizes: [[300, 250], [300, 600]],
+          bidId: '23acc48ad47af5',
+          requestId: '0fb4905b-9456-4152-86be-c6f6d259ba99',
+          bidderRequestId: '1c56ad30b9b8ca8',
+          transactionId: '92489f71-1bf2-49a0-adf9-000cea934729'
+		  },
+		  {
+          bidder: 'pubmatic',
+          params: {
+			  publisherId: '301',
+			  adSlot: '/15671365/DMDemo@300x250:0',
+			  kadfloor: '1.2',
+			  pmzoneid: 'aabc, ddef',
+			  kadpageurl: 'www.publisher.com',
+			  yob: '1986',
+			  gender: 'M',
+			  lat: '12.3',
+			  lon: '23.7',
+			  wiid: '1234567890',
+			  profId: '100',
+			  verId: '200',
+			  currency: 'GBP',
+			  dctr: 'key1=val3|key2=val1,!val3|key3=val123'
+          },
+          placementCode: '/19968336/header-bid-tag-1',
+          sizes: [[300, 250], [300, 600]],
+          bidId: '23acc48ad47af5',
+          requestId: '0fb4905b-9456-4152-86be-c6f6d259ba99',
+          bidderRequestId: '1c56ad30b9b8ca8',
+          transactionId: '92489f71-1bf2-49a0-adf9-000cea934729'
+		  }
+      ];
+
+      it('acat: pass only strings', function() {
+		  multipleBidRequests[0].params.acat = [1, 2, 3, 'IAB1', 'IAB2'];
+		  let request = spec.buildRequests(multipleBidRequests, {
+          auctionId: 'new-auction-id'
+		  });
+		  let data = JSON.parse(request.data);
+		  expect(data.ext.acat).to.exist.and.to.deep.equal(['IAB1', 'IAB2']);
+      });
+
+	  it('acat: trim the strings', function() {
+        multipleBidRequests[0].params.acat = ['   IAB1    ', '   IAB2   '];
+        let request = spec.buildRequests(multipleBidRequests, {
+          auctionId: 'new-auction-id'
+        });
+        let data = JSON.parse(request.data);
+        expect(data.ext.acat).to.exist.and.to.deep.equal(['IAB1', 'IAB2']);
+      });
+
+	  it('acat: pass only unique strings', function() {
+        multipleBidRequests[0].params.acat = ['IAB1', 'IAB2', 'IAB1', 'IAB2', 'IAB1', 'IAB2'];
+        multipleBidRequests[1].params.acat = ['IAB1', 'IAB2', 'IAB1', 'IAB2', 'IAB1', 'IAB3'];
+        let request = spec.buildRequests(multipleBidRequests, {
+          auctionId: 'new-auction-id'
+        });
+        let data = JSON.parse(request.data);
+        expect(data.ext.acat).to.exist.and.to.deep.equal(['IAB1', 'IAB2', 'IAB3']);
+      });
+      it('ortb2.ext.prebid.bidderparams.pubmatic.acat should be passed in request payload', function() {
+        let sandbox = sinon.sandbox.create();
+        sandbox.stub(config, 'getConfig').callsFake(key => {
+          const config = {
+            'ortb2': {
+              ext: {
+                prebid: {
+                  bidderparams: {
+                    pubmatic: {
+                      acat: ['IAB1', 'IAB2', 'IAB1', 'IAB2', 'IAB1', 'IAB2']
+                    }
+                  }
+                }
+              }
+            }
+          };
+          return config[key];
+        });
+        const request = spec.buildRequests(bidRequests, {
+          auctionId: 'new-auction-id',
+          bidderCode: 'pubmatic'
+        });
+        let data = JSON.parse(request.data);
+        expect(data.ext.acat).to.deep.equal(['IAB1', 'IAB2']);
+        sandbox.restore();
+      });
+    });
+
     describe('Request param bcat checking', function() {
       let multipleBidRequests = [
         {
@@ -3231,6 +3340,26 @@ describe('PubMatic adapter', function () {
         });
         let data = JSON.parse(request.data);
         expect(data.bcat).to.deep.equal(undefined);
+      });
+
+	  it('ortb2.bcat should merged with slot level bcat param', function() {
+        multipleBidRequests[0].params.bcat = ['IAB-1', 'IAB-2'];
+        let sandbox = sinon.sandbox.create();
+        sandbox.stub(config, 'getConfig').callsFake(key => {
+          const config = {
+            'ortb2': {
+              bcat: ['IAB-3', 'IAB-4']
+            }
+          };
+          return config[key];
+        });
+        const request = spec.buildRequests(multipleBidRequests, {
+          auctionId: 'new-auction-id',
+          bidderCode: 'pubmatic'
+        });
+        let data = JSON.parse(request.data);
+        expect(data.bcat).to.deep.equal(['IAB-1', 'IAB-2', 'IAB-3', 'IAB-4']);
+        sandbox.restore();
       });
     });
 
diff --git a/test/spec/modules/userId_spec.js b/test/spec/modules/userId_spec.js
index 22518fa72c2..c75b998159b 100644
--- a/test/spec/modules/userId_spec.js
+++ b/test/spec/modules/userId_spec.js
@@ -18,9 +18,7 @@ import * as events from 'src/events.js';
 import CONSTANTS from 'src/constants.json';
 import {getGlobal} from 'src/prebidGlobal.js';
 import {
-  requestBidsHook as consentManagementRequestBidsHook,
   resetConsentData,
-  setConsentConfig
 } from 'modules/consentManagement.js';
 import {server} from 'test/mocks/xhr.js';
 import {find} from 'src/polyfill.js';
@@ -52,6 +50,7 @@ import {adqueryIdSubmodule} from 'modules/adqueryIdSystem.js';
 import * as mockGpt from '../integration/faker/googletag.js';
 import 'src/prebid.js';
 import {hook} from '../../../src/hook.js';
+import {mockGdprConsent} from '../../helpers/consentData.js';
 
 let assert = require('chai').assert;
 let expect = require('chai').expect;
@@ -107,6 +106,41 @@ describe('User ID', function () {
     });
   }
 
+  let sandbox, consentData, startDelay, callbackDelay;
+
+  function clearStack() {
+    return new Promise((resolve) => setTimeout(resolve));
+  }
+
+  function delay() {
+    const stub = sinon.stub().callsFake(() => new Promise((resolve) => {
+      stub.resolve = () => {
+        resolve();
+        return clearStack();
+      };
+    }));
+    return stub;
+  }
+
+  function runBidsHook(...args) {
+    startDelay = delay();
+
+    const result = requestBidsHook(...args, {delay: startDelay});
+    return new Promise((resolve) => setTimeout(() => resolve(result)));
+  }
+
+  function expectImmediateBidHook(...args) {
+    return runBidsHook(...args).then(() => {
+      startDelay.calledWith(0);
+      return startDelay.resolve();
+    })
+  }
+
+  function initModule(config) {
+    callbackDelay = delay();
+    return init(config, {delay: callbackDelay});
+  }
+
   before(function () {
     hook.ready();
     localStorage.removeItem(PBJS_USER_ID_OPTOUT_NAME);
@@ -118,9 +152,16 @@ describe('User ID', function () {
     // (there are functions here with signature `getId(config, storedId)`, but storedId is actually consentData)
     // also, this file is ginormous; do we really need to test *all* id systems as one?
     resetConsentData();
+    sandbox = sinon.sandbox.create();
+    consentData = null;
+    mockGdprConsent(sandbox, () => consentData);
     coreStorage.setCookie(CONSENT_LOCAL_STORAGE_NAME, '', EXPIRED_COOKIE_DATE);
   });
 
+  afterEach(() => {
+    sandbox.restore();
+  });
+
   describe('Decorate Ad Units', function () {
     beforeEach(function () {
       // reset mockGpt so nothing else interferes
@@ -128,6 +169,7 @@ describe('User ID', function () {
       mockGpt.enable();
       coreStorage.setCookie('pubcid', '', EXPIRED_COOKIE_DATE);
       coreStorage.setCookie('pubcid_alt', 'altpubcid200000', (new Date(Date.now() + 5000).toUTCString()));
+      let origSK = coreStorage.setCookie.bind(coreStorage);
       sinon.spy(coreStorage, 'setCookie');
       sinon.stub(utils, 'logWarn');
     });
@@ -154,30 +196,33 @@ describe('User ID', function () {
       let pubcid = coreStorage.getCookie('pubcid');
       expect(pubcid).to.be.null; // there should be no cookie initially
 
-      setSubmoduleRegistry([sharedIdSystemSubmodule]);
       init(config);
+      setSubmoduleRegistry([sharedIdSystemSubmodule]);
+
       config.setConfig(getConfigMock(['pubCommonId', 'pubcid', 'cookie']));
 
-      requestBidsHook(config => {
+      return expectImmediateBidHook(config => {
         innerAdUnits1 = config.adUnits
-      }, {adUnits: adUnits1});
-      pubcid = coreStorage.getCookie('pubcid'); // cookies is created after requestbidHook
-
-      innerAdUnits1.forEach(unit => {
-        unit.bids.forEach(bid => {
-          expect(bid).to.have.deep.nested.property('userId.pubcid');
-          expect(bid.userId.pubcid).to.equal(pubcid);
-          expect(bid.userIdAsEids[0]).to.deep.equal({
-            source: 'pubcid.org',
-            uids: [{id: pubcid, atype: 1}]
+      }, {adUnits: adUnits1}).then(() => {
+        pubcid = coreStorage.getCookie('pubcid'); // cookies is created after requestbidHook
+
+        innerAdUnits1.forEach(unit => {
+          unit.bids.forEach(bid => {
+            expect(bid).to.have.deep.nested.property('userId.pubcid');
+            expect(bid.userId.pubcid).to.equal(pubcid);
+            expect(bid.userIdAsEids[0]).to.deep.equal({
+              source: 'pubcid.org',
+              uids: [{id: pubcid, atype: 1}]
+            });
           });
         });
-      });
 
-      requestBidsHook(config => {
-        innerAdUnits2 = config.adUnits
-      }, {adUnits: adUnits2});
-      assert.deepEqual(innerAdUnits1, innerAdUnits2);
+        return expectImmediateBidHook(config => {
+          innerAdUnits2 = config.adUnits
+        }, {adUnits: adUnits2}).then(() => {
+          assert.deepEqual(innerAdUnits1, innerAdUnits2);
+        });
+      });
     });
 
     it('Check different cookies', function () {
@@ -188,73 +233,78 @@ describe('User ID', function () {
       let pubcid1;
       let pubcid2;
 
-      setSubmoduleRegistry([sharedIdSystemSubmodule]);
       init(config);
+      setSubmoduleRegistry([sharedIdSystemSubmodule]);
+
       config.setConfig(getConfigMock(['pubCommonId', 'pubcid', 'cookie']));
-      requestBidsHook((config) => {
+      return expectImmediateBidHook((config) => {
         innerAdUnits1 = config.adUnits
-      }, {adUnits: adUnits1});
-      pubcid1 = coreStorage.getCookie('pubcid'); // get first cookie
-      coreStorage.setCookie('pubcid', '', EXPIRED_COOKIE_DATE); // erase cookie
-
-      innerAdUnits1.forEach((unit) => {
-        unit.bids.forEach((bid) => {
-          expect(bid).to.have.deep.nested.property('userId.pubcid');
-          expect(bid.userId.pubcid).to.equal(pubcid1);
-          expect(bid.userIdAsEids[0]).to.deep.equal({
-            source: 'pubcid.org',
-            uids: [{id: pubcid1, atype: 1}]
+      }, {adUnits: adUnits1}).then(() => {
+        pubcid1 = coreStorage.getCookie('pubcid'); // get first cookie
+        coreStorage.setCookie('pubcid', '', EXPIRED_COOKIE_DATE); // erase cookie
+
+        innerAdUnits1.forEach((unit) => {
+          unit.bids.forEach((bid) => {
+            expect(bid).to.have.deep.nested.property('userId.pubcid');
+            expect(bid.userId.pubcid).to.equal(pubcid1);
+            expect(bid.userIdAsEids[0]).to.deep.equal({
+              source: 'pubcid.org',
+              uids: [{id: pubcid1, atype: 1}]
+            });
           });
         });
-      });
 
-      setSubmoduleRegistry([sharedIdSystemSubmodule]);
-      init(config);
-      config.setConfig(getConfigMock(['pubCommonId', 'pubcid', 'cookie']));
-      requestBidsHook((config) => {
-        innerAdUnits2 = config.adUnits
-      }, {adUnits: adUnits2});
-
-      pubcid2 = coreStorage.getCookie('pubcid'); // get second cookie
-
-      innerAdUnits2.forEach((unit) => {
-        unit.bids.forEach((bid) => {
-          expect(bid).to.have.deep.nested.property('userId.pubcid');
-          expect(bid.userId.pubcid).to.equal(pubcid2);
-          expect(bid.userIdAsEids[0]).to.deep.equal({
-            source: 'pubcid.org',
-            uids: [{id: pubcid2, atype: 1}]
+        init(config);
+        setSubmoduleRegistry([sharedIdSystemSubmodule]);
+
+        config.setConfig(getConfigMock(['pubCommonId', 'pubcid', 'cookie']));
+        return expectImmediateBidHook((config) => {
+          innerAdUnits2 = config.adUnits
+        }, {adUnits: adUnits2}).then(() => {
+          pubcid2 = coreStorage.getCookie('pubcid'); // get second cookie
+
+          innerAdUnits2.forEach((unit) => {
+            unit.bids.forEach((bid) => {
+              expect(bid).to.have.deep.nested.property('userId.pubcid');
+              expect(bid.userId.pubcid).to.equal(pubcid2);
+              expect(bid.userIdAsEids[0]).to.deep.equal({
+                source: 'pubcid.org',
+                uids: [{id: pubcid2, atype: 1}]
+              });
+            });
           });
+
+          expect(pubcid1).to.not.equal(pubcid2);
         });
       });
-
-      expect(pubcid1).to.not.equal(pubcid2);
     });
 
     it('Use existing cookie', function () {
       let adUnits = [getAdUnitMock()];
       let innerAdUnits;
 
-      setSubmoduleRegistry([sharedIdSystemSubmodule]);
       init(config);
+      setSubmoduleRegistry([sharedIdSystemSubmodule]);
+
       config.setConfig(getConfigMock(['pubCommonId', 'pubcid_alt', 'cookie']));
-      requestBidsHook((config) => {
+      return expectImmediateBidHook((config) => {
         innerAdUnits = config.adUnits
-      }, {adUnits});
-      innerAdUnits.forEach((unit) => {
-        unit.bids.forEach((bid) => {
-          expect(bid).to.have.deep.nested.property('userId.pubcid');
-          expect(bid.userId.pubcid).to.equal('altpubcid200000');
-          expect(bid.userIdAsEids[0]).to.deep.equal({
-            source: 'pubcid.org',
-            uids: [{id: 'altpubcid200000', atype: 1}]
+      }, {adUnits}).then(() => {
+        innerAdUnits.forEach((unit) => {
+          unit.bids.forEach((bid) => {
+            expect(bid).to.have.deep.nested.property('userId.pubcid');
+            expect(bid.userId.pubcid).to.equal('altpubcid200000');
+            expect(bid.userIdAsEids[0]).to.deep.equal({
+              source: 'pubcid.org',
+              uids: [{id: 'altpubcid200000', atype: 1}]
+            });
           });
         });
+        // Because the consent cookie doesn't exist yet, we'll have 2 setCookie calls:
+        // 1) for the consent cookie
+        // 2) from the getId() call that results in a new call to store the results
+        expect(coreStorage.setCookie.callCount).to.equal(2);
       });
-      // Because the consent cookie doesn't exist yet, we'll have two setCookie calls:
-      // 1) for the consent cookie
-      // 2) from the getId() call that results in a new call to store the results
-      expect(coreStorage.setCookie.callCount).to.equal(2);
     });
 
     it('Extend cookie', function () {
@@ -263,25 +313,25 @@ describe('User ID', function () {
       let customConfig = getConfigMock(['pubCommonId', 'pubcid_alt', 'cookie']);
       customConfig = addConfig(customConfig, 'params', {extend: true});
 
-      setSubmoduleRegistry([sharedIdSystemSubmodule, unifiedIdSubmodule]);
       init(config);
+      setSubmoduleRegistry([sharedIdSystemSubmodule, unifiedIdSubmodule]);
+
       config.setConfig(customConfig);
-      requestBidsHook((config) => {
+      return expectImmediateBidHook((config) => {
         innerAdUnits = config.adUnits
-      }, {adUnits});
-      innerAdUnits.forEach((unit) => {
-        unit.bids.forEach((bid) => {
-          expect(bid).to.have.deep.nested.property('userId.pubcid');
-          expect(bid.userId.pubcid).to.equal('altpubcid200000');
-          expect(bid.userIdAsEids[0]).to.deep.equal({
-            source: 'pubcid.org',
-            uids: [{id: 'altpubcid200000', atype: 1}]
+      }, {adUnits}).then(() => {
+        innerAdUnits.forEach((unit) => {
+          unit.bids.forEach((bid) => {
+            expect(bid).to.have.deep.nested.property('userId.pubcid');
+            expect(bid.userId.pubcid).to.equal('altpubcid200000');
+            expect(bid.userIdAsEids[0]).to.deep.equal({
+              source: 'pubcid.org',
+              uids: [{id: 'altpubcid200000', atype: 1}]
+            });
           });
         });
+        expect(coreStorage.setCookie.callCount).to.equal(2);
       });
-      // Because extend is true, the cookie will be updated even if it exists already. The second setCookie call
-      // is for storing consentData
-      expect(coreStorage.setCookie.callCount).to.equal(2);
     });
 
     it('Disable auto create', function () {
@@ -290,56 +340,67 @@ describe('User ID', function () {
       let customConfig = getConfigMock(['pubCommonId', 'pubcid', 'cookie']);
       customConfig = addConfig(customConfig, 'params', {create: false});
 
-      setSubmoduleRegistry([sharedIdSystemSubmodule, unifiedIdSubmodule]);
       init(config);
+      setSubmoduleRegistry([sharedIdSystemSubmodule, unifiedIdSubmodule]);
+
       config.setConfig(customConfig);
-      requestBidsHook((config) => {
+      return expectImmediateBidHook((config) => {
         innerAdUnits = config.adUnits
-      }, {adUnits});
-      innerAdUnits.forEach((unit) => {
-        unit.bids.forEach((bid) => {
-          expect(bid).to.not.have.deep.nested.property('userId.pubcid');
-          expect(bid).to.not.have.deep.nested.property('userIdAsEids');
+      }, {adUnits}).then(() => {
+        innerAdUnits.forEach((unit) => {
+          unit.bids.forEach((bid) => {
+            expect(bid).to.not.have.deep.nested.property('userId.pubcid');
+            expect(bid).to.not.have.deep.nested.property('userIdAsEids');
+          });
         });
+        // setCookie is called once in order to store consentData
+        expect(coreStorage.setCookie.callCount).to.equal(1);
       });
-      // setCookie is called once in order to store consentData
-      expect(coreStorage.setCookie.callCount).to.equal(1);
     });
 
-    it('pbjs.getUserIds', function () {
-      setSubmoduleRegistry([sharedIdSystemSubmodule]);
+    it('pbjs.getUserIds', function (done) {
       init(config);
+      setSubmoduleRegistry([sharedIdSystemSubmodule]);
+
+      const ids = {pubcid: '11111'};
       config.setConfig({
         userSync: {
-          syncDelay: 0,
+          auctionDelay: 10, // with auctionDelay > 0, no auction is needed to complete init
           userIds: [{
-            name: 'pubCommonId', value: {'pubcid': '11111'}
+            name: 'pubCommonId', value: ids
           }]
         }
       });
-      expect(typeof (getGlobal()).getUserIds).to.equal('function');
-      expect((getGlobal()).getUserIds()).to.deep.equal({pubcid: '11111'});
+      getGlobal().getUserIdsAsync().then((uids) => {
+        expect(uids).to.deep.equal(ids);
+        expect(getGlobal().getUserIds()).to.deep.equal(ids);
+        done();
+      })
     });
 
-    it('pbjs.getUserIdsAsEids', function () {
-      setSubmoduleRegistry([sharedIdSystemSubmodule]);
+    it('pbjs.getUserIdsAsEids', function (done) {
       init(config);
+      setSubmoduleRegistry([sharedIdSystemSubmodule]);
+
+      const ids = {'pubcid': '11111'};
       config.setConfig({
         userSync: {
-          syncDelay: 0,
+          auctionDelay: 10,
           userIds: [{
-            name: 'pubCommonId', value: {'pubcid': '11111'}
+            name: 'pubCommonId', value: ids
           }]
         }
       });
-      expect(typeof (getGlobal()).getUserIdsAsEids).to.equal('function');
-      expect((getGlobal()).getUserIdsAsEids()).to.deep.equal(createEidsArray((getGlobal()).getUserIds()));
+      getGlobal().getUserIdsAsync().then((ids) => {
+        expect(getGlobal().getUserIdsAsEids()).to.deep.equal(createEidsArray(ids));
+        done();
+      });
     });
 
     it('should set googletag ppid correctly', function () {
       let adUnits = [getAdUnitMock()];
-      setSubmoduleRegistry([amxIdSubmodule, sharedIdSystemSubmodule, identityLinkSubmodule]);
       init(config);
+      setSubmoduleRegistry([amxIdSubmodule, sharedIdSystemSubmodule, identityLinkSubmodule]);
 
       config.setConfig({
         userSync: {
@@ -353,15 +414,17 @@ describe('User ID', function () {
       });
       // before ppid should not be set
       expect(window.googletag._ppid).to.equal(undefined);
-      requestBidsHook(() => {}, {adUnits});
-      // ppid should have been set without dashes and stuff
-      expect(window.googletag._ppid).to.equal('pubCommonidvaluepubCommonidvalue');
+      return expectImmediateBidHook(() => {}, {adUnits}).then(() => {
+        // ppid should have been set without dashes and stuff
+        expect(window.googletag._ppid).to.equal('pubCommonidvaluepubCommonidvalue');
+      });
     });
 
     it('should log a warning if PPID too big or small', function () {
       let adUnits = [getAdUnitMock()];
-      setSubmoduleRegistry([sharedIdSystemSubmodule]);
+
       init(config);
+      setSubmoduleRegistry([sharedIdSystemSubmodule]);
 
       config.setConfig({
         userSync: {
@@ -373,59 +436,69 @@ describe('User ID', function () {
       });
       // before ppid should not be set
       expect(window.googletag._ppid).to.equal(undefined);
-      requestBidsHook(() => {}, {adUnits});
-      // ppid should NOT have been set
-      expect(window.googletag._ppid).to.equal(undefined);
-      // a warning should have been emmited
-      expect(utils.logWarn.args[0][0]).to.exist.and.to.contain('User ID - Googletag Publisher Provided ID for pubcid.org is not between 32 and 150 characters - pubcommonIdValue');
+      return expectImmediateBidHook(() => {}, {adUnits}).then(() => {
+        // ppid should NOT have been set
+        expect(window.googletag._ppid).to.equal(undefined);
+        // a warning should have been emmited
+        expect(utils.logWarn.args[0][0]).to.exist.and.to.contain('User ID - Googletag Publisher Provided ID for pubcid.org is not between 32 and 150 characters - pubcommonIdValue');
+      });
     });
 
-    it('pbjs.refreshUserIds refreshes', function() {
-      let sandbox = sinon.createSandbox();
-
-      let mockIdCallback = sandbox.stub().returns({id: {'MOCKID': '1111'}});
-
-      let mockIdSystem = {
-        name: 'mockId',
-        decode: function(value) {
-          return {
-            'mid': value['MOCKID']
-          };
-        },
-        getId: mockIdCallback
-      };
+    describe('refreshing before init is complete', () => {
+      const MOCK_ID = {'MOCKID': '1111'};
+      let mockIdCallback;
 
-      setSubmoduleRegistry([mockIdSystem]);
-      init(config);
-      config.setConfig({
-        userSync: {
-          syncDelay: 0,
-          userIds: [{
-            name: 'mockId',
-            value: {id: {mockId: '1111'}}
-          }]
-        }
+      beforeEach(() => {
+        mockIdCallback = sinon.stub();
+        let mockIdSystem = {
+          name: 'mockId',
+          decode: function(value) {
+            return {
+              'mid': value['MOCKID']
+            };
+          },
+          getId: sinon.stub().returns({callback: mockIdCallback})
+        };
+        init(config);
+        setSubmoduleRegistry([mockIdSystem]);
+        config.setConfig({
+          userSync: {
+            auctionDelay: 10,
+            userIds: [{
+              name: 'mockId',
+              storage: {name: 'MOCKID', type: 'cookie'}
+            }]
+          }
+        });
       });
-      expect(typeof (getGlobal()).refreshUserIds).to.equal('function');
 
-      getGlobal().getUserIds(); // force initialization
-
-      // update config so that getId will be called
-      config.setConfig({
-        userSync: {
-          syncDelay: 0,
-          userIds: [{
-            name: 'mockId',
-            storage: {name: 'mockid', type: 'cookie'},
-          }]
-        }
+      it('should still resolve promises returned by getUserIdsAsync', () => {
+        let result = null;
+        getGlobal().getUserIdsAsync().then((val) => { result = val; });
+        return clearStack().then(() => {
+          expect(result).to.equal(null); // auction has not ended, callback should not have been called
+          mockIdCallback.callsFake((cb) => cb(MOCK_ID));
+          return getGlobal().refreshUserIds().then(clearStack);
+        }).then(() => {
+          expect(result).to.deep.equal(getGlobal().getUserIds()) // auction still not over, but refresh was explicitly forced
+        });
       });
 
-      getGlobal().refreshUserIds();
-      expect(mockIdCallback.callCount).to.equal(1);
+      it('should not stop auctions', (done) => {
+        // simulate an infinite `auctionDelay`; refreshing should still allow the auction to continue
+        // as soon as ID submodules have completed init
+        requestBidsHook(() => {
+          done();
+        }, {adUnits: [getAdUnitMock()]}, {delay: delay()});
+        getGlobal().refreshUserIds();
+        clearStack().then(() => {
+          // simulate init complete
+          mockIdCallback.callArg(0, {id: {MOCKID: '1111'}});
+        })
+      });
     });
 
-    it('pbjs.refreshUserIds updates submodules', function() {
+    it('pbjs.refreshUserIds updates submodules', function(done) {
       let sandbox = sinon.createSandbox();
       let mockIdCallback = sandbox.stub().returns({id: {'MOCKID': '1111'}});
       let mockIdSystem = {
@@ -437,11 +510,12 @@ describe('User ID', function () {
         },
         getId: mockIdCallback
       };
-      setSubmoduleRegistry([mockIdSystem]);
       init(config);
+      setSubmoduleRegistry([mockIdSystem]);
+
       config.setConfig({
         userSync: {
-          syncDelay: 0,
+          auctionDelay: 10,
           userIds: [{
             name: 'mockId',
             value: {id: {mockId: '1111'}}
@@ -449,20 +523,23 @@ describe('User ID', function () {
         }
       });
 
-      expect(getGlobal().getUserIds().id.mockId).to.equal('1111');
-
-      // update to new config value
-      config.setConfig({
-        userSync: {
-          syncDelay: 0,
-          userIds: [{
-            name: 'mockId',
-            value: {id: {mockId: '1212'}}
-          }]
-        }
+      getGlobal().getUserIdsAsync().then((uids) => {
+        expect(uids.id.mockId).to.equal('1111');
+        // update to new config value
+        config.setConfig({
+          userSync: {
+            auctionDelay: 10,
+            userIds: [{
+              name: 'mockId',
+              value: {id: {mockId: '1212'}}
+            }]
+          }
+        });
+        getGlobal().refreshUserIds({ submoduleNames: ['mockId'] }).then(() => {
+          expect(getGlobal().getUserIds().id.mockId).to.equal('1212');
+          done();
+        });
       });
-      getGlobal().refreshUserIds({ submoduleNames: ['mockId'] });
-      expect(getGlobal().getUserIds().id.mockId).to.equal('1212');
     });
 
     it('pbjs.refreshUserIds refreshes single', function() {
@@ -495,11 +572,12 @@ describe('User ID', function () {
         getId: refreshedIdCallback
       };
 
-      setSubmoduleRegistry([refreshedIdSystem, mockIdSystem]);
       init(config);
+      setSubmoduleRegistry([refreshedIdSystem, mockIdSystem]);
+
       config.setConfig({
         userSync: {
-          syncDelay: 0,
+          auctionDelay: 10,
           userIds: [
             {
               name: 'mockId',
@@ -513,13 +591,11 @@ describe('User ID', function () {
         }
       });
 
-      getGlobal().getUserIds(); // force initialization
-
-      getGlobal().refreshUserIds({submoduleNames: 'refreshedId'}, refreshUserIdsCallback);
-
-      expect(refreshedIdCallback.callCount).to.equal(2);
-      expect(mockIdCallback.callCount).to.equal(1);
-      expect(refreshUserIdsCallback.callCount).to.equal(1);
+      return getGlobal().refreshUserIds({submoduleNames: 'refreshedId'}, refreshUserIdsCallback).then(() => {
+        expect(refreshedIdCallback.callCount).to.equal(2);
+        expect(mockIdCallback.callCount).to.equal(1);
+        expect(refreshUserIdsCallback.callCount).to.equal(1);
+      });
     });
   });
 
@@ -541,15 +617,15 @@ describe('User ID', function () {
     });
 
     it('fails initialization if opt out cookie exists', function () {
-      setSubmoduleRegistry([sharedIdSystemSubmodule]);
       init(config);
+      setSubmoduleRegistry([sharedIdSystemSubmodule]);
       config.setConfig(getConfigMock(['pubCommonId', 'pubcid', 'cookie']));
       expect(utils.logInfo.args[0][0]).to.exist.and.to.equal('User ID - opt-out cookie found, exit module');
     });
 
     it('initializes if no opt out cookie exists', function () {
-      setSubmoduleRegistry([sharedIdSystemSubmodule]);
       init(config);
+      setSubmoduleRegistry([sharedIdSystemSubmodule]);
       config.setConfig(getConfigMock(['pubCommonId', 'pubcid', 'cookie']));
       expect(utils.logInfo.args[0][0]).to.exist.and.to.contain('User ID - usersync config updated for 1 submodules');
     });
@@ -567,23 +643,23 @@ describe('User ID', function () {
     });
 
     it('handles config with no usersync object', function () {
-      setSubmoduleRegistry([sharedIdSystemSubmodule, unifiedIdSubmodule, id5IdSubmodule, identityLinkSubmodule, merkleIdSubmodule, netIdSubmodule, intentIqIdSubmodule, zeotapIdPlusSubmodule, pubProvidedIdSubmodule, criteoIdSubmodule, mwOpenLinkIdSubModule, tapadIdSubmodule, uid2IdSubmodule, admixerIdSubmodule, deepintentDpesSubmodule, flocIdSubmodule, akamaiDAPIdSubmodule, amxIdSubmodule, kinessoIdSubmodule, adqueryIdSubmodule]);
       init(config);
+      setSubmoduleRegistry([sharedIdSystemSubmodule, unifiedIdSubmodule, id5IdSubmodule, identityLinkSubmodule, merkleIdSubmodule, netIdSubmodule, intentIqIdSubmodule, zeotapIdPlusSubmodule, pubProvidedIdSubmodule, criteoIdSubmodule, mwOpenLinkIdSubModule, tapadIdSubmodule, uid2IdSubmodule, admixerIdSubmodule, deepintentDpesSubmodule, flocIdSubmodule, akamaiDAPIdSubmodule, amxIdSubmodule, kinessoIdSubmodule, adqueryIdSubmodule]);
       config.setConfig({});
       // usersync is undefined, and no logInfo message for 'User ID - usersync config updated'
       expect(typeof utils.logInfo.args[0]).to.equal('undefined');
     });
 
     it('handles config with empty usersync object', function () {
-      setSubmoduleRegistry([sharedIdSystemSubmodule, unifiedIdSubmodule, id5IdSubmodule, identityLinkSubmodule, merkleIdSubmodule, netIdSubmodule, intentIqIdSubmodule, zeotapIdPlusSubmodule, pubProvidedIdSubmodule, criteoIdSubmodule, mwOpenLinkIdSubModule, tapadIdSubmodule, uid2IdSubmodule, admixerIdSubmodule, deepintentDpesSubmodule, flocIdSubmodule, akamaiDAPIdSubmodule, amxIdSubmodule, kinessoIdSubmodule, adqueryIdSubmodule]);
       init(config);
+      setSubmoduleRegistry([sharedIdSystemSubmodule, unifiedIdSubmodule, id5IdSubmodule, identityLinkSubmodule, merkleIdSubmodule, netIdSubmodule, intentIqIdSubmodule, zeotapIdPlusSubmodule, pubProvidedIdSubmodule, criteoIdSubmodule, mwOpenLinkIdSubModule, tapadIdSubmodule, uid2IdSubmodule, admixerIdSubmodule, deepintentDpesSubmodule, flocIdSubmodule, akamaiDAPIdSubmodule, amxIdSubmodule, kinessoIdSubmodule, adqueryIdSubmodule]);
       config.setConfig({userSync: {}});
       expect(typeof utils.logInfo.args[0]).to.equal('undefined');
     });
 
     it('handles config with usersync and userIds that are empty objs', function () {
-      setSubmoduleRegistry([sharedIdSystemSubmodule, unifiedIdSubmodule, id5IdSubmodule, identityLinkSubmodule, merkleIdSubmodule, netIdSubmodule, intentIqIdSubmodule, zeotapIdPlusSubmodule, pubProvidedIdSubmodule, criteoIdSubmodule, mwOpenLinkIdSubModule, tapadIdSubmodule, uid2IdSubmodule, admixerIdSubmodule, deepintentDpesSubmodule, dmdIdSubmodule, flocIdSubmodule, akamaiDAPIdSubmodule, amxIdSubmodule, kinessoIdSubmodule, adqueryIdSubmodule]);
       init(config);
+      setSubmoduleRegistry([sharedIdSystemSubmodule, unifiedIdSubmodule, id5IdSubmodule, identityLinkSubmodule, merkleIdSubmodule, netIdSubmodule, intentIqIdSubmodule, zeotapIdPlusSubmodule, pubProvidedIdSubmodule, criteoIdSubmodule, mwOpenLinkIdSubModule, tapadIdSubmodule, uid2IdSubmodule, admixerIdSubmodule, deepintentDpesSubmodule, dmdIdSubmodule, flocIdSubmodule, akamaiDAPIdSubmodule, amxIdSubmodule, kinessoIdSubmodule, adqueryIdSubmodule]);
       config.setConfig({
         userSync: {
           userIds: [{}]
@@ -593,8 +669,8 @@ describe('User ID', function () {
     });
 
     it('handles config with usersync and userIds with empty names or that dont match a submodule.name', function () {
-      setSubmoduleRegistry([sharedIdSystemSubmodule, unifiedIdSubmodule, id5IdSubmodule, identityLinkSubmodule, merkleIdSubmodule, netIdSubmodule, intentIqIdSubmodule, zeotapIdPlusSubmodule, pubProvidedIdSubmodule, criteoIdSubmodule, mwOpenLinkIdSubModule, tapadIdSubmodule, uid2IdSubmodule, admixerIdSubmodule, deepintentDpesSubmodule, dmdIdSubmodule, flocIdSubmodule, akamaiDAPIdSubmodule, amxIdSubmodule, kinessoIdSubmodule, adqueryIdSubmodule]);
       init(config);
+      setSubmoduleRegistry([sharedIdSystemSubmodule, unifiedIdSubmodule, id5IdSubmodule, identityLinkSubmodule, merkleIdSubmodule, netIdSubmodule, intentIqIdSubmodule, zeotapIdPlusSubmodule, pubProvidedIdSubmodule, criteoIdSubmodule, mwOpenLinkIdSubModule, tapadIdSubmodule, uid2IdSubmodule, admixerIdSubmodule, deepintentDpesSubmodule, dmdIdSubmodule, flocIdSubmodule, akamaiDAPIdSubmodule, amxIdSubmodule, kinessoIdSubmodule, adqueryIdSubmodule]);
       config.setConfig({
         userSync: {
           userIds: [{
@@ -610,16 +686,16 @@ describe('User ID', function () {
     });
 
     it('config with 1 configurations should create 1 submodules', function () {
-      setSubmoduleRegistry([sharedIdSystemSubmodule, unifiedIdSubmodule, id5IdSubmodule, identityLinkSubmodule, netIdSubmodule, intentIqIdSubmodule, zeotapIdPlusSubmodule, pubProvidedIdSubmodule, criteoIdSubmodule, mwOpenLinkIdSubModule, tapadIdSubmodule, uid2IdSubmodule, admixerIdSubmodule, deepintentDpesSubmodule, flocIdSubmodule, akamaiDAPIdSubmodule, amxIdSubmodule, kinessoIdSubmodule, adqueryIdSubmodule]);
       init(config);
+      setSubmoduleRegistry([sharedIdSystemSubmodule, unifiedIdSubmodule, id5IdSubmodule, identityLinkSubmodule, netIdSubmodule, intentIqIdSubmodule, zeotapIdPlusSubmodule, pubProvidedIdSubmodule, criteoIdSubmodule, mwOpenLinkIdSubModule, tapadIdSubmodule, uid2IdSubmodule, admixerIdSubmodule, deepintentDpesSubmodule, flocIdSubmodule, akamaiDAPIdSubmodule, amxIdSubmodule, kinessoIdSubmodule, adqueryIdSubmodule]);
       config.setConfig(getConfigMock(['unifiedId', 'unifiedid', 'cookie']));
 
       expect(utils.logInfo.args[0][0]).to.exist.and.to.contain('User ID - usersync config updated for 1 submodules');
     });
 
     it('handles config with name in different case', function () {
-      setSubmoduleRegistry([criteoIdSubmodule]);
       init(config);
+      setSubmoduleRegistry([criteoIdSubmodule]);
       config.setConfig({
         userSync: {
           userIds: [{
@@ -632,8 +708,8 @@ describe('User ID', function () {
     });
 
     it('config with 23 configurations should result in 23 submodules add', function () {
-      setSubmoduleRegistry([sharedIdSystemSubmodule, unifiedIdSubmodule, id5IdSubmodule, identityLinkSubmodule, liveIntentIdSubmodule, britepoolIdSubmodule, netIdSubmodule, intentIqIdSubmodule, zeotapIdPlusSubmodule, hadronIdSubmodule, pubProvidedIdSubmodule, criteoIdSubmodule, mwOpenLinkIdSubModule, tapadIdSubmodule, uid2IdSubmodule, admixerIdSubmodule, deepintentDpesSubmodule, dmdIdSubmodule, flocIdSubmodule, akamaiDAPIdSubmodule, amxIdSubmodule, kinessoIdSubmodule, adqueryIdSubmodule]);
       init(config);
+      setSubmoduleRegistry([sharedIdSystemSubmodule, unifiedIdSubmodule, id5IdSubmodule, identityLinkSubmodule, liveIntentIdSubmodule, britepoolIdSubmodule, netIdSubmodule, intentIqIdSubmodule, zeotapIdPlusSubmodule, hadronIdSubmodule, pubProvidedIdSubmodule, criteoIdSubmodule, mwOpenLinkIdSubModule, tapadIdSubmodule, uid2IdSubmodule, admixerIdSubmodule, deepintentDpesSubmodule, dmdIdSubmodule, flocIdSubmodule, akamaiDAPIdSubmodule, amxIdSubmodule, kinessoIdSubmodule, adqueryIdSubmodule]);
       config.setConfig({
         userSync: {
           syncDelay: 0,
@@ -705,9 +781,8 @@ describe('User ID', function () {
     });
 
     it('config syncDelay updates module correctly', function () {
-      setSubmoduleRegistry([sharedIdSystemSubmodule, unifiedIdSubmodule, id5IdSubmodule, identityLinkSubmodule, netIdSubmodule, intentIqIdSubmodule, zeotapIdPlusSubmodule, hadronIdSubmodule, pubProvidedIdSubmodule, criteoIdSubmodule, mwOpenLinkIdSubModule, tapadIdSubmodule, uid2IdSubmodule, admixerIdSubmodule, deepintentDpesSubmodule, dmdIdSubmodule, flocIdSubmodule, akamaiDAPIdSubmodule, amxIdSubmodule, kinessoIdSubmodule, adqueryIdSubmodule]);
-
       init(config);
+      setSubmoduleRegistry([sharedIdSystemSubmodule, unifiedIdSubmodule, id5IdSubmodule, identityLinkSubmodule, netIdSubmodule, intentIqIdSubmodule, zeotapIdPlusSubmodule, hadronIdSubmodule, pubProvidedIdSubmodule, criteoIdSubmodule, mwOpenLinkIdSubModule, tapadIdSubmodule, uid2IdSubmodule, admixerIdSubmodule, deepintentDpesSubmodule, dmdIdSubmodule, flocIdSubmodule, akamaiDAPIdSubmodule, amxIdSubmodule, kinessoIdSubmodule, adqueryIdSubmodule]);
       config.setConfig({
         userSync: {
           syncDelay: 99,
@@ -721,8 +796,8 @@ describe('User ID', function () {
     });
 
     it('config auctionDelay updates module correctly', function () {
-      setSubmoduleRegistry([sharedIdSystemSubmodule, unifiedIdSubmodule, id5IdSubmodule, identityLinkSubmodule, netIdSubmodule, intentIqIdSubmodule, zeotapIdPlusSubmodule, hadronIdSubmodule, pubProvidedIdSubmodule, criteoIdSubmodule, mwOpenLinkIdSubModule, tapadIdSubmodule, uid2IdSubmodule, admixerIdSubmodule, deepintentDpesSubmodule, dmdIdSubmodule, flocIdSubmodule, akamaiDAPIdSubmodule, amxIdSubmodule, kinessoIdSubmodule, adqueryIdSubmodule]);
       init(config);
+      setSubmoduleRegistry([sharedIdSystemSubmodule, unifiedIdSubmodule, id5IdSubmodule, identityLinkSubmodule, netIdSubmodule, intentIqIdSubmodule, zeotapIdPlusSubmodule, hadronIdSubmodule, pubProvidedIdSubmodule, criteoIdSubmodule, mwOpenLinkIdSubModule, tapadIdSubmodule, uid2IdSubmodule, admixerIdSubmodule, deepintentDpesSubmodule, dmdIdSubmodule, flocIdSubmodule, akamaiDAPIdSubmodule, amxIdSubmodule, kinessoIdSubmodule, adqueryIdSubmodule]);
       config.setConfig({
         userSync: {
           auctionDelay: 100,
@@ -736,8 +811,8 @@ describe('User ID', function () {
     });
 
     it('config auctionDelay defaults to 0 if not a number', function () {
-      setSubmoduleRegistry([sharedIdSystemSubmodule, unifiedIdSubmodule, id5IdSubmodule, identityLinkSubmodule, netIdSubmodule, intentIqIdSubmodule, zeotapIdPlusSubmodule, hadronIdSubmodule, pubProvidedIdSubmodule, criteoIdSubmodule, mwOpenLinkIdSubModule, tapadIdSubmodule, uid2IdSubmodule, admixerIdSubmodule, deepintentDpesSubmodule, dmdIdSubmodule, flocIdSubmodule, akamaiDAPIdSubmodule, amxIdSubmodule, kinessoIdSubmodule, adqueryIdSubmodule]);
       init(config);
+      setSubmoduleRegistry([sharedIdSystemSubmodule, unifiedIdSubmodule, id5IdSubmodule, identityLinkSubmodule, netIdSubmodule, intentIqIdSubmodule, zeotapIdPlusSubmodule, hadronIdSubmodule, pubProvidedIdSubmodule, criteoIdSubmodule, mwOpenLinkIdSubModule, tapadIdSubmodule, uid2IdSubmodule, admixerIdSubmodule, deepintentDpesSubmodule, dmdIdSubmodule, flocIdSubmodule, akamaiDAPIdSubmodule, amxIdSubmodule, kinessoIdSubmodule, adqueryIdSubmodule]);
       config.setConfig({
         userSync: {
           auctionDelay: '',
@@ -758,8 +833,6 @@ describe('User ID', function () {
 
       beforeEach(function () {
         sandbox = sinon.createSandbox();
-        sandbox.stub(global, 'setTimeout').returns(2);
-        sandbox.stub(global, 'clearTimeout');
         sandbox.stub(events, 'on');
         sandbox.stub(coreStorage, 'getCookie');
 
@@ -785,9 +858,7 @@ describe('User ID', function () {
             return {callback: mockIdCallback};
           }
         };
-
-        init(config);
-
+        initModule(config);
         attachIdSystem(mockIdSystem, true);
       });
 
@@ -808,30 +879,29 @@ describe('User ID', function () {
           }
         });
 
-        requestBidsHook(auctionSpy, {adUnits});
+        return runBidsHook(auctionSpy, {adUnits}).then(() => {
+          // check auction was delayed
+          startDelay.calledWith(33);
+          auctionSpy.calledOnce.should.equal(false);
 
-        // check auction was delayed
-        global.clearTimeout.calledOnce.should.equal(false);
-        global.setTimeout.calledOnce.should.equal(true);
-        global.setTimeout.calledWith(sinon.match.func, 33);
-        auctionSpy.calledOnce.should.equal(false);
+          // check ids were fetched
+          mockIdCallback.calledOnce.should.equal(true);
 
-        // check ids were fetched
-        mockIdCallback.calledOnce.should.equal(true);
+          // mock timeout
+          return startDelay.resolve();
+        }).then(() => {
+          auctionSpy.calledOnce.should.equal(true);
 
-        // callback to continue auction if timed out
-        global.setTimeout.callArg(0);
-        auctionSpy.calledOnce.should.equal(true);
+          // does not call auction again once ids are synced
+          mockIdCallback.callArgWith(0, {'MOCKID': '1234'});
+          auctionSpy.calledOnce.should.equal(true);
 
-        // does not call auction again once ids are synced
-        mockIdCallback.callArgWith(0, {'MOCKID': '1234'});
-        auctionSpy.calledOnce.should.equal(true);
-
-        // no sync after auction ends
-        events.on.called.should.equal(false);
+          // no sync after auction ends
+          events.on.called.should.equal(false);
+        });
       });
 
-      it('delays auction if auctionDelay is set, continuing auction if ids are fetched before timing out', function (done) {
+      it('delays auction if auctionDelay is set, continuing auction if ids are fetched before timing out', function () {
         config.setConfig({
           userSync: {
             auctionDelay: 33,
@@ -842,33 +912,32 @@ describe('User ID', function () {
           }
         });
 
-        requestBidsHook(auctionSpy, {adUnits});
+        return runBidsHook(auctionSpy, {adUnits}).then(() => {
+          // check auction was delayed
+          startDelay.calledWith(33);
+          auctionSpy.calledOnce.should.equal(false);
 
-        // check auction was delayed
-        // global.setTimeout.calledOnce.should.equal(true);
-        global.clearTimeout.calledOnce.should.equal(false);
-        global.setTimeout.calledWith(sinon.match.func, 33);
-        auctionSpy.calledOnce.should.equal(false);
+          // check ids were fetched
+          mockIdCallback.calledOnce.should.equal(true);
 
-        // check ids were fetched
-        mockIdCallback.calledOnce.should.equal(true);
+          // if ids returned, should continue auction
+          mockIdCallback.callArgWith(0, {'MOCKID': '1234'});
+          return clearStack();
+        }).then(() => {
+          auctionSpy.calledOnce.should.equal(true);
 
-        // if ids returned, should continue auction
-        mockIdCallback.callArgWith(0, {'MOCKID': '1234'});
-        auctionSpy.calledOnce.should.equal(true);
-
-        // check ids were copied to bids
-        adUnits.forEach(unit => {
-          unit.bids.forEach(bid => {
-            expect(bid).to.have.deep.nested.property('userId.mid');
-            expect(bid.userId.mid).to.equal('1234');
-            expect(bid.userIdAsEids.length).to.equal(0);// "mid" is an un-known submodule for USER_IDS_CONFIG in eids.js
+          // check ids were copied to bids
+          adUnits.forEach(unit => {
+            unit.bids.forEach(bid => {
+              expect(bid).to.have.deep.nested.property('userId.mid');
+              expect(bid.userId.mid).to.equal('1234');
+              expect(bid.userIdAsEids.length).to.equal(0);// "mid" is an un-known submodule for USER_IDS_CONFIG in eids.js
+            });
           });
-          done();
-        });
 
-        // no sync after auction ends
-        events.on.called.should.equal(false);
+          // no sync after auction ends
+          events.on.called.should.equal(false);
+        });
       });
 
       it('does not delay auction if not set, delays id fetch after auction ends with syncDelay', function () {
@@ -885,26 +954,26 @@ describe('User ID', function () {
         expect(auctionDelay).to.equal(0);
         expect(syncDelay).to.equal(77);
 
-        requestBidsHook(auctionSpy, {adUnits});
-
-        // should not delay auction
-        global.setTimeout.calledOnce.should.equal(false);
-        auctionSpy.calledOnce.should.equal(true);
-
-        // check user sync is delayed after auction is ended
-        mockIdCallback.calledOnce.should.equal(false);
-        events.on.calledOnce.should.equal(true);
-        events.on.calledWith(CONSTANTS.EVENTS.AUCTION_END, sinon.match.func);
-
-        // once auction is ended, sync user ids after delay
-        events.on.callArg(1);
-        global.setTimeout.calledOnce.should.equal(true);
-        global.setTimeout.calledWith(sinon.match.func, 77);
-        mockIdCallback.calledOnce.should.equal(false);
-
-        // once sync delay is over, ids should be fetched
-        global.setTimeout.callArg(0);
-        mockIdCallback.calledOnce.should.equal(true);
+        return expectImmediateBidHook(auctionSpy, {adUnits})
+          .then(() => {
+            // should not delay auction
+            auctionSpy.calledOnce.should.equal(true);
+
+            // check user sync is delayed after auction is ended
+            mockIdCallback.calledOnce.should.equal(false);
+            events.on.calledOnce.should.equal(true);
+            events.on.calledWith(CONSTANTS.EVENTS.AUCTION_END, sinon.match.func);
+
+            // once auction is ended, sync user ids after delay
+            events.on.callArg(1);
+            callbackDelay.calledWith(77);
+            mockIdCallback.calledOnce.should.equal(false);
+
+            return callbackDelay.resolve();
+          }).then(() => {
+            // once sync delay is over, ids should be fetched
+            mockIdCallback.calledOnce.should.equal(true);
+          });
       });
 
       it('does not delay user id sync after auction ends if set to 0', function () {
@@ -919,21 +988,23 @@ describe('User ID', function () {
 
         expect(syncDelay).to.equal(0);
 
-        requestBidsHook(auctionSpy, {adUnits});
-
-        // auction should not be delayed
-        global.setTimeout.calledOnce.should.equal(false);
-        auctionSpy.calledOnce.should.equal(true);
-
-        // sync delay after auction is ended
-        mockIdCallback.calledOnce.should.equal(false);
-        events.on.calledOnce.should.equal(true);
-        events.on.calledWith(CONSTANTS.EVENTS.AUCTION_END, sinon.match.func);
-
-        // once auction is ended, if no sync delay, fetch ids
-        events.on.callArg(1);
-        global.setTimeout.calledOnce.should.equal(false);
-        mockIdCallback.calledOnce.should.equal(true);
+        return expectImmediateBidHook(auctionSpy, {adUnits})
+          .then(() => {
+            // auction should not be delayed
+            auctionSpy.calledOnce.should.equal(true);
+
+            // sync delay after auction is ended
+            mockIdCallback.calledOnce.should.equal(false);
+            events.on.calledOnce.should.equal(true);
+            events.on.calledWith(CONSTANTS.EVENTS.AUCTION_END, sinon.match.func);
+
+            // once auction is ended, if no sync delay, fetch ids
+            events.on.callArg(1);
+            callbackDelay.calledWith(0);
+            return callbackDelay.resolve();
+          }).then(() => {
+            mockIdCallback.calledOnce.should.equal(true);
+          });
       });
 
       it('does not delay auction if there are no ids to fetch', function () {
@@ -948,14 +1019,13 @@ describe('User ID', function () {
           }
         });
 
-        requestBidsHook(auctionSpy, {adUnits});
-
-        global.setTimeout.calledOnce.should.equal(false);
-        auctionSpy.calledOnce.should.equal(true);
-        mockIdCallback.calledOnce.should.equal(false);
+        return runBidsHook(auctionSpy, {adUnits}).then(() => {
+          auctionSpy.calledOnce.should.equal(true);
+          mockIdCallback.calledOnce.should.equal(false);
 
-        // no sync after auction ends
-        events.on.called.should.equal(false);
+          // no sync after auction ends
+          events.on.called.should.equal(false);
+        });
       });
     });
 
@@ -969,8 +1039,8 @@ describe('User ID', function () {
       it('test hook from pubcommonid cookie', function (done) {
         coreStorage.setCookie('pubcid', 'testpubcid', (new Date(Date.now() + 100000).toUTCString()));
 
-        setSubmoduleRegistry([sharedIdSystemSubmodule]);
         init(config);
+        setSubmoduleRegistry([sharedIdSystemSubmodule]);
         config.setConfig(getConfigMock(['pubCommonId', 'pubcid', 'cookie']));
 
         requestBidsHook(function () {
@@ -994,8 +1064,8 @@ describe('User ID', function () {
         localStorage.setItem('pubcid', 'testpubcid');
         localStorage.setItem('pubcid_exp', new Date(Date.now() + 100000).toUTCString());
 
-        setSubmoduleRegistry([sharedIdSystemSubmodule]);
         init(config);
+        setSubmoduleRegistry([sharedIdSystemSubmodule]);
         config.setConfig(getConfigMock(['pubCommonId', 'pubcid', 'html5']));
 
         requestBidsHook(function () {
@@ -1016,8 +1086,8 @@ describe('User ID', function () {
       });
 
       it('test hook from pubcommonid config value object', function (done) {
-        setSubmoduleRegistry([sharedIdSystemSubmodule]);
         init(config);
+        setSubmoduleRegistry([sharedIdSystemSubmodule]);
         config.setConfig(getConfigValueMock('pubCommonId', {'pubcidvalue': 'testpubcidvalue'}));
 
         requestBidsHook(function () {
@@ -1037,8 +1107,8 @@ describe('User ID', function () {
         localStorage.setItem('unifiedid_alt', JSON.stringify({'TDID': 'testunifiedid_alt'}));
         localStorage.setItem('unifiedid_alt_exp', '');
 
-        setSubmoduleRegistry([unifiedIdSubmodule]);
         init(config);
+        setSubmoduleRegistry([unifiedIdSubmodule]);
         config.setConfig(getConfigMock(['unifiedId', 'unifiedid_alt', 'html5']));
 
         requestBidsHook(function () {
@@ -1063,8 +1133,8 @@ describe('User ID', function () {
         localStorage.setItem('amxId', 'test_amxid_id');
         localStorage.setItem('amxId_exp', '');
 
-        setSubmoduleRegistry([amxIdSubmodule]);
         init(config);
+        setSubmoduleRegistry([amxIdSubmodule]);
         config.setConfig(getConfigMock(['amxId', 'amxId', 'html5']));
 
         requestBidsHook(() => {
@@ -1094,8 +1164,8 @@ describe('User ID', function () {
         localStorage.setItem('idl_env', 'AiGNC8Z5ONyZKSpIPf');
         localStorage.setItem('idl_env_exp', '');
 
-        setSubmoduleRegistry([identityLinkSubmodule]);
         init(config);
+        setSubmoduleRegistry([identityLinkSubmodule]);
         config.setConfig(getConfigMock(['identityLink', 'idl_env', 'html5']));
         requestBidsHook(function () {
           adUnits.forEach(unit => {
@@ -1117,8 +1187,8 @@ describe('User ID', function () {
       it('test hook from identityLink cookie', function (done) {
         coreStorage.setCookie('idl_env', 'AiGNC8Z5ONyZKSpIPf', (new Date(Date.now() + 100000).toUTCString()));
 
-        setSubmoduleRegistry([identityLinkSubmodule]);
         init(config);
+        setSubmoduleRegistry([identityLinkSubmodule]);
         config.setConfig(getConfigMock(['identityLink', 'idl_env', 'cookie']));
 
         requestBidsHook(function () {
@@ -1140,8 +1210,8 @@ describe('User ID', function () {
       it('test hook from criteoIdModule cookie', function (done) {
         coreStorage.setCookie('storage_bidid', JSON.stringify({'criteoId': 'test_bidid'}), (new Date(Date.now() + 100000).toUTCString()));
 
-        setSubmoduleRegistry([criteoIdSubmodule]);
         init(config);
+        setSubmoduleRegistry([criteoIdSubmodule]);
         config.setConfig(getConfigMock(['criteo', 'storage_bidid', 'cookie']));
 
         requestBidsHook(function () {
@@ -1163,8 +1233,8 @@ describe('User ID', function () {
       it('test hook from tapadIdModule cookie', function (done) {
         coreStorage.setCookie('tapad_id', 'test-tapad-id', (new Date(Date.now() + 100000).toUTCString()));
 
-        setSubmoduleRegistry([tapadIdSubmodule]);
         init(config);
+        setSubmoduleRegistry([tapadIdSubmodule]);
         config.setConfig(getConfigMock(['tapadId', 'tapad_id', 'cookie']));
 
         requestBidsHook(function () {
@@ -1188,9 +1258,10 @@ describe('User ID', function () {
         localStorage.setItem('_li_pbid', JSON.stringify({'unifiedId': 'random-ls-identifier'}));
         localStorage.setItem('_li_pbid_exp', '');
 
-        setSubmoduleRegistry([liveIntentIdSubmodule]);
         init(config);
+        setSubmoduleRegistry([liveIntentIdSubmodule]);
         config.setConfig(getConfigMock(['liveIntentId', '_li_pbid', 'html5']));
+
         requestBidsHook(function () {
           adUnits.forEach(unit => {
             unit.bids.forEach(bid => {
@@ -1212,8 +1283,8 @@ describe('User ID', function () {
         // simulate existing browser local storage values
         coreStorage.setCookie('kpuid', 'KINESSO_ID', (new Date(Date.now() + 5000).toUTCString()));
 
-        setSubmoduleRegistry([kinessoIdSubmodule]);
         init(config);
+        setSubmoduleRegistry([kinessoIdSubmodule]);
         config.setConfig(getConfigMock(['kpuid', 'kpuid', 'cookie']));
 
         requestBidsHook(function () {
@@ -1237,8 +1308,8 @@ describe('User ID', function () {
         localStorage.setItem('kpuid', 'KINESSO_ID');
         localStorage.setItem('kpuid_exp', '');
 
-        setSubmoduleRegistry([kinessoIdSubmodule]);
         init(config);
+        setSubmoduleRegistry([kinessoIdSubmodule]);
         config.setConfig(getConfigMock(['kpuid', 'kpuid', 'html5']));
 
         requestBidsHook(function () {
@@ -1261,8 +1332,8 @@ describe('User ID', function () {
       it('test hook from liveIntentId cookie', function (done) {
         coreStorage.setCookie('_li_pbid', JSON.stringify({'unifiedId': 'random-cookie-identifier'}), (new Date(Date.now() + 100000).toUTCString()));
 
-        setSubmoduleRegistry([liveIntentIdSubmodule]);
         init(config);
+        setSubmoduleRegistry([liveIntentIdSubmodule]);
         config.setConfig(getConfigMock(['liveIntentId', '_li_pbid', 'cookie']));
 
         requestBidsHook(function () {
@@ -1284,12 +1355,12 @@ describe('User ID', function () {
       it('eidPermissions fun with bidders', function (done) {
         coreStorage.setCookie('pubcid', 'test222', (new Date(Date.now() + 5000).toUTCString()));
 
+        init(config);
         setSubmoduleRegistry([sharedIdSystemSubmodule]);
         let eidPermissions;
         getPrebidInternal().setEidPermissions = function (newEidPermissions) {
           eidPermissions = newEidPermissions;
         }
-        init(config);
         config.setConfig({
           userSync: {
             syncDelay: 0,
@@ -1350,12 +1421,12 @@ describe('User ID', function () {
       it('eidPermissions fun without bidders', function (done) {
         coreStorage.setCookie('pubcid', 'test222', new Date(Date.now() + 5000).toUTCString());
 
+        init(config);
         setSubmoduleRegistry([sharedIdSystemSubmodule]);
         let eidPermissions;
         getPrebidInternal().setEidPermissions = function (newEidPermissions) {
           eidPermissions = newEidPermissions;
         }
-        init(config);
         config.setConfig({
           userSync: {
             syncDelay: 0,
@@ -1397,8 +1468,8 @@ describe('User ID', function () {
       });
 
       it('test hook from pubProvidedId config params', function (done) {
-        setSubmoduleRegistry([pubProvidedIdSubmodule]);
         init(config);
+        setSubmoduleRegistry([pubProvidedIdSubmodule]);
         config.setConfig({
           userSync: {
             syncDelay: 0,
@@ -1498,8 +1569,8 @@ describe('User ID', function () {
         localStorage.setItem('_li_pbid', JSON.stringify({'unifiedId': 'random-ls-identifier', 'segments': ['123']}));
         localStorage.setItem('_li_pbid_exp', '');
 
-        setSubmoduleRegistry([liveIntentIdSubmodule]);
         init(config);
+        setSubmoduleRegistry([liveIntentIdSubmodule]);
         config.setConfig(getConfigMock(['liveIntentId', '_li_pbid', 'html5']));
         requestBidsHook(function () {
           adUnits.forEach(unit => {
@@ -1526,8 +1597,8 @@ describe('User ID', function () {
           'segments': ['123']
         }), (new Date(Date.now() + 100000).toUTCString()));
 
-        setSubmoduleRegistry([liveIntentIdSubmodule]);
         init(config);
+        setSubmoduleRegistry([liveIntentIdSubmodule]);
         config.setConfig(getConfigMock(['liveIntentId', '_li_pbid', 'cookie']));
 
         requestBidsHook(function () {
@@ -1552,8 +1623,8 @@ describe('User ID', function () {
         // simulate existing browser local storage values
         coreStorage.setCookie('britepoolid', JSON.stringify({'primaryBPID': '279c0161-5152-487f-809e-05d7f7e653fd'}), (new Date(Date.now() + 5000).toUTCString()));
 
-        setSubmoduleRegistry([britepoolIdSubmodule]);
         init(config);
+        setSubmoduleRegistry([britepoolIdSubmodule]);
         config.setConfig(getConfigMock(['britepoolId', 'britepoolid', 'cookie']));
 
         requestBidsHook(function () {
@@ -1576,8 +1647,8 @@ describe('User ID', function () {
         // simulate existing browser local storage values
         coreStorage.setCookie('dmdId', 'testdmdId', (new Date(Date.now() + 5000).toUTCString()));
 
-        setSubmoduleRegistry([dmdIdSubmodule]);
         init(config);
+        setSubmoduleRegistry([dmdIdSubmodule]);
         config.setConfig(getConfigMock(['dmdId', 'dmdId', 'cookie']));
 
         requestBidsHook(function () {
@@ -1600,8 +1671,8 @@ describe('User ID', function () {
         // simulate existing browser local storage values
         coreStorage.setCookie('netId', JSON.stringify({'netId': 'fH5A3n2O8_CZZyPoJVD-eabc6ECb7jhxCicsds7qSg'}), (new Date(Date.now() + 5000).toUTCString()));
 
-        setSubmoduleRegistry([netIdSubmodule]);
         init(config);
+        setSubmoduleRegistry([netIdSubmodule]);
         config.setConfig(getConfigMock(['netId', 'netId', 'cookie']));
 
         requestBidsHook(function () {
@@ -1624,8 +1695,8 @@ describe('User ID', function () {
         // simulate existing browser local storage values
         coreStorage.setCookie('intentIqId', 'abcdefghijk', (new Date(Date.now() + 5000).toUTCString()));
 
-        setSubmoduleRegistry([intentIqIdSubmodule]);
         init(config);
+        setSubmoduleRegistry([intentIqIdSubmodule]);
         config.setConfig(getConfigMock(['intentIqId', 'intentIqId', 'cookie']));
 
         requestBidsHook(function () {
@@ -1649,8 +1720,8 @@ describe('User ID', function () {
         localStorage.setItem('hadronId', JSON.stringify({'hadronId': 'random-ls-identifier'}));
         localStorage.setItem('hadronId_exp', '');
 
-        setSubmoduleRegistry([hadronIdSubmodule]);
         init(config);
+        setSubmoduleRegistry([hadronIdSubmodule]);
         config.setConfig(getConfigMock(['hadronId', 'hadronId', 'html5']));
 
         requestBidsHook(function () {
@@ -1674,8 +1745,8 @@ describe('User ID', function () {
         // simulate existing browser local storage values
         coreStorage.setCookie('merkleId', JSON.stringify({'pam_id': {'id': 'testmerkleId', 'keyID': 1}}), (new Date(Date.now() + 5000).toUTCString()));
 
-        setSubmoduleRegistry([merkleIdSubmodule]);
         init(config);
+        setSubmoduleRegistry([merkleIdSubmodule]);
         config.setConfig(getConfigMock(['merkleId', 'merkleId', 'cookie']));
 
         requestBidsHook(function () {
@@ -1698,8 +1769,8 @@ describe('User ID', function () {
         // simulate existing browser local storage values
         coreStorage.setCookie('IDP', btoa(JSON.stringify('abcdefghijk')), (new Date(Date.now() + 5000).toUTCString()));
 
-        setSubmoduleRegistry([zeotapIdPlusSubmodule]);
         init(config);
+        setSubmoduleRegistry([zeotapIdPlusSubmodule]);
         config.setConfig(getConfigMock(['zeotapIdPlus', 'IDP', 'cookie']));
 
         requestBidsHook(function () {
@@ -1722,8 +1793,8 @@ describe('User ID', function () {
         // simulate existing browser local storage values
         coreStorage.setCookie('mwol', JSON.stringify({eid: 'XX-YY-ZZ-123'}), (new Date(Date.now() + 5000).toUTCString()));
 
-        setSubmoduleRegistry([mwOpenLinkIdSubModule]);
         init(config);
+        setSubmoduleRegistry([mwOpenLinkIdSubModule]);
         config.setConfig(getConfigMock(['mwOpenLinkId', 'mwol', 'cookie']));
 
         requestBidsHook(function () {
@@ -1743,8 +1814,8 @@ describe('User ID', function () {
         localStorage.setItem('admixerId', 'testadmixerId');
         localStorage.setItem('admixerId_exp', '');
 
-        setSubmoduleRegistry([admixerIdSubmodule]);
         init(config);
+        setSubmoduleRegistry([admixerIdSubmodule]);
         config.setConfig(getConfigMock(['admixerId', 'admixerId', 'html5']));
         requestBidsHook(function () {
           adUnits.forEach(unit => {
@@ -1765,8 +1836,8 @@ describe('User ID', function () {
       it('test hook from admixerId cookie', function (done) {
         coreStorage.setCookie('admixerId', 'testadmixerId', (new Date(Date.now() + 100000).toUTCString()));
 
-        setSubmoduleRegistry([admixerIdSubmodule]);
         init(config);
+        setSubmoduleRegistry([admixerIdSubmodule]);
         config.setConfig(getConfigMock(['admixerId', 'admixerId', 'cookie']));
 
         requestBidsHook(function () {
@@ -1789,8 +1860,8 @@ describe('User ID', function () {
         // simulate existing browser local storage values
         coreStorage.setCookie('deepintentId', 'testdeepintentId', (new Date(Date.now() + 5000).toUTCString()));
 
-        setSubmoduleRegistry([deepintentDpesSubmodule]);
         init(config);
+        setSubmoduleRegistry([deepintentDpesSubmodule]);
         config.setConfig(getConfigMock(['deepintentId', 'deepintentId', 'cookie']));
 
         requestBidsHook(function () {
@@ -1814,8 +1885,8 @@ describe('User ID', function () {
         localStorage.setItem('deepintentId', 'testdeepintentId');
         localStorage.setItem('deepintentId_exp', '');
 
-        setSubmoduleRegistry([deepintentDpesSubmodule]);
         init(config);
+        setSubmoduleRegistry([deepintentDpesSubmodule]);
         config.setConfig(getConfigMock(['deepintentId', 'deepintentId', 'html5']));
         requestBidsHook(function () {
           adUnits.forEach(unit => {
@@ -1837,8 +1908,8 @@ describe('User ID', function () {
         localStorage.setItem('qid', 'testqid');
         localStorage.setItem('qid_exp', '');
 
-        setSubmoduleRegistry([adqueryIdSubmodule]);
         init(config);
+        setSubmoduleRegistry([adqueryIdSubmodule]);
         config.setConfig(getConfigMock(['qid', 'qid', 'html5']));
 
         requestBidsHook(() => {
@@ -1886,8 +1957,8 @@ describe('User ID', function () {
         // qid only supports localStorage
         localStorage.setItem('qid', 'testqid');
         localStorage.setItem('qid_exp', (new Date(Date.now() + 5000)).toUTCString());
-        setSubmoduleRegistry([sharedIdSystemSubmodule, unifiedIdSubmodule, id5IdSubmodule, identityLinkSubmodule, britepoolIdSubmodule, netIdSubmodule, intentIqIdSubmodule, zeotapIdPlusSubmodule, hadronIdSubmodule, criteoIdSubmodule, mwOpenLinkIdSubModule, tapadIdSubmodule, uid2IdSubmodule, admixerIdSubmodule, deepintentDpesSubmodule, dmdIdSubmodule, amxIdSubmodule, kinessoIdSubmodule, adqueryIdSubmodule]);
         init(config);
+        setSubmoduleRegistry([sharedIdSystemSubmodule, unifiedIdSubmodule, id5IdSubmodule, identityLinkSubmodule, britepoolIdSubmodule, netIdSubmodule, intentIqIdSubmodule, zeotapIdPlusSubmodule, hadronIdSubmodule, criteoIdSubmodule, mwOpenLinkIdSubModule, tapadIdSubmodule, uid2IdSubmodule, admixerIdSubmodule, deepintentDpesSubmodule, dmdIdSubmodule, amxIdSubmodule, kinessoIdSubmodule, adqueryIdSubmodule]);
         config.setConfig(getConfigMock(['pubCommonId', 'pubcid', 'cookie'],
           ['unifiedId', 'unifiedid', 'cookie'],
           ['id5Id', 'id5id', 'cookie'],
@@ -1994,150 +2065,11 @@ describe('User ID', function () {
         }, {adUnits});
       });
 
-      it('test hook when pubCommonId, unifiedId, id5Id, britepoolId, dmdId, intentIqId, zeotapIdPlus, criteo, netId, hadronId, UID 2.0, admixerId, kpuid and mwOpenLinkId have their modules added before and after init', function (done) {
-        coreStorage.setCookie('pubcid', 'testpubcid', (new Date(Date.now() + 5000).toUTCString()));
-        coreStorage.setCookie('unifiedid', JSON.stringify({'TDID': 'cookie-value-add-module-variations'}), new Date(Date.now() + 5000).toUTCString());
-        coreStorage.setCookie('id5id', JSON.stringify({'universal_uid': 'testid5id'}), (new Date(Date.now() + 5000).toUTCString()));
-        coreStorage.setCookie('idl_env', 'AiGNC8Z5ONyZKSpIPf', new Date(Date.now() + 5000).toUTCString());
-        coreStorage.setCookie('britepoolid', JSON.stringify({'primaryBPID': 'testbritepoolid'}), (new Date(Date.now() + 5000).toUTCString()));
-        coreStorage.setCookie('netId', JSON.stringify({'netId': 'testnetId'}), (new Date(Date.now() + 5000).toUTCString()));
-        coreStorage.setCookie('intentIqId', 'testintentIqId', (new Date(Date.now() + 5000).toUTCString()));
-        coreStorage.setCookie('IDP', btoa(JSON.stringify('zeotapId')), (new Date(Date.now() + 5000).toUTCString()));
-        coreStorage.setCookie('hadronId', JSON.stringify({'hadronId': 'testHadronId'}), (new Date(Date.now() + 5000).toUTCString()));
-        coreStorage.setCookie('dmdId', 'testdmdId', (new Date(Date.now() + 5000).toUTCString()));
-        coreStorage.setCookie('storage_criteo', JSON.stringify({'criteoId': 'test_bidid'}), (new Date(Date.now() + 5000).toUTCString()));
-        coreStorage.setCookie('mwol', JSON.stringify({eid: 'XX-YY-ZZ-123'}), (new Date(Date.now() + 5000).toUTCString()));
-        coreStorage.setCookie('uid2id', 'Sample_AD_Token', (new Date(Date.now() + 5000).toUTCString()));
-        coreStorage.setCookie('admixerId', 'testadmixerId', (new Date(Date.now() + 5000).toUTCString()));
-        coreStorage.setCookie('deepintentId', 'testdeepintentId', (new Date(Date.now() + 5000).toUTCString()));
-        coreStorage.setCookie('kpuid', 'KINESSO_ID', (new Date(Date.now() + 5000).toUTCString()));
-
-        setSubmoduleRegistry([]);
-
-        // attaching before init
-        attachIdSystem(sharedIdSystemSubmodule);
-
-        init(config);
-
-        // attaching after init
-        attachIdSystem(unifiedIdSubmodule);
-        attachIdSystem(id5IdSubmodule);
-        attachIdSystem(identityLinkSubmodule);
-        attachIdSystem(britepoolIdSubmodule);
-        attachIdSystem(netIdSubmodule);
-        attachIdSystem(intentIqIdSubmodule);
-        attachIdSystem(zeotapIdPlusSubmodule);
-        attachIdSystem(hadronIdSubmodule);
-        attachIdSystem(dmdIdSubmodule);
-        attachIdSystem(criteoIdSubmodule);
-        attachIdSystem(mwOpenLinkIdSubModule);
-        attachIdSystem(tapadIdSubmodule);
-        attachIdSystem(uid2IdSubmodule);
-        attachIdSystem(admixerIdSubmodule);
-        attachIdSystem(deepintentDpesSubmodule);
-        attachIdSystem(kinessoIdSubmodule);
-
-        config.setConfig(getConfigMock(['pubCommonId', 'pubcid', 'cookie'],
-          ['unifiedId', 'unifiedid', 'cookie'],
-          ['id5Id', 'id5id', 'cookie'],
-          ['identityLink', 'idl_env', 'cookie'],
-          ['britepoolId', 'britepoolid', 'cookie'],
-          ['netId', 'netId', 'cookie'],
-          ['intentIqId', 'intentIqId', 'cookie'],
-          ['zeotapIdPlus', 'IDP', 'cookie'],
-          ['hadronId', 'hadronId', 'cookie'],
-          ['dmdId', 'dmdId', 'cookie'],
-          ['criteo', 'storage_criteo', 'cookie'],
-          ['mwOpenLinkId', 'mwol', 'cookie'],
-          ['tapadId', 'tapad_id', 'cookie'],
-          ['uid2', 'uid2id', 'cookie'],
-          ['admixerId', 'admixerId', 'cookie'],
-          ['deepintentId', 'deepintentId', 'cookie'],
-          ['kpuid', 'kpuid', 'cookie']));
-
-        requestBidsHook(function () {
-          adUnits.forEach(unit => {
-            unit.bids.forEach(bid => {
-              // verify that the PubCommonId id data was copied to bid
-              expect(bid).to.have.deep.nested.property('userId.pubcid');
-              expect(bid.userId.pubcid).to.equal('testpubcid');
-              // also check that UnifiedId id data was copied to bid
-              expect(bid).to.have.deep.nested.property('userId.tdid');
-              expect(bid.userId.tdid).to.equal('cookie-value-add-module-variations');
-              // also check that Id5Id id data was copied to bid
-              expect(bid).to.have.deep.nested.property('userId.id5id.uid');
-              expect(bid.userId.id5id.uid).to.equal('testid5id');
-              // also check that identityLink id data was copied to bid
-              expect(bid).to.have.deep.nested.property('userId.idl_env');
-              expect(bid.userId.idl_env).to.equal('AiGNC8Z5ONyZKSpIPf');
-              // also check that britepoolId id data was copied to bid
-              expect(bid).to.have.deep.nested.property('userId.britepoolid');
-              expect(bid.userId.britepoolid).to.equal('testbritepoolid');
-              // also check that britepoolId id data was copied to bid
-              expect(bid).to.have.deep.nested.property('userId.netId');
-              expect(bid.userId.netId).to.equal('testnetId');
-              // also check that intentIqId id data was copied to bid
-              expect(bid).to.have.deep.nested.property('userId.intentIqId');
-              expect(bid.userId.intentIqId).to.equal('testintentIqId');
-
-              // also check that zeotapIdPlus id data was copied to bid
-              expect(bid).to.have.deep.nested.property('userId.IDP');
-              expect(bid.userId.IDP).to.equal('zeotapId');
-              // also check that hadronId id data was copied to bid
-              expect(bid).to.have.deep.nested.property('userId.hadronId');
-              expect(bid.userId.hadronId).to.equal('testHadronId');
-              // also check that dmdId id data was copied to bid
-              expect(bid).to.have.deep.nested.property('userId.dmdId');
-              expect(bid.userId.dmdId).to.equal('testdmdId');
-
-              // also check that criteo id data was copied to bid
-              expect(bid).to.have.deep.nested.property('userId.criteoId');
-              expect(bid.userId.criteoId).to.equal('test_bidid');
-
-              // also check that mwOpenLink id data was copied to bid
-              expect(bid).to.have.deep.nested.property('userId.mwOpenLinkId');
-              expect(bid.userId.mwOpenLinkId).to.equal('XX-YY-ZZ-123')
-              expect(bid.userId.uid2).to.deep.equal({
-                id: 'Sample_AD_Token'
-              });
-
-              // also check that admixerId id data was copied to bid
-              expect(bid).to.have.deep.nested.property('userId.admixerId');
-              expect(bid.userId.admixerId).to.equal('testadmixerId');
-              // also check that deepintentId was copied to bid
-              expect(bid).to.have.deep.nested.property('userId.deepintentId');
-              expect(bid.userId.deepintentId).to.equal('testdeepintentId');
-              expect(bid).to.have.deep.nested.property('userId.kpuid');
-              expect(bid.userId.kpuid).to.equal('KINESSO_ID');
-
-              expect(bid.userIdAsEids.length).to.equal(16);
-            });
-          });
-          coreStorage.setCookie('pubcid', '', EXPIRED_COOKIE_DATE);
-          coreStorage.setCookie('unifiedid', '', EXPIRED_COOKIE_DATE);
-          coreStorage.setCookie('id5id', '', EXPIRED_COOKIE_DATE);
-          coreStorage.setCookie('idl_env', '', EXPIRED_COOKIE_DATE);
-          coreStorage.setCookie('britepoolid', '', EXPIRED_COOKIE_DATE);
-          coreStorage.setCookie('netId', '', EXPIRED_COOKIE_DATE);
-          coreStorage.setCookie('intentIqId', '', EXPIRED_COOKIE_DATE);
-          coreStorage.setCookie('IDP', '', EXPIRED_COOKIE_DATE);
-          coreStorage.setCookie('hadronId', '', EXPIRED_COOKIE_DATE);
-          coreStorage.setCookie('dmdId', '', EXPIRED_COOKIE_DATE);
-          coreStorage.setCookie('storage_criteo', '', EXPIRED_COOKIE_DATE);
-          coreStorage.setCookie('mwol', '', EXPIRED_COOKIE_DATE);
-          coreStorage.setCookie('uid2id', '', EXPIRED_COOKIE_DATE);
-          coreStorage.setCookie('admixerId', '', EXPIRED_COOKIE_DATE);
-          coreStorage.setCookie('deepintentId', '', EXPIRED_COOKIE_DATE);
-          coreStorage.setCookie('kpuid', EXPIRED_COOKIE_DATE);
-          done();
-        }, {adUnits});
-      });
-
       it('test hook from UID2 cookie', function (done) {
         coreStorage.setCookie('uid2id', 'Sample_AD_Token', (new Date(Date.now() + 5000).toUTCString()));
 
-        setSubmoduleRegistry([uid2IdSubmodule]);
         init(config);
+        setSubmoduleRegistry([uid2IdSubmodule]);
         config.setConfig(getConfigMock(['uid2', 'uid2id', 'cookie']));
 
         requestBidsHook(function () {
@@ -2182,8 +2114,8 @@ describe('User ID', function () {
         localStorage.setItem('qid', 'testqid');
         localStorage.setItem('qid_exp', new Date(Date.now() + 5000).toUTCString())
 
-        setSubmoduleRegistry([sharedIdSystemSubmodule, unifiedIdSubmodule, id5IdSubmodule, identityLinkSubmodule, britepoolIdSubmodule, netIdSubmodule, intentIqIdSubmodule, zeotapIdPlusSubmodule, hadronIdSubmodule, uid2IdSubmodule, admixerIdSubmodule, deepintentDpesSubmodule, dmdIdSubmodule, akamaiDAPIdSubmodule, amxIdSubmodule, kinessoIdSubmodule, adqueryIdSubmodule]);
         init(config);
+        setSubmoduleRegistry([sharedIdSystemSubmodule, unifiedIdSubmodule, id5IdSubmodule, identityLinkSubmodule, britepoolIdSubmodule, netIdSubmodule, intentIqIdSubmodule, zeotapIdPlusSubmodule, hadronIdSubmodule, uid2IdSubmodule, admixerIdSubmodule, deepintentDpesSubmodule, dmdIdSubmodule, akamaiDAPIdSubmodule, amxIdSubmodule, kinessoIdSubmodule, adqueryIdSubmodule]);
 
         config.setConfig({
           userSync: {
@@ -2340,22 +2272,28 @@ describe('User ID', function () {
         delete window.__tcfapi;
       });
 
+      function endAuction() {
+        events.emit(CONSTANTS.EVENTS.AUCTION_END, {});
+        return new Promise((resolve) => setTimeout(resolve));
+      }
+
       it('pubcid callback with url', function () {
         let adUnits = [getAdUnitMock()];
         let innerAdUnits;
         let customCfg = getConfigMock(['pubCommonId', 'pubcid', 'cookie']);
         customCfg = addConfig(customCfg, 'params', {pixelUrl: '/any/pubcid/url'});
 
-        setSubmoduleRegistry([sharedIdSystemSubmodule, unifiedIdSubmodule]);
         init(config);
+        setSubmoduleRegistry([sharedIdSystemSubmodule, unifiedIdSubmodule]);
         config.setConfig(customCfg);
-        requestBidsHook((config) => {
+        return runBidsHook((config) => {
           innerAdUnits = config.adUnits
-        }, {adUnits});
-
-        expect(utils.triggerPixel.called).to.be.false;
-        events.emit(CONSTANTS.EVENTS.AUCTION_END, {});
-        expect(utils.triggerPixel.getCall(0).args[0]).to.include('/any/pubcid/url');
+        }, {adUnits}).then(() => {
+          expect(utils.triggerPixel.called).to.be.false;
+          return endAuction();
+        }).then(() => {
+          expect(utils.triggerPixel.getCall(0).args[0]).to.include('/any/pubcid/url');
+        });
       });
 
       it('unifiedid callback with url', function () {
@@ -2364,16 +2302,17 @@ describe('User ID', function () {
         let customCfg = getConfigMock(['unifiedId', 'unifiedid', 'cookie']);
         addConfig(customCfg, 'params', {url: '/any/unifiedid/url'});
 
-        setSubmoduleRegistry([sharedIdSystemSubmodule, unifiedIdSubmodule]);
         init(config);
+        setSubmoduleRegistry([sharedIdSystemSubmodule, unifiedIdSubmodule]);
         config.setConfig(customCfg);
-        requestBidsHook((config) => {
+        return runBidsHook((config) => {
           innerAdUnits = config.adUnits
-        }, {adUnits});
-
-        expect(server.requests).to.be.empty;
-        events.emit(CONSTANTS.EVENTS.AUCTION_END, {});
-        expect(server.requests[0].url).to.equal('/any/unifiedid/url');
+        }, {adUnits}).then(() => {
+          expect(server.requests).to.be.empty;
+          return endAuction();
+        }).then(() => {
+          expect(server.requests[0].url).to.equal('/any/unifiedid/url');
+        });
       });
 
       it('unifiedid callback with partner', function () {
@@ -2382,16 +2321,17 @@ describe('User ID', function () {
         let customCfg = getConfigMock(['unifiedId', 'unifiedid', 'cookie']);
         addConfig(customCfg, 'params', {partner: 'rubicon'});
 
-        setSubmoduleRegistry([sharedIdSystemSubmodule, unifiedIdSubmodule]);
         init(config);
+        setSubmoduleRegistry([sharedIdSystemSubmodule, unifiedIdSubmodule]);
         config.setConfig(customCfg);
-        requestBidsHook((config) => {
+        return runBidsHook((config) => {
           innerAdUnits = config.adUnits
-        }, {adUnits});
-
-        expect(server.requests).to.be.empty;
-        events.emit(CONSTANTS.EVENTS.AUCTION_END, {});
-        expect(server.requests[0].url).to.equal('https://match.adsrvr.org/track/rid?ttd_pid=rubicon&fmt=json');
+        }, {adUnits}).then(() => {
+          expect(server.requests).to.be.empty;
+          return endAuction();
+        }).then(() => {
+          expect(server.requests[0].url).to.equal('https://match.adsrvr.org/track/rid?ttd_pid=rubicon&fmt=json');
+        });
       });
     });
 
@@ -2439,40 +2379,44 @@ describe('User ID', function () {
     describe('Consent changes determine getId refreshes', function () {
       let expStr;
       let adUnits;
+      let mockGetId;
+      let mockDecode;
+      let mockExtendId;
+      let mockIdSystem;
+      let userIdConfig;
 
       const mockIdCookieName = 'MOCKID';
-      let mockGetId = sinon.stub();
-      let mockDecode = sinon.stub();
-      let mockExtendId = sinon.stub();
-      const mockIdSystem = {
-        name: 'mockId',
-        getId: mockGetId,
-        decode: mockDecode,
-        extendId: mockExtendId
-      };
-      const userIdConfig = {
-        userSync: {
-          userIds: [{
-            name: 'mockId',
-            storage: {
-              name: 'MOCKID',
-              type: 'cookie',
-              refreshInSeconds: 30
-            }
-          }],
-          auctionDelay: 5
-        }
-      };
 
-      let cmpStub;
-      let testConsentData;
-      const consentConfig = {
-        cmpApi: 'iab',
-        timeout: 7500,
-        allowAuctionWithoutConsent: false
-      };
+      beforeEach(function () {
+        mockGetId = sinon.stub();
+        mockDecode = sinon.stub();
+        mockExtendId = sinon.stub();
+        mockIdSystem = {
+          name: 'mockId',
+          getId: mockGetId,
+          decode: mockDecode,
+          extendId: mockExtendId
+        };
+        userIdConfig = {
+          userSync: {
+            userIds: [{
+              name: 'mockId',
+              storage: {
+                name: 'MOCKID',
+                type: 'cookie',
+                refreshInSeconds: 30
+              }
+            }],
+            auctionDelay: 5
+          }
+        };
 
-      const sharedBeforeFunction = function () {
+        consentData = {
+          gdprApplies: true,
+          consentString: 'mockString',
+          apiVersion: 1,
+          hasValidated: true // mock presence of GPDR enforcement module
+        }
         // clear cookies
         expStr = (new Date(Date.now() + 25000).toUTCString());
         coreStorage.setCookie(mockIdCookieName, '', EXPIRED_COOKIE_DATE);
@@ -2486,223 +2430,189 @@ describe('User ID', function () {
         // init id system
         attachIdSystem(mockIdSystem);
         config.setConfig(userIdConfig);
-      }
-      const sharedAfterFunction = function () {
-        config.resetConfig();
-        mockGetId.reset();
-        mockDecode.reset();
-        mockExtendId.reset();
-        cmpStub.restore();
-        resetConsentData();
-        delete window.__cmp;
-        delete window.__tcfapi;
-      };
-
-      describe('TCF v1', function () {
-        testConsentData = {
-          gdprApplies: true,
-          consentData: 'xyz',
-          apiVersion: 1
-        };
-
-        beforeEach(function () {
-          sharedBeforeFunction();
-
-          // init v1 consent management
-          window.__cmp = function () {
-          };
-          delete window.__tcfapi;
-          cmpStub = sinon.stub(window, '__cmp').callsFake((...args) => {
-            args[2](testConsentData);
-          });
-          setConsentConfig(consentConfig);
-        });
-
-        afterEach(function () {
-          sharedAfterFunction();
-        });
+      });
 
-        it('calls getId if no stored consent data and refresh is not needed', function () {
-          coreStorage.setCookie(mockIdCookieName, JSON.stringify({id: '1234'}), expStr);
-          coreStorage.setCookie(`${mockIdCookieName}_last`, (new Date(Date.now() - 1 * 1000).toUTCString()), expStr);
+      afterEach(function () {
+        config.resetConfig();
+      });
 
-          let innerAdUnits;
-          consentManagementRequestBidsHook(() => {
-          }, {});
-          requestBidsHook((config) => {
-            innerAdUnits = config.adUnits
-          }, {adUnits});
+      it('calls getId if no stored consent data and refresh is not needed', function () {
+        coreStorage.setCookie(mockIdCookieName, JSON.stringify({id: '1234'}), expStr);
+        coreStorage.setCookie(`${mockIdCookieName}_last`, (new Date(Date.now() - 1 * 1000).toUTCString()), expStr);
 
+        let innerAdUnits;
+        return runBidsHook((config) => {
+          innerAdUnits = config.adUnits
+        }, {adUnits}).then(() => {
           sinon.assert.calledOnce(mockGetId);
           sinon.assert.calledOnce(mockDecode);
           sinon.assert.notCalled(mockExtendId);
         });
+      });
 
-        it('calls getId if no stored consent data but refresh is needed', function () {
-          coreStorage.setCookie(mockIdCookieName, JSON.stringify({id: '1234'}), expStr);
-          coreStorage.setCookie(`${mockIdCookieName}_last`, (new Date(Date.now() - 60 * 1000).toUTCString()), expStr);
-
-          let innerAdUnits;
-          consentManagementRequestBidsHook(() => {
-          }, {});
-          requestBidsHook((config) => {
-            innerAdUnits = config.adUnits
-          }, {adUnits});
+      it('calls getId if no stored consent data but refresh is needed', function () {
+        coreStorage.setCookie(mockIdCookieName, JSON.stringify({id: '1234'}), expStr);
+        coreStorage.setCookie(`${mockIdCookieName}_last`, (new Date(Date.now() - 60 * 1000).toUTCString()), expStr);
 
+        let innerAdUnits;
+        return runBidsHook((config) => {
+          innerAdUnits = config.adUnits
+        }, {adUnits}).then(() => {
           sinon.assert.calledOnce(mockGetId);
           sinon.assert.calledOnce(mockDecode);
           sinon.assert.notCalled(mockExtendId);
         });
+      });
 
-        it('calls getId if empty stored consent and refresh not needed', function () {
-          coreStorage.setCookie(mockIdCookieName, JSON.stringify({id: '1234'}), expStr);
-          coreStorage.setCookie(`${mockIdCookieName}_last`, (new Date(Date.now() - 1 * 1000).toUTCString()), expStr);
-
-          setStoredConsentData();
+      it('calls getId if empty stored consent and refresh not needed', function () {
+        coreStorage.setCookie(mockIdCookieName, JSON.stringify({id: '1234'}), expStr);
+        coreStorage.setCookie(`${mockIdCookieName}_last`, (new Date(Date.now() - 1 * 1000).toUTCString()), expStr);
 
-          let innerAdUnits;
-          consentManagementRequestBidsHook(() => {
-          }, {});
-          requestBidsHook((config) => {
-            innerAdUnits = config.adUnits
-          }, {adUnits});
+        setStoredConsentData();
 
+        let innerAdUnits;
+        return runBidsHook((config) => {
+          innerAdUnits = config.adUnits
+        }, {adUnits}).then(() => {
           sinon.assert.calledOnce(mockGetId);
           sinon.assert.calledOnce(mockDecode);
           sinon.assert.notCalled(mockExtendId);
         });
+      });
 
-        it('calls getId if stored consent does not match current consent and refresh not needed', function () {
-          coreStorage.setCookie(mockIdCookieName, JSON.stringify({id: '1234'}), expStr);
-          coreStorage.setCookie(`${mockIdCookieName}_last`, (new Date(Date.now() - 1 * 1000).toUTCString()), expStr);
+      it('calls getId if stored consent does not match current consent and refresh not needed', function () {
+        coreStorage.setCookie(mockIdCookieName, JSON.stringify({id: '1234'}), expStr);
+        coreStorage.setCookie(`${mockIdCookieName}_last`, (new Date(Date.now() - 1 * 1000).toUTCString()), expStr);
 
-          setStoredConsentData({
-            gdprApplies: testConsentData.gdprApplies,
-            consentString: 'abc',
-            apiVersion: testConsentData.apiVersion
-          });
-
-          let innerAdUnits;
-          consentManagementRequestBidsHook(() => {
-          }, {});
-          requestBidsHook((config) => {
-            innerAdUnits = config.adUnits
-          }, {adUnits});
+        setStoredConsentData({...consentData, consentString: 'different'});
 
+        let innerAdUnits;
+        return runBidsHook((config) => {
+          innerAdUnits = config.adUnits
+        }, {adUnits}).then(() => {
           sinon.assert.calledOnce(mockGetId);
           sinon.assert.calledOnce(mockDecode);
           sinon.assert.notCalled(mockExtendId);
         });
+      });
 
-        it('does not call getId if stored consent matches current consent and refresh not needed', function () {
-          coreStorage.setCookie(mockIdCookieName, JSON.stringify({id: '1234'}), expStr);
-          coreStorage.setCookie(`${mockIdCookieName}_last`, (new Date(Date.now() - 1 * 1000).toUTCString()), expStr);
-
-          setStoredConsentData({
-            gdprApplies: testConsentData.gdprApplies,
-            consentString: testConsentData.consentData,
-            apiVersion: testConsentData.apiVersion
-          });
+      it('does not call getId if stored consent matches current consent and refresh not needed', function () {
+        coreStorage.setCookie(mockIdCookieName, JSON.stringify({id: '1234'}), expStr);
+        coreStorage.setCookie(`${mockIdCookieName}_last`, (new Date(Date.now() - 1 * 1000).toUTCString()), expStr);
 
-          let innerAdUnits;
-          consentManagementRequestBidsHook(() => {
-          }, {});
-          requestBidsHook((config) => {
-            innerAdUnits = config.adUnits
-          }, {adUnits});
+        setStoredConsentData({...consentData});
 
+        let innerAdUnits;
+        return runBidsHook((config) => {
+          innerAdUnits = config.adUnits
+        }, {adUnits}).then(() => {
           sinon.assert.notCalled(mockGetId);
           sinon.assert.calledOnce(mockDecode);
           sinon.assert.calledOnce(mockExtendId);
         });
       });
+    });
 
-      describe('findRootDomain', function () {
-        let sandbox;
+    describe('findRootDomain', function () {
+      let sandbox;
 
-        beforeEach(function () {
-          setSubmoduleRegistry([sharedIdSystemSubmodule]);
-          init(config);
-          config.setConfig({
-            userSync: {
-              syncDelay: 0,
-              userIds: [
-                {
-                  name: 'pubCommonId',
-                  value: { pubcid: '11111' },
-                },
-              ],
-            },
-          });
-          sandbox = sinon.createSandbox();
-          sandbox
-            .stub(coreStorage, 'getCookie')
-            .onFirstCall()
-            .returns(null) // .co.uk
-            .onSecondCall()
-            .returns('writeable'); // realdomain.co.uk;
+      beforeEach(function () {
+        init(config);
+        setSubmoduleRegistry([sharedIdSystemSubmodule]);
+        config.setConfig({
+          userSync: {
+            syncDelay: 0,
+            userIds: [
+              {
+                name: 'pubCommonId',
+                value: { pubcid: '11111' },
+              },
+            ],
+          },
         });
+        sandbox = sinon.createSandbox();
+        sandbox
+          .stub(coreStorage, 'getCookie')
+          .onFirstCall()
+          .returns(null) // .co.uk
+          .onSecondCall()
+          .returns('writeable'); // realdomain.co.uk;
+      });
 
-        afterEach(function () {
-          sandbox.restore();
-        });
+      afterEach(function () {
+        sandbox.restore();
+      });
 
-        it('should just find the root domain', function () {
-          var domain = findRootDomain('sub.realdomain.co.uk');
-          expect(domain).to.be.eq('realdomain.co.uk');
-        });
+      it('should just find the root domain', function () {
+        var domain = findRootDomain('sub.realdomain.co.uk');
+        expect(domain).to.be.eq('realdomain.co.uk');
+      });
 
-        it('should find the full domain when no subdomain is present', function () {
-          var domain = findRootDomain('realdomain.co.uk');
-          expect(domain).to.be.eq('realdomain.co.uk');
-        });
+      it('should find the full domain when no subdomain is present', function () {
+        var domain = findRootDomain('realdomain.co.uk');
+        expect(domain).to.be.eq('realdomain.co.uk');
       });
     });
+  });
 
-    describe('handles config with ESP configuration in user sync object', function() {
-      describe('Call registerSignalSources to register signal sources with gtag', function () {
-        it('pbjs.registerSignalSources should be defined', () => {
-          expect(typeof (getGlobal()).registerSignalSources).to.equal('function');
-        });
-      })
+  describe('handles config with ESP configuration in user sync object', function() {
+    describe('Call registerSignalSources to register signal sources with gtag', function () {
+      it('pbjs.registerSignalSources should be defined', () => {
+        expect(typeof (getGlobal()).registerSignalSources).to.equal('function');
+      });
+    })
+
+    describe('Call getEncryptedEidsForSource to get encrypted Eids for source', function() {
+      const signalSources = ['pubcid.org'];
 
-      describe('Call getEncryptedEidsForSource to get encrypted Eids for source', function() {
-        const signalSources = ['pubcid.org'];
+      it('pbjs.getEncryptedEidsForSource should be defined', () => {
+        expect(typeof (getGlobal()).getEncryptedEidsForSource).to.equal('function');
+      });
 
-        it('pbjs.getEncryptedEidsForSource should be defined', () => {
-          expect(typeof (getGlobal()).getEncryptedEidsForSource).to.equal('function');
+      it('pbjs.getEncryptedEidsForSource should return the string without encryption if encryption is false', (done) => {
+        init(config);
+        setSubmoduleRegistry([sharedIdSystemSubmodule]);
+        config.setConfig({
+          userSync: {
+            auctionDelay: 10,
+            userIds: [
+              {
+                'name': 'sharedId',
+                'storage': {
+                  'type': 'cookie',
+                  'name': '_pubcid',
+                  'expires': 365
+                }
+              },
+              {
+                'name': 'pubcid.org'
+              }
+            ]
+          },
         });
+        const encrypt = false;
+        (getGlobal()).getEncryptedEidsForSource(signalSources[0], encrypt).then((data) => {
+          let users = (getGlobal()).getUserIdsAsEids();
+          expect(data).to.equal(users[0].uids[0].id);
+          done();
+        }).catch(done);
+      });
 
-        it('pbjs.getEncryptedEidsForSource should return the string without encryption if encryption is false', (done) => {
-          setSubmoduleRegistry([sharedIdSystemSubmodule]);
+      describe('pbjs.getEncryptedEidsForSource', () => {
+        beforeEach(() => {
           init(config);
+          setSubmoduleRegistry([sharedIdSystemSubmodule]);
           config.setConfig({
             userSync: {
-              syncDelay: 0,
-              userIds: [
-                {
-                  'name': 'sharedId',
-                  'storage': {
-                    'type': 'cookie',
-                    'name': '_pubcid',
-                    'expires': 365
-                  }
-                },
-                {
-                  'name': 'pubcid.org'
-                }
-              ]
-            },
+              auctionDelay: 10,
+              userIds: [{
+                name: 'pubCommonId', value: {'pubcid': '11111'}
+              }]
+            }
           });
-          const encrypt = false;
-          (getGlobal()).getEncryptedEidsForSource(signalSources[0], encrypt).then((data) => {
-            let users = (getGlobal()).getUserIdsAsEids();
-            expect(data).to.equal(users[0].uids[0].id);
-            done();
-          }).catch(done);
         });
 
-        it('pbjs.getEncryptedEidsForSource should return the string base64 encryption if encryption is true', (done) => {
+        it('should return the string base64 encryption if encryption is true', (done) => {
           const encrypt = true;
           (getGlobal()).getEncryptedEidsForSource(signalSources[0], encrypt).then((result) => {
             expect(result.startsWith('1||')).to.true;
@@ -2710,45 +2620,47 @@ describe('User ID', function () {
           }).catch(done);
         });
 
-        it('pbjs.getEncryptedEidsForSource should return string if custom function is defined', (done) => {
+        it('pbjs.getEncryptedEidsForSource should return string if custom function is defined', () => {
           const getCustomSignal = () => {
             return '{"keywords":["tech","auto"]}';
           }
           const expectedString = '1||eyJrZXl3b3JkcyI6WyJ0ZWNoIiwiYXV0byJdfQ==';
           const encrypt = false;
           const source = 'pubmatic.com';
-          (getGlobal()).getEncryptedEidsForSource(source, encrypt, getCustomSignal).then((result) => {
+          return (getGlobal()).getEncryptedEidsForSource(source, encrypt, getCustomSignal).then((result) => {
             expect(result).to.equal(expectedString);
-            done();
-          }).catch(done);
+          });
         });
+      });
 
-        it('pbjs.getUserIdsAsEidBySource', () => {
-          const users = {
-            'source': 'pubcid.org',
-            'uids': [
-              {
-                'id': '11111',
-                'atype': 1
-              }
-            ]
-          }
-          setSubmoduleRegistry([sharedIdSystemSubmodule, amxIdSubmodule]);
-          init(config);
-          config.setConfig({
-            userSync: {
-              syncDelay: 0,
-              userIds: [{
-                name: 'pubCommonId', value: {'pubcid': '11111'}
-              }, {
-                name: 'amxId', value: {'amxId': 'amx-id-value-amx-id-value-amx-id-value'}
-              }]
+      it('pbjs.getUserIdsAsEidBySource', (done) => {
+        const users = {
+          'source': 'pubcid.org',
+          'uids': [
+            {
+              'id': '11111',
+              'atype': 1
             }
-          });
-          expect(typeof (getGlobal()).getUserIdsAsEidBySource).to.equal('function');
-          expect((getGlobal()).getUserIdsAsEidBySource(signalSources[0])).to.deep.equal(users);
+          ]
+        }
+        init(config);
+        setSubmoduleRegistry([sharedIdSystemSubmodule, amxIdSubmodule]);
+        config.setConfig({
+          userSync: {
+            auctionDelay: 10,
+            userIds: [{
+              name: 'pubCommonId', value: {'pubcid': '11111'}
+            }, {
+              name: 'amxId', value: {'amxId': 'amx-id-value-amx-id-value-amx-id-value'}
+            }]
+          }
         });
-      })
-    });
-  })
+        expect(typeof (getGlobal()).getUserIdsAsEidBySource).to.equal('function');
+        (getGlobal()).getUserIdsAsync().then(() => {
+          expect(getGlobal().getUserIdsAsEidBySource(signalSources[0])).to.deep.equal(users);
+          done();
+        });
+      });
+    })
+  });
 });
diff --git a/test/spec/modules/zeotapIdPlusIdSystem_spec.js b/test/spec/modules/zeotapIdPlusIdSystem_spec.js
index 98459a36d45..6494a7cbfef 100644
--- a/test/spec/modules/zeotapIdPlusIdSystem_spec.js
+++ b/test/spec/modules/zeotapIdPlusIdSystem_spec.js
@@ -162,8 +162,8 @@ describe('Zeotap ID System', function() {
         ZEOTAP_COOKIE_NAME,
         ENCODED_ZEOTAP_COOKIE
       );
-      setSubmoduleRegistry([zeotapIdPlusSubmodule]);
       init(config);
+      setSubmoduleRegistry([zeotapIdPlusSubmodule]);
       config.setConfig(getConfigMock());
     });
 
diff --git a/test/spec/unit/core/bidderFactory_spec.js b/test/spec/unit/core/bidderFactory_spec.js
index 067f9abe424..20a545a51d4 100644
--- a/test/spec/unit/core/bidderFactory_spec.js
+++ b/test/spec/unit/core/bidderFactory_spec.js
@@ -11,6 +11,7 @@ import * as events from 'src/events.js';
 import {hook} from '../../../../src/hook.js';
 import {auctionManager} from '../../../../src/auctionManager.js';
 import {stubAuctionIndex} from '../../../helpers/indexStub.js';
+import { bidderSettings } from '../../../../src/bidderSettings.js';
 
 const CODE = 'sampleBidder';
 const MOCK_BIDS_REQUEST = {
@@ -1022,6 +1023,142 @@ describe('validate bid response: ', function () {
     expect(addBidResponseStub.firstCall.args[0]).to.equal('mock/placement');
     expect(logErrorSpy.callCount).to.equal(0);
   });
+
+  describe(' Check for alternateBiddersList ', function() {
+    let bidRequest;
+    let bids1;
+    let logWarnSpy;
+    let bidderSettingStub, aliasRegistryStub;
+    let aliasRegistry;
+
+    beforeEach(function () {
+      bidRequest = {
+        bids: [{
+          bidId: '1',
+          bidder: CODE,
+          auctionId: 'first-bid-id',
+          adUnitCode: 'mock/placement',
+          transactionId: 'au',
+        }]
+      };
+
+      bids1 = Object.assign({},
+        bids[0],
+        {
+          bidderCode: 'validAlternateBidder',
+          adapterCode: 'knownAdapter1'
+        }
+      );
+      logWarnSpy = sinon.spy(utils, 'logWarn');
+      bidderSettingStub = sinon.stub(bidderSettings, 'get');
+      aliasRegistry = {};
+      aliasRegistryStub = sinon.stub(adapterManager, 'aliasRegistry');
+      aliasRegistryStub.get(() => aliasRegistry);
+    });
+
+    afterEach(function () {
+      logWarnSpy.restore();
+      bidderSettingStub.restore();
+      aliasRegistryStub.restore();
+    });
+
+    it('should log warning when bidder is unknown and allowAlternateBidderCodes flag is false', function () {
+      bidderSettingStub.returns(false);
+
+      const bidder = newBidder(spec);
+      spec.interpretResponse.returns(bids1);
+      bidder.callBids(bidRequest, addBidResponseStub, doneStub, ajaxStub, onTimelyResponseStub, wrappedCallback);
+
+      expect(addBidResponseStub.calledOnce).to.equal(false);
+      expect(logWarnSpy.callCount).to.equal(1);
+    });
+
+    it('should accept the bid, when allowAlternateBidderCodes flag is undefined (default should be true)', function () {
+      bidderSettingStub.returns(undefined);
+
+      const bidder = newBidder(spec);
+      spec.interpretResponse.returns(bids1);
+      bidder.callBids(bidRequest, addBidResponseStub, doneStub, ajaxStub, onTimelyResponseStub, wrappedCallback);
+
+      expect(addBidResponseStub.calledOnce).to.equal(true);
+      expect(logWarnSpy.callCount).to.equal(0);
+      expect(logErrorSpy.callCount).to.equal(0);
+    });
+
+    it('should log warning when the particular bidder is not specified in allowedAlternateBidderCodes and allowAlternateBidderCodes flag is true', function () {
+      bidderSettingStub.withArgs(CODE, 'allowAlternateBidderCodes').returns(true);
+      bidderSettingStub.withArgs(CODE, 'allowedAlternateBidderCodes').returns(['invalidAlternateBidder02']);
+
+      const bidder = newBidder(spec);
+      spec.interpretResponse.returns(bids1);
+      bidder.callBids(bidRequest, addBidResponseStub, doneStub, ajaxStub, onTimelyResponseStub, wrappedCallback);
+
+      expect(addBidResponseStub.calledOnce).to.equal(false);
+      expect(logWarnSpy.callCount).to.equal(1);
+    });
+
+    it('should accept the bid, when allowedAlternateBidderCodes is empty and allowAlternateBidderCodes flag is true', function () {
+      bidderSettingStub.withArgs(CODE, 'allowAlternateBidderCodes').returns(true);
+      bidderSettingStub.withArgs(CODE, 'allowedAlternateBidderCodes').returns();
+
+      const bidder = newBidder(spec);
+      spec.interpretResponse.returns(bids1);
+      bidder.callBids(bidRequest, addBidResponseStub, doneStub, ajaxStub, onTimelyResponseStub, wrappedCallback);
+
+      expect(addBidResponseStub.calledOnce).to.equal(true);
+      expect(logWarnSpy.callCount).to.equal(0);
+      expect(logErrorSpy.callCount).to.equal(0);
+    });
+
+    it('should accept the bid, when allowedAlternateBidderCodes is marked as * and allowAlternateBidderCodes flag is true', function () {
+      bidderSettingStub.withArgs(CODE, 'allowAlternateBidderCodes').returns(true);
+      bidderSettingStub.withArgs(CODE, 'allowedAlternateBidderCodes').returns(['*']);
+
+      const bidder = newBidder(spec);
+      spec.interpretResponse.returns(bids1);
+      bidder.callBids(bidRequest, addBidResponseStub, doneStub, ajaxStub, onTimelyResponseStub, wrappedCallback);
+
+      expect(addBidResponseStub.calledOnce).to.equal(true);
+      expect(logWarnSpy.callCount).to.equal(0);
+      expect(logErrorSpy.callCount).to.equal(0);
+    });
+
+    it('should accept the bid, when allowedAlternateBidderCodes contains bidder name and allowAlternateBidderCodes flag is true', function () {
+      bidderSettingStub.withArgs(CODE, 'allowAlternateBidderCodes').returns(true);
+      bidderSettingStub.withArgs(CODE, 'allowedAlternateBidderCodes').returns(['validAlternateBidder']);
+
+      const bidder = newBidder(spec);
+      spec.interpretResponse.returns(bids1);
+      bidder.callBids(bidRequest, addBidResponseStub, doneStub, ajaxStub, onTimelyResponseStub, wrappedCallback);
+
+      expect(addBidResponseStub.calledOnce).to.equal(true);
+      expect(logWarnSpy.callCount).to.equal(0);
+      expect(logErrorSpy.callCount).to.equal(0);
+    });
+
+    it('should not accept the bid, when bidder is an alias but bidderSetting is missing for the bidder. It should fallback to standard setting and reject the bid', function () {
+      bidderSettingStub.withArgs(CODE, 'allowAlternateBidderCodes').returns(false);
+      aliasRegistry = {'validAlternateBidder': CODE};
+
+      const bidder = newBidder(spec);
+      spec.interpretResponse.returns(bids1);
+      bidder.callBids(bidRequest, addBidResponseStub, doneStub, ajaxStub, onTimelyResponseStub, wrappedCallback);
+
+      expect(addBidResponseStub.calledOnce).to.equal(false);
+      expect(logWarnSpy.callCount).to.equal(1);
+    });
+
+    it('should not accept the bid, when bidderSetting is missing for the bidder. It should fallback to standard setting and reject the bid', function () {
+      bidderSettingStub.withArgs(CODE, 'allowAlternateBidderCodes').returns(false);
+
+      const bidder = newBidder(spec);
+      spec.interpretResponse.returns(bids1);
+      bidder.callBids(bidRequest, addBidResponseStub, doneStub, ajaxStub, onTimelyResponseStub, wrappedCallback);
+
+      expect(addBidResponseStub.calledOnce).to.equal(false);
+      expect(logWarnSpy.callCount).to.equal(1);
+    });
+  })
 });
 
 describe('preload mapping url hook', function() {
diff --git a/test/spec/unit/pbjs_api_spec.js b/test/spec/unit/pbjs_api_spec.js
index 5302b3b8c74..6a7c79fe49d 100644
--- a/test/spec/unit/pbjs_api_spec.js
+++ b/test/spec/unit/pbjs_api_spec.js
@@ -197,6 +197,7 @@ describe('Unit: Prebid Module', function () {
 
   before(() => {
     hook.ready();
+    $$PREBID_GLOBAL$$.requestBids.getHooks().remove();
   });
 
   beforeEach(function () {
diff --git a/wdio.conf.js b/wdio.conf.js
index 4865c03f339..4f14d4c7a6d 100644
--- a/wdio.conf.js
+++ b/wdio.conf.js
@@ -1,36 +1,34 @@
-const browsers = require('./browsers.json');
+const browsers = Object.fromEntries(
+  Object.entries(require('./browsers.json'))
+    .filter(([k, v]) => {
+      // run only on latest; exclude Safari
+      // (Webdriver's `browser.url(...)` times out on Safari if the page loads a video; does it wait for playback to complete?)
+      return v.browser_version === 'latest' && v.browser !== 'safari'
+    })
+);
 
 function getCapabilities() {
   function getPlatform(os) {
     const platformMap = {
       'Windows': 'WINDOWS',
-      'OS X': 'MAC',
+      'OS X': 'OS X',
     }
     return platformMap[os];
   }
 
-  // only Chrome 80 & Firefox 73 run as part of functional tests
-  // rest of the browsers are discarded.
-  delete browsers['bs_chrome_79_windows_10'];
-  delete browsers['bs_firefox_72_windows_10'];
-  delete browsers['bs_safari_11_mac_catalina'];
-  delete browsers['bs_safari_12_mac_mojave'];
-  // disable all edge browsers due to wdio bug for switchToFrame: https://github.com/webdriverio/webdriverio/issues/3880
-  delete browsers['bs_edge_18_windows_10'];
-  delete browsers['bs_edge_17_windows_10'];
-
   let capabilities = []
-  Object.keys(browsers).forEach(key => {
-    let browser = browsers[key];
+  Object.values(browsers).forEach(browser => {
     capabilities.push({
       browserName: browser.browser,
-      os: getPlatform(browser.os),
-      os_version: browser.os_version,
-      browser_version: browser.browser_version,
-      acceptSslCerts: true,
-      'browserstack.networkLogs': true,
-      'browserstack.console': 'verbose',
-      build: 'Prebidjs E2E ' + new Date().toLocaleString()
+      browserVersion: browser.browser_version,
+      'bstack:options': {
+        os: getPlatform(browser.os),
+        osVersion: browser.os_version,
+        networkLogs: true,
+        consoleLogs: 'verbose',
+        buildName: `Prebidjs E2E (${browser.browser} ${browser.browser_version}) ${new Date().toLocaleString()}`
+      },
+      acceptInsecureCerts: true,
     });
   });
   return capabilities;
@@ -38,7 +36,12 @@ function getCapabilities() {
 
 exports.config = {
   specs: [
-    './test/spec/e2e/**/*.spec.js'
+    './test/spec/e2e/**/*.spec.js',
+  ],
+  exclude: [
+    // TODO: decipher original intent for "longform" tests
+    // they all appear to be almost exact copies
+    './test/spec/e2e/longform/**/*'
   ],
   services: [
     ['browserstack', {
@@ -49,7 +52,7 @@ exports.config = {
   key: process.env.BROWSERSTACK_ACCESS_KEY,
   maxInstances: 5, // Do not increase this, since we have only 5 parallel tests in browserstack account
   capabilities: getCapabilities(),
-  logLevel: 'silent', // put option here: info | trace | debug | warn| error | silent
+  logLevel: 'info', // put option here: info | trace | debug | warn| error | silent
   bail: 0,
   waitforTimeout: 60000, // Default timeout for all waitFor* commands.
   connectionRetryTimeout: 60000, // Default timeout in milliseconds for request if Selenium Grid doesn't send response
@@ -61,5 +64,5 @@ exports.config = {
     compilers: ['js:babel-register'],
   },
   // if you see error, update this to spec reporter and logLevel above to get detailed report.
-  reporters: ['concise']
+  reporters: ['spec']
 }